Merge pull request #812 from DansPlugins/tweaking-bypass-break-door-l…

…ock-mechanic Tweaking bypass break door lock mechanic
Dans-Plugins · Dec 23, 2020 · 449b8a6 · 449b8a6
2 parents c8d3f6d + 0c0f5c4
commit 449b8a6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>KingdomProgrammers</groupId>
     <artifactId>Medieval-Factions</artifactId>
-    <version>v3.6.2-beta-2</version>
+    <version>v3.6.2</version>
     <packaging>jar</packaging>
 
     <name>Medieval Factions</name>

diff --git a/src/main/java/dansplugins/factionsystem/MedievalFactions.java b/src/main/java/dansplugins/factionsystem/MedievalFactions.java
@@ -16,7 +16,7 @@ public class MedievalFactions extends JavaPlugin {
 
     private static MedievalFactions instance;
 
-    private String version = "v3.6.2-beta-2";
+    private String version = "v3.6.2";
 
     public static MedievalFactions getInstance() {
         return instance;

diff --git a/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java b/src/main/java/dansplugins/factionsystem/eventhandlers/InteractionHandler.java
@@ -74,12 +74,18 @@ public void handle(BlockBreakEvent event) {
                         }
 
                     	removeLock(event.getBlock(), PersistentData.getInstance().getLockedBlocks());
-
                         // if block was a door
                         if (isDoor(event.getBlock())) {
                             // remove locks above and below the original block as well
-                            removeLock(event.getBlock().getRelative(BlockFace.UP));
-                            removeLock(event.getBlock().getRelative(BlockFace.DOWN));
+                            Block relativeUp = event.getBlock().getRelative(BlockFace.UP);
+                            Block relativeDown = event.getBlock().getRelative(BlockFace.DOWN);
+                            if (isDoor(relativeUp)) {
+                                removeLock(relativeUp);
+                            }
+                            if (isDoor(relativeDown)) {
+                                removeLock(relativeDown);
+                            }
+                            return;
                         }
 
                     }

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: MedievalFactions
-version: 3.6.2-beta-2
+version: 3.6.2
 author: KingdomProgrammers
 main: dansplugins.factionsystem.MedievalFactions
 api-version: 1.13