diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java index aa0e4f85..ae6a2f60 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java @@ -917,7 +917,7 @@ private boolean isInvincible(Player player) { boolean god = cfg.hasGodMode(player); if (wcfg.useRegions) { Boolean flag = RegionQueryUtil.isAllowedInvinciblity(plugin, player); - boolean allowed = flag == null || flag == Boolean.TRUE; + boolean allowed = flag == null || flag == true; boolean invincible = RegionQueryUtil.isInvincible(plugin, player); if (allowed) { diff --git a/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java b/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java index 8e48fd69..465963dd 100644 --- a/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java +++ b/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java @@ -57,23 +57,23 @@ private boolean isProtectedSignAround(Block searchBlock, Player player) { side = searchBlock; res = isProtectedSign(side, player); - if (res != null && res == Boolean.TRUE) return res; + if (res != null && res) return res; side = searchBlock.getRelative(-1, 0, 0); res = isProtectedSignAndChest(side, player); - if (res != null && res == Boolean.TRUE) return res; + if (res != null && res) return res; side = searchBlock.getRelative(1, 0, 0); res = isProtectedSignAndChest(side, player); - if (res != null && res == Boolean.TRUE) return res; + if (res != null && res) return res; side = searchBlock.getRelative(0, 0, -1); res = isProtectedSignAndChest(side, player); - if (res != null && res == Boolean.TRUE) return res; + if (res != null && res) return res; side = searchBlock.getRelative(0, 0, 1); res = isProtectedSignAndChest(side, player); - if (res != null && res == Boolean.TRUE) return res; + if (res != null && res) return res; return false; } @@ -115,7 +115,7 @@ private Boolean isProtectedSignAndChest(Block block, Player player) { private boolean isProtectedSignAndChestBinary(Block block, Player player) { Boolean res = isProtectedSignAndChest(block, player); - if (res == null || res == Boolean.FALSE) { + if (res == null || !res) { return false; } return true; @@ -127,23 +127,23 @@ public boolean isAdjacentChestProtected(Block searchBlock, Player player) { side = searchBlock; res = isProtected(side, player); - if (res != null && res == Boolean.TRUE) return res; + if (res != null && res == true) return res; side = searchBlock.getRelative(-1, 0, 0); res = isProtected(side, player); - if (res != null && res == Boolean.TRUE) return res; + if (res != null && res == true) return res; side = searchBlock.getRelative(1, 0, 0); res = isProtected(side, player); - if (res != null && res == Boolean.TRUE) return res; + if (res != null && res == true) return res; side = searchBlock.getRelative(0, 0, -1); res = isProtected(side, player); - if (res != null && res == Boolean.TRUE) return res; + if (res != null && res == true) return res; side = searchBlock.getRelative(0, 0, 1); res = isProtected(side, player); - if (res != null && res == Boolean.TRUE) return res; + if (res != null && res == true) return res; return false; }