diff --git a/src/main/java/com/Acrobot/ChestShop/Plugins/BlockLocker.java b/src/main/java/com/Acrobot/ChestShop/Plugins/BlockLocker.java index 8005001..4713a7d 100644 --- a/src/main/java/com/Acrobot/ChestShop/Plugins/BlockLocker.java +++ b/src/main/java/com/Acrobot/ChestShop/Plugins/BlockLocker.java @@ -4,6 +4,7 @@ import com.Acrobot.ChestShop.Configuration.Properties; import org.bukkit.block.Block; import org.bukkit.event.Event; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import com.Acrobot.ChestShop.Events.Protection.ProtectionCheckEvent; @@ -14,11 +15,9 @@ import nl.rutgerkok.blocklocker.BlockLockerAPIv2; * @author Acrobot */ public class BlockLocker implements Listener { - - - @EventHandler + @EventHandler(priority = EventPriority.HIGH) public void onProtectionCheck(ProtectionCheckEvent event) { - if (event.getResult() == Event.Result.DENY) { + if (event.getResult() == Event.Result.DENY && !Properties.TURN_OFF_DEFAULT_PROTECTION_WHEN_PROTECTED_EXTERNALLY) { return; } diff --git a/src/main/java/com/Acrobot/ChestShop/Plugins/Deadbolt.java b/src/main/java/com/Acrobot/ChestShop/Plugins/Deadbolt.java index 0882f90..aca92f4 100644 --- a/src/main/java/com/Acrobot/ChestShop/Plugins/Deadbolt.java +++ b/src/main/java/com/Acrobot/ChestShop/Plugins/Deadbolt.java @@ -6,15 +6,16 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; /** * @author Acrobot */ public class Deadbolt implements Listener { - @EventHandler + @EventHandler(priority = EventPriority.HIGH) public static void onProtectionCheck(ProtectionCheckEvent event) { - if (event.getResult() == Event.Result.DENY) { + if (event.getResult() == Event.Result.DENY && !Properties.TURN_OFF_DEFAULT_PROTECTION_WHEN_PROTECTED_EXTERNALLY) { return; } diff --git a/src/main/java/com/Acrobot/ChestShop/Plugins/Lockette.java b/src/main/java/com/Acrobot/ChestShop/Plugins/Lockette.java index 20b91e7..1d712e0 100644 --- a/src/main/java/com/Acrobot/ChestShop/Plugins/Lockette.java +++ b/src/main/java/com/Acrobot/ChestShop/Plugins/Lockette.java @@ -6,15 +6,16 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; /** * @author Acrobot */ public class Lockette implements Listener { - @EventHandler + @EventHandler(priority = EventPriority.HIGH) public static void onProtectionCheck(ProtectionCheckEvent event) { - if (event.getResult() == Event.Result.DENY) { + if (event.getResult() == Event.Result.DENY && !Properties.TURN_OFF_DEFAULT_PROTECTION_WHEN_PROTECTED_EXTERNALLY) { return; } diff --git a/src/main/java/com/Acrobot/ChestShop/Plugins/LockettePro.java b/src/main/java/com/Acrobot/ChestShop/Plugins/LockettePro.java index cd4a422..c324b68 100644 --- a/src/main/java/com/Acrobot/ChestShop/Plugins/LockettePro.java +++ b/src/main/java/com/Acrobot/ChestShop/Plugins/LockettePro.java @@ -7,13 +7,13 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; public class LockettePro implements Listener { - - @EventHandler + @EventHandler(priority = EventPriority.HIGH) public static void onProtectionCheck(ProtectionCheckEvent event) { - if (event.getResult() == Event.Result.DENY) { + if (event.getResult() == Event.Result.DENY && !Properties.TURN_OFF_DEFAULT_PROTECTION_WHEN_PROTECTED_EXTERNALLY) { return; } diff --git a/src/main/java/com/Acrobot/ChestShop/Plugins/ResidenceChestProtection.java b/src/main/java/com/Acrobot/ChestShop/Plugins/ResidenceChestProtection.java index abc40fb..d464366 100644 --- a/src/main/java/com/Acrobot/ChestShop/Plugins/ResidenceChestProtection.java +++ b/src/main/java/com/Acrobot/ChestShop/Plugins/ResidenceChestProtection.java @@ -1,5 +1,6 @@ package com.Acrobot.ChestShop.Plugins; +import com.Acrobot.ChestShop.Configuration.Properties; import com.Acrobot.ChestShop.Events.Protection.ProtectionCheckEvent; import com.bekvon.bukkit.residence.Residence; import com.bekvon.bukkit.residence.api.ResidenceApi; @@ -9,6 +10,7 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; /** @@ -16,10 +18,9 @@ import org.bukkit.event.Listener; * @author Andrzej Pomirski */ public class ResidenceChestProtection implements Listener { - - @EventHandler + @EventHandler(priority = EventPriority.HIGH) public static void onProtectionCheck(ProtectionCheckEvent event) { - if (event.getResult() == Event.Result.DENY) { + if (event.getResult() == Event.Result.DENY && !Properties.TURN_OFF_DEFAULT_PROTECTION_WHEN_PROTECTED_EXTERNALLY) { return; } diff --git a/src/main/java/com/Acrobot/ChestShop/Plugins/SimpleChestLock.java b/src/main/java/com/Acrobot/ChestShop/Plugins/SimpleChestLock.java index e8147a5..0890ca9 100644 --- a/src/main/java/com/Acrobot/ChestShop/Plugins/SimpleChestLock.java +++ b/src/main/java/com/Acrobot/ChestShop/Plugins/SimpleChestLock.java @@ -7,6 +7,7 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.plugin.Plugin; @@ -20,9 +21,9 @@ public class SimpleChestLock implements Listener { this.scl = scl; } - @EventHandler + @EventHandler(priority = EventPriority.HIGH) public void onProtectionCheck(ProtectionCheckEvent event) { - if (event.getResult() == Event.Result.DENY) { + if (event.getResult() == Event.Result.DENY && !Properties.TURN_OFF_DEFAULT_PROTECTION_WHEN_PROTECTED_EXTERNALLY) { return; }