Merge pull request #80 from MineInAbyss/epearl_tp

Disable epearl/chorus tp between sections to avoid exploit
MineInAbyss · Aug 15, 2021 · bedd89b · bedd89b
2 parents d2274e2 + ecf8d94
commit bedd89b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/com/derongan/minecraft/deeperworld/listeners/PlayerListener.kt b/src/main/java/com/derongan/minecraft/deeperworld/listeners/PlayerListener.kt
@@ -5,7 +5,8 @@ import com.derongan.minecraft.deeperworld.world.section.section
 import com.mineinabyss.idofront.destructure.component1
 import com.mineinabyss.idofront.destructure.component2
 import com.mineinabyss.idofront.destructure.component3
-import org.bukkit.GameMode
+import com.mineinabyss.idofront.messaging.error
+import org.bukkit.GameMode.ADVENTURE
 import org.bukkit.GameMode.SURVIVAL
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
@@ -17,11 +18,13 @@ object PlayerListener : Listener {
     @EventHandler
     fun onPlayerTeleport(event: PlayerTeleportEvent) {
         val (player, _, to, cause) = event
-        if (player.gameMode == SURVIVAL
+        if (
+            (player.gameMode == SURVIVAL || player.gameMode == ADVENTURE)
             && (cause == ENDER_PEARL || cause == CHORUS_FRUIT)
-            && to?.section == null
+            && (to.section != player.location.section || to.section == null)
             && player.canMoveSections
         ) {
+            player.error("Teleportation is disabled between Layers and Sections.")
             event.isCancelled = true
         }
     }