Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-10-08 05:58:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

WEL

Browse Source
This commit is contained in:
boy0001 2015-02-22 00:36:57 +11:00
parent 48e9bc1adf
commit 7bd99afa25
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java
View File

@ -106,10 +106,11 @@ public class WorldEditListener implements Listener {
if ((p.getItemInHand() == null) || (p.getItemInHand().getType() == Material.AIR)) { if ((p.getItemInHand() == null) || (p.getItemInHand().getType() == Material.AIR)) {
return; return;
} }
com.intellectualcrafters.plot.object.Location loc = BukkitUtil.getLocation(b.getLocation()); PlotPlayer pp = BukkitUtil.getPlayer(p);
com.intellectualcrafters.plot.object.Location loc = pp.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot != null) { if (plot != null) {
if (plot.hasOwner() && (plot.helpers != null) && (plot.helpers.contains(DBFunc.everyone) || plot.helpers.contains(UUIDHandler.getUUID(p)))) { if (plot.hasOwner() && (plot.helpers != null) && (plot.helpers.contains(DBFunc.everyone) || plot.helpers.contains(pp.getUUID()))) {
PWE.setMask(BukkitUtil.getPlayer(p), loc, false); PWE.setMask(BukkitUtil.getPlayer(p), loc, false);
} }
} }
@ -127,8 +128,8 @@ public class WorldEditListener implements Listener {
cmd = cmd.substring(0, cmd.indexOf(" ")); cmd = cmd.substring(0, cmd.indexOf(" "));
} }
if (this.restrictedcmds.contains(cmd)) { if (this.restrictedcmds.contains(cmd)) {
final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(p)); final Plot plot = MainUtil.getPlot(pp.getLocation());
if ((plot == null) || !(plot.helpers.contains(DBFunc.everyone) || plot.helpers.contains(UUIDHandler.getUUID(p)))) { if ((plot == null) || !(plot.helpers.contains(DBFunc.everyone) || plot.helpers.contains(pp.getUUID()))) {
e.setCancelled(true); e.setCancelled(true);
} }
return; return;
@ -194,7 +195,7 @@ public class WorldEditListener implements Listener {
final Player p = e.getPlayer(); final Player p = e.getPlayer();
PlotPlayer pp = BukkitUtil.getPlayer(p); PlotPlayer pp = BukkitUtil.getPlayer(p);
if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) { if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) {
if (!PWE.hasMask(p)) { if (!PWE.hasMask(pp)) {
return; return;
} }
} }
@ -237,7 +238,7 @@ public class WorldEditListener implements Listener {
final Player p = e.getPlayer(); final Player p = e.getPlayer();
PlotPlayer pp = BukkitUtil.getPlayer(p); PlotPlayer pp = BukkitUtil.getPlayer(p);
if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) { if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) {
if (!PWE.hasMask(p)) { if (!PWE.hasMask(pp)) {
return; return;
} }
} }