Revert piston intersections to cancelling event due to a stack overfl…

…ow crash
MineInAbyss · Dec 6, 2023 · 32cb88e · 32cb88e
1 parent 2e2bcf9
commit 32cb88e
Showing 1 changed file with 22 additions and 15 deletions.
diff --git a/src/main/kotlin/com/mineinabyss/deeperworld/synchronization/ExploitPreventionListener.kt b/src/main/kotlin/com/mineinabyss/deeperworld/synchronization/ExploitPreventionListener.kt
@@ -1,6 +1,7 @@
 package com.mineinabyss.deeperworld.synchronization
 
 import com.mineinabyss.deeperworld.world.section.correspondingLocation
+import com.mineinabyss.deeperworld.world.section.correspondingSection
 import com.mineinabyss.deeperworld.world.section.inSectionOverlap
 import io.papermc.paper.event.block.BlockBreakBlockEvent
 import org.bukkit.Material
@@ -14,25 +15,31 @@ object ExploitPreventionListener : Listener {
 
     @EventHandler(ignoreCancelled = true)
     fun BlockPistonExtendEvent.onPistonExtendEvent() {
-        val corrBlock = block.location.correspondingLocation?.block ?: return
-        val corrBlocks = mutableListOf<Block>()
-
-        if (blocks.all { b -> !b.location.inSectionOverlap }) return
-        if (!corrBlock.location.isChunkLoaded) corrBlock.chunk.load()
-        corrBlocks.addAll(blocks.map { b -> b.location.correspondingLocation?.block ?: return@map null }.filterNotNull())
-        BlockPistonExtendEvent(corrBlock, corrBlocks, direction).callEvent()
+        //TODO handle pistons properly instead of just cancelling the event
+        if (blocks.any { it.location.correspondingSection != null })
+            isCancelled = true
+//        val corrBlock = block.location.correspondingLocation?.block ?: return
+//        val corrBlocks = mutableListOf<Block>()
+//
+//        if (blocks.all { b -> !b.location.inSectionOverlap }) return
+//        if (!corrBlock.location.isChunkLoaded) corrBlock.chunk.load()
+//        corrBlocks.addAll(blocks.map { b -> b.location.correspondingLocation?.block ?: return@map null }.filterNotNull())
+//        BlockPistonExtendEvent(corrBlock, corrBlocks, direction).callEvent()
     }
 
     @EventHandler(ignoreCancelled = true)
     fun BlockPistonRetractEvent.onPistonRetractEvent() {
-        val corrBlock = block.location.correspondingLocation?.block ?: return
-        val corrBlocks = mutableListOf<Block>()
-
-        if (blocks.all { b -> !b.location.inSectionOverlap }) return
-        if (!corrBlock.location.isChunkLoaded) corrBlock.chunk.load()
-
-        corrBlocks.addAll(blocks.map { b -> b.location.correspondingLocation?.block ?: return@map null }.filterNotNull())
-        BlockPistonRetractEvent(corrBlock, corrBlocks, direction).callEvent()
+        //TODO handle pistons properly instead of just cancelling the event
+        if (blocks.any { it.location.correspondingSection != null })
+            isCancelled = true
+//        val corrBlock = block.location.correspondingLocation?.block ?: return
+//        val corrBlocks = mutableListOf<Block>()
+//
+//        if (blocks.all { b -> !b.location.inSectionOverlap }) return
+//        if (!corrBlock.location.isChunkLoaded) corrBlock.chunk.load()
+//
+//        corrBlocks.addAll(blocks.map { b -> b.location.correspondingLocation?.block ?: return@map null }.filterNotNull())
+//        BlockPistonRetractEvent(corrBlock, corrBlocks, direction).callEvent()
     }
 
     @EventHandler