diff --git a/classes/artifacts/Factions_jar/Factions.jar b/classes/artifacts/Factions_jar/Factions.jar index 9d7830ae..17f5e2ca 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 96122580..884b3c8e 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java @@ -95,7 +95,6 @@ public class FactionsBlockListener implements Listener { } // Something failed prevent build - SavageFactions.plugin.getLogger().info("Unable to determine fallback action for build permissions, defaulting to false"); return false; } @@ -499,10 +498,10 @@ public class FactionsBlockListener implements Listener { player.damage(Conf.actionDeniedPainAmount); me.msg("It is painful to try to " + action + " in the territory of " + Board.getInstance().getFactionAt(loc).getTag(myFaction)); } - me.msg(TL.GENERIC_NOPERMISSION, action); + me.msg("You cannot " + action + " in the territory of " + myFaction.getTag(me.getFaction())); return false; } else if (access == Access.ALLOW) return true; - me.msg(TL.GENERIC_NOPERMISSION, action); + me.msg("You cannot " + action + " in the territory of " + myFaction.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 794cf117..ff16a72e 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -751,15 +751,15 @@ public class FactionsPlayerListener implements Listener { if (Conf.territoryBypasssProtectedMaterials.contains(block.getType())) return; if (block == null) return; // clicked in air, apparently - + SavageFactions.plugin.log("Checking for material permission"); if (GetPermissionFromUsableBlock(event.getMaterial()) == null) return; - player.sendMessage("Checking if you can use that block"); + SavageFactions.plugin.log("Checking for use block permission"); if (!canPlayerUseBlock(player, block, false)) { event.setCancelled(true); event.setUseInteractedBlock(Event.Result.DENY); return; } - player.sendMessage("Checking if you can use that item"); + SavageFactions.plugin.log("Checking if you can use that item"); if (!playerCanUseItemHere(player, block.getLocation(), event.getMaterial(), false)) { event.setCancelled(true); event.setUseInteractedBlock(Event.Result.DENY); @@ -910,11 +910,11 @@ public class FactionsPlayerListener implements Listener { return false; } else if (!landOwned && access == Access.ALLOW) return true; else { - me.msg(TL.GENERIC_NOPERMISSION, action); + me.msg("You cannot " + action + " in the territory of " + myFaction.getTag(me.getFaction())); return false; } } - me.msg(TL.GENERIC_NOPERMISSION, action); + me.msg("You cannot " + action + " in the territory of " + myFaction.getTag(me.getFaction())); return false; } ///