Don't match door if neither door block is protected

pop4959 · Feb 27, 2020 · 4acf69e · 4acf69e
1 parent f7a46be
commit 4acf69e
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/main/java/com/griefcraft/util/matchers/DoorMatcher.java b/src/main/java/com/griefcraft/util/matchers/DoorMatcher.java
@@ -126,6 +126,10 @@ public boolean matches(ProtectionFinder finder) {
         // Match the bottom half of the door
         else if (PROTECTABLES_DOORS.contains(aboveBaseBlock.getType())) {
             finder.addBlock(aboveBaseBlock);
+            // At this point, all door blocks are added. If there is no protection found, we can and should stop.
+            if (finder.loadProtection(true) == null) {
+                return false;
+            }
             finder.addBlock(block.getRelative(BlockFace.DOWN));
             findPressurePlate(finder, block);
             return true;
@@ -134,8 +138,11 @@ else if (PROTECTABLES_DOORS.contains(aboveBaseBlock.getType())) {
         // Match the top half of the door
         else if (PROTECTABLES_DOORS.contains(baseBlockState.getType())) {
             Block bottomHalf = block.getRelative(BlockFace.DOWN);
-
             finder.addBlock(bottomHalf);
+            // At this point, all door blocks are added. If there is no protection found, we can and should stop.
+            if (finder.loadProtection(true) == null) {
+                return false;
+            }
             finder.addBlock(bottomHalf.getRelative(BlockFace.DOWN));
             findPressurePlate(finder, bottomHalf);
             return true;