Bug fix to piston protection

boxbeam · Jul 4, 2020 · f432d28 · f432d28
1 parent d92bc34
commit f432d28
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/redempt/redlib/protection/ProtectionListener.java b/src/redempt/redlib/protection/ProtectionListener.java
@@ -1,5 +1,7 @@
 package redempt.redlib.protection;
 
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
@@ -9,6 +11,7 @@
 import redempt.redlib.misc.EventListener;
 import redempt.redlib.protection.ProtectionPolicy.ProtectionType;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.function.BiConsumer;
@@ -65,12 +68,13 @@ protected static <T extends Event> void protectMultiBlock(Class<T> clazz, Protec
 				List<Block> blocks = null;
 				try {
 					blocks = func.apply(e);
-				} catch (Exception ex) {
+				} catch (NullPointerException ex) {
 					continue;
 				}
 				if (blocks == null) {
 					continue;
 				}
+				blocks = new ArrayList<>(blocks);
 				for (Block block : blocks) {
 					if (!testAll(block, type, player)) {
 						cancel.accept(e, block);

diff --git a/src/redempt/redlib/protection/ProtectionPolicy.java b/src/redempt/redlib/protection/ProtectionPolicy.java
@@ -11,6 +11,7 @@
 import java.util.function.Predicate;
 
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.EntityType;
@@ -70,12 +71,12 @@ public static void registerProtections() {
 		ProtectionListener.protect(PlayerBucketFillEvent.class, ProtectionType.USE_BUCKETS, e -> e.getPlayer(), e -> e.getBlockClicked());
 		ProtectionListener.protect(PlayerBucketEmptyEvent.class, ProtectionType.USE_BUCKETS, e -> e.getPlayer(), e -> e.getBlockClicked());
 		ProtectionListener.protectMultiBlock(BlockPistonExtendEvent.class, ProtectionType.PISTONS, e -> null, (e, b) -> e.setCancelled(true), e -> {
-			List<Block> blocks = e.getBlocks();
+			List<Block> blocks = new ArrayList<>(e.getBlocks());
 			blocks.add(e.getBlock());
 			return blocks;
 		});
 		ProtectionListener.protectMultiBlock(BlockPistonRetractEvent.class, ProtectionType.PISTONS, e -> null, (e, b) -> e.setCancelled(true), e -> {
-			List<Block> blocks = e.getBlocks();
+			List<Block> blocks = new ArrayList<>(e.getBlocks());
 			blocks.add(e.getBlock());
 			return blocks;
 		});