diff --git a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt index 2a9928ecb..dbb9f818b 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt @@ -1780,6 +1780,13 @@ object Config : Vigilant( ) var customDamageSplash = 0 + @Property( + type = PropertyType.SWITCH, name = "Disable Enderman Teleportation", + description = "Removes the enderman teleport effect.", + category = "Miscellaneous", subcategory = "Quality of Life" + ) + var disableEndermanTeleport = false + @Property( type = PropertyType.SWITCH, name = "Disable Night Vision", description = "Removes the vanilla effects of Night Vision.", diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/MiscFeatures.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/MiscFeatures.kt index d8f298a12..d6b06c7fb 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/MiscFeatures.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/MiscFeatures.kt @@ -72,6 +72,7 @@ import net.minecraftforge.client.event.ClientChatReceivedEvent import net.minecraftforge.client.event.RenderBlockOverlayEvent import net.minecraftforge.client.event.RenderGameOverlayEvent import net.minecraftforge.event.entity.EntityJoinWorldEvent +import net.minecraftforge.event.entity.living.EnderTeleportEvent import net.minecraftforge.event.entity.player.ItemTooltipEvent import net.minecraftforge.fml.common.Loader import net.minecraftforge.fml.common.eventhandler.EventPriority @@ -491,6 +492,13 @@ object MiscFeatures { } } + @SubscribeEvent(priority = EventPriority.LOW) + fun onEnderTeleport(event: EnderTeleportEvent) { + if (Utils.inSkyblock && Skytils.config.disableEndermanTeleport) { + event.isCanceled = true + } + } + class GolemSpawnTimerElement : GuiElement("Endstone Protector Spawn Timer", FloatPair(150, 20)) { override fun render() { val player = mc.thePlayer