From 43d5c32bad6241ce9a9e26dceaef9c49fcb4a28a Mon Sep 17 00:00:00 2001 From: gravitylow Date: Wed, 16 Apr 2014 18:35:55 -0400 Subject: [PATCH] Update block usage player lookups --- src/main/java/com/massivecraft/factions/P.java | 15 --------------- .../listeners/FactionsPlayerListener.java | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/P.java b/src/main/java/com/massivecraft/factions/P.java index d5dd029f..004b92c5 100644 --- a/src/main/java/com/massivecraft/factions/P.java +++ b/src/main/java/com/massivecraft/factions/P.java @@ -304,19 +304,4 @@ public class P extends MPlugin { } return players; } - - // check if player is allowed to build/destroy in a particular location - public boolean isPlayerAllowedToBuildHere(Player player, Location location) { - return FactionsBlockListener.playerCanBuildDestroyBlock(player, location, "", true); - } - - // check if player is allowed to interact with the specified block (doors/chests/whatever) - public boolean isPlayerAllowedToInteractWith(Player player, Block block) { - return FactionsPlayerListener.canPlayerUseBlock(player, block, true); - } - - // check if player is allowed to use a specified item (flint&steel, buckets, etc) in a particular location - public boolean isPlayerAllowedToUseThisHere(Player player, Location location, Material material) { - return FactionsPlayerListener.playerCanUseItemHere(player, location, material, true); - } } diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java index c850381c..21b73dbb 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -220,7 +220,7 @@ public class FactionsPlayerListener implements Listener { String name = player.getName(); if (Conf.playersWhoBypassAllProtection.contains(name)) return true; - FPlayer me = FPlayers.i.get(name); + FPlayer me = FPlayers.i.get(player.getUniqueId().toString()); if (me.isAdminBypassing()) return true; FLocation loc = new FLocation(location);