diff --git a/classes/artifacts/Factions_jar/Factions.jar b/classes/artifacts/Factions_jar/Factions.jar index c7fe7fe3..c261bf27 100644 Binary files a/classes/artifacts/Factions_jar/Factions.jar and b/classes/artifacts/Factions_jar/Factions.jar differ diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java index feb184b5..c21f0312 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java @@ -501,9 +501,7 @@ public class FactionsBlockListener implements Listener { } me.msg(TL.GENERIC_NOPERMISSION, action); return false; - } else if (access == Access.ALLOW) return true; - // We assume faction land is not owned, and the access is not set to DENY, so we allow to execute the action - return false; + } else return access == Access.ALLOW; } private static boolean CheckActionState(Faction target, FLocation location, FPlayer me, PermissableAction action, boolean pain) { @@ -512,7 +510,7 @@ public class FactionsBlockListener implements Listener { if (pain && Conf.ownedAreaPainBuild) me.msg("It is painful to try to " + action + " in this territory, it is owned by: " + target.getOwnerListString(location)); if (Conf.ownedAreaDenyBuild && pain) return false; else if (Conf.ownedAreaDenyBuild) { - me.msg("You cannot " + action + " in the territory of" + target.getTag(me.getFaction())); + me.msg("You cannot " + action + " in the territory of " + target.getTag(me.getFaction())); return false; } } diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java index 61f2499a..8ced1057 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -857,7 +857,8 @@ public class FactionsPlayerListener implements Listener { @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onPlayerInteract(PlayerInteractEvent event) { // only need to check right-clicks and physical as of MC 1.4+; good performance boost - if ((event.getAction() == Action.LEFT_CLICK_AIR || event.getAction() == Action.LEFT_CLICK_BLOCK) || event.getAction() != Action.PHYSICAL) return; + if (event.getAction() != Action.PHYSICAL) return; + if (!event.getAction().equals(Action.LEFT_CLICK_BLOCK) || !event.getAction().equals(Action.LEFT_CLICK_AIR)) return; if (event.getPlayer().getItemInHand() != null) { Material handItem = event.getPlayer().getItemInHand().getType(); if (handItem.isEdible()