diff --git a/src/main/kotlin/com/pobnellion/pobutils/Pobutils.kt b/src/main/kotlin/com/pobnellion/pobutils/Pobutils.kt index d413c5e..f879c3b 100644 --- a/src/main/kotlin/com/pobnellion/pobutils/Pobutils.kt +++ b/src/main/kotlin/com/pobnellion/pobutils/Pobutils.kt @@ -3,7 +3,6 @@ package com.pobnellion.pobutils import com.pobnellion.pobutils.modules.CmdModule import com.pobnellion.pobutils.modules.ModuleBase import com.pobnellion.pobutils.modules.disableExplosions.DisableExplosions -import com.pobnellion.pobutils.modules.disableTrample.DisableTrample import com.pobnellion.pobutils.modules.formatChat.FormatChat import com.pobnellion.pobutils.modules.hub.Hub import com.pobnellion.pobutils.modules.noJoinMessage.NoJoinMessage @@ -25,8 +24,7 @@ class Pobutils : JavaPlugin() { override fun onEnable() { registerModule(DisableExplosions(this)) - registerModule(DisableTrample(this)) - registerModule(FormatChat(this)) // TODO: test set format config + registerModule(FormatChat(this)) registerModule(Hub(this)) registerModule(NoJoinMessage(this)) registerModule(Portals(this)) diff --git a/src/main/kotlin/com/pobnellion/pobutils/modules/disableTrample/DisableTrample.kt b/src/main/kotlin/com/pobnellion/pobutils/modules/disableTrample/DisableTrample.kt deleted file mode 100644 index 37112b4..0000000 --- a/src/main/kotlin/com/pobnellion/pobutils/modules/disableTrample/DisableTrample.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.pobnellion.pobutils.modules.disableTrample - -import com.mojang.brigadier.builder.LiteralArgumentBuilder -import com.pobnellion.pobutils.Pobutils -import com.pobnellion.pobutils.modules.ModuleBase -import io.papermc.paper.command.brigadier.CommandSourceStack -import org.bukkit.Material -import org.bukkit.event.EventHandler -import org.bukkit.event.Listener -import org.bukkit.event.block.Action -import org.bukkit.event.player.PlayerInteractEvent -import org.bukkit.plugin.java.JavaPlugin - -@Suppress("UnstableApiUsage") -class DisableTrample(plugin: JavaPlugin) : ModuleBase(plugin) , Listener { - override val name: String = "disableTrample" - - override fun register() { - plugin.server.pluginManager.registerEvents(this, plugin) - } - - override fun reload() { } - override fun onDisable() { } - override fun onEnable() { } - override fun configCmd(): LiteralArgumentBuilder? { return null } - - @EventHandler - fun onTrample(event: PlayerInteractEvent) { - if (Pobutils.isEnabled(this.name) - && event.action == Action.PHYSICAL - && event.hand == null - && event.clickedBlock?.type == Material.FARMLAND) - event.isCancelled = true - } -} \ No newline at end of file diff --git a/src/main/kotlin/com/pobnellion/pobutils/modules/portals/Portals.kt b/src/main/kotlin/com/pobnellion/pobutils/modules/portals/Portals.kt index a3d86bd..d3d8021 100644 --- a/src/main/kotlin/com/pobnellion/pobutils/modules/portals/Portals.kt +++ b/src/main/kotlin/com/pobnellion/pobutils/modules/portals/Portals.kt @@ -107,6 +107,7 @@ class Portals(plugin: JavaPlugin) : ModuleBase(plugin), Listener, PluginMessageL val stopModifier = AttributeModifier(NamespacedKey.minecraft("stop"), -1.0, AttributeModifier.Operation.ADD_SCALAR) event.player.getAttribute(Attribute.MOVEMENT_SPEED)!!.addTransientModifier(stopModifier) event.player.getAttribute(Attribute.JUMP_STRENGTH)!!.addTransientModifier(stopModifier) + event.player.isFlying = false portalCooldowns[event.player] = event.from val message = ByteStreams.newDataOutput()