make checks only run when entities position changes

MineInAbyss · Nov 8, 2022 · 40b5686 · 40b5686
1 parent a5794c9
commit 40b5686
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/kotlin/com/mineinabyss/deeperworld/listeners/MovementListener.kt b/src/main/kotlin/com/mineinabyss/deeperworld/listeners/MovementListener.kt
@@ -18,6 +18,7 @@ object MovementListener : Listener {
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOW)
     fun PlayerMoveEvent.move() {
+        if (!hasExplicitlyChangedPosition()) return
         if (player.hasPermission(Permissions.ADMIN_PERMISSION) && player.canMoveSections) {
             MovementHandler.handleMovement(player, from, to)
         }
@@ -34,6 +35,7 @@ object MovementListener : Listener {
 
     @EventHandler
     fun EntityMoveEvent.entityMove() {
+        if (!hasExplicitlyChangedPosition()) return
         if (entity.getPassengersRecursive().isEmpty()) return
         entity.getPassengersRecursive().filterIsInstance<Player>()
             .filter { rider -> rider.hasPermission(Permissions.ADMIN_PERMISSION) && rider.canMoveSections }

diff --git a/src/main/kotlin/com/mineinabyss/deeperworld/listeners/PlayerListener.kt b/src/main/kotlin/com/mineinabyss/deeperworld/listeners/PlayerListener.kt
@@ -14,9 +14,8 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.ENDER_PEARL
 object PlayerListener : Listener {
     @EventHandler
     fun PlayerTeleportEvent.onPlayerTeleport() {
-        if (player.gameMode == CREATIVE) return
+        if (player.gameMode == CREATIVE || !player.canMoveSections) return
         if (cause != ENDER_PEARL && cause != CHORUS_FRUIT) return
-        if (!player.canMoveSections) return
 
         if (
             to.section == null ||