SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Scoped left click to be catched in PlayerInteract

Browse Source
This commit is contained in:
SvenjaReißaus 2019-03-18 21:14:23 -05:00
parent af210f706b
commit 97f63e9bc0
No known key found for this signature in database
GPG Key ID: E5494A03FA36D54B
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
classes/artifacts/Factions_jar/Factions.jar
View File

Binary file not shown.

6
src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java
View File

@ -501,9 +501,7 @@ public class FactionsBlockListener implements Listener {
} }
me.msg(TL.GENERIC_NOPERMISSION, action); me.msg(TL.GENERIC_NOPERMISSION, action);
return false; return false;
} else if (access == Access.ALLOW) return true; } else return access == Access.ALLOW;
// We assume faction land is not owned, and the access is not set to DENY, so we allow to execute the action
return false;
} }
private static boolean CheckActionState(Faction target, FLocation location, FPlayer me, PermissableAction action, boolean pain) { 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("<b>It is painful to try to " + action + " in this territory, it is owned by: " + target.getOwnerListString(location)); if (pain && Conf.ownedAreaPainBuild) me.msg("<b>It is painful to try to " + action + " in this territory, it is owned by: " + target.getOwnerListString(location));
if (Conf.ownedAreaDenyBuild && pain) return false; if (Conf.ownedAreaDenyBuild && pain) return false;
else if (Conf.ownedAreaDenyBuild) { 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; return false;
} }
} }

3
src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
View File

@ -857,7 +857,8 @@ public class FactionsPlayerListener implements Listener {
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onPlayerInteract(PlayerInteractEvent event) { public void onPlayerInteract(PlayerInteractEvent event) {
// only need to check right-clicks and physical as of MC 1.4+; good performance boost // 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) { if (event.getPlayer().getItemInHand() != null) {
Material handItem = event.getPlayer().getItemInHand().getType(); Material handItem = event.getPlayer().getItemInHand().getType();
if (handItem.isEdible() if (handItem.isEdible()