Fix piston extension/retraction not being cancelled with redstone flag

CloudCraftProjects · Dec 2, 2023 · cdd3f00 · cdd3f00
1 parent bff8aec
commit cdd3f00
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "dev.booky"
-version = "1.0.2-SNAPSHOT"
+version = "1.0.3-SNAPSHOT"
 
 val plugin: Configuration by configurations.creating {
     isTransitive = false

diff --git a/src/main/java/dev/booky/cloudprotections/listener/ProtectionListener.java b/src/main/java/dev/booky/cloudprotections/listener/ProtectionListener.java
@@ -197,27 +197,34 @@ public void onRedstone(BlockRedstoneEvent event) {
         }
     }
 
-    private boolean onPiston(Block piston, Iterable<Block> moved) {
+    private boolean checkPiston(Block piston, Iterable<Block> moved) {
         if (this.manager.isProtected(piston, ProtectionFlag.REDSTONE, null)) {
-            return true;
+            return false;
         }
 
         for (Block block : moved) {
             if (this.manager.isProtected(block, ProtectionFlag.REDSTONE, null)) {
                 return false;
             }
         }
-        return true;
+
+        return true; // allowed
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onPistonExtend(BlockPistonExtendEvent event) {
-        this.onPiston(event.getBlock(), event.getBlocks());
+        boolean allowed = this.checkPiston(event.getBlock(), event.getBlocks());
+        if (!allowed) {
+            event.setCancelled(true);
+        }
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onPistonRetract(BlockPistonRetractEvent event) {
-        this.onPiston(event.getBlock(), event.getBlocks());
+        boolean allowed = this.checkPiston(event.getBlock(), event.getBlocks());
+        if (!allowed) {
+            event.setCancelled(true);
+        }
     }
 
     @EventHandler(ignoreCancelled = true)