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

PPL

Browse Source
This commit is contained in:
boy0001 2015-02-22 00:32:37 +11:00
parent 97df6d80b5
commit 48e9bc1adf
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
View File

@ -146,7 +146,7 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
PlotPlayer pp = BukkitUtil.getPlayer(player); PlotPlayer pp = BukkitUtil.getPlayer(player);
final String username = pp.getName(); final String username = pp.getName();
final StringWrapper name = new StringWrapper(username); final StringWrapper name = new StringWrapper(username);
final UUID uuid = UUIDHandler.getUUID(player); final UUID uuid = pp.getUUID();
UUIDHandler.add(name, uuid); UUIDHandler.add(name, uuid);
final Location loc = BukkitUtil.getLocation(player.getLocation()); final Location loc = BukkitUtil.getLocation(player.getLocation());
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
@ -656,7 +656,6 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
return; return;
} }
} else { } else {
UUID uuid = UUIDHandler.getUUID(p);
PlotPlayer pp = BukkitUtil.getPlayer(p); PlotPlayer pp = BukkitUtil.getPlayer(p);
if (!plot.isAdded(pp.getUUID())) if (!Permissions.hasPermission(pp, "plots.admin.build.other")) { if (!plot.isAdded(pp.getUUID())) if (!Permissions.hasPermission(pp, "plots.admin.build.other")) {
if (isPlotArea(loc)) { if (isPlotArea(loc)) {

26
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlotPlusListener.java
View File

@ -112,7 +112,7 @@ public class PlotPlusListener extends PlotListener implements Listener {
MainUtil.sendMessage(pp, C.NOT_IN_PLOT); MainUtil.sendMessage(pp, C.NOT_IN_PLOT);
return; return;
} }
UUID uuid = UUIDHandler.getUUID(player); UUID uuid = pp.getUUID();
if (!plot.isAdded(uuid)) { if (!plot.isAdded(uuid)) {
MainUtil.sendMessage(pp, C.NO_PLOT_PERMS); MainUtil.sendMessage(pp, C.NO_PLOT_PERMS);
return; return;
@ -173,11 +173,12 @@ public class PlotPlusListener extends PlotListener implements Listener {
@EventHandler @EventHandler
public void onItemPickup(final PlayerPickupItemEvent event) { public void onItemPickup(final PlayerPickupItemEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(player)); PlotPlayer pp = BukkitUtil.getPlayer(player);
final Plot plot = MainUtil.getPlot(pp.getLocation());
if (plot == null) { if (plot == null) {
return; return;
} }
UUID uuid = UUIDHandler.getUUID(player); UUID uuid = pp.getUUID();
if (plot.isAdded(uuid) && booleanFlag(plot, "drop-protection", false)) { if (plot.isAdded(uuid) && booleanFlag(plot, "drop-protection", false)) {
event.setCancelled(true); event.setCancelled(true);
} }
@ -186,11 +187,12 @@ public class PlotPlusListener extends PlotListener implements Listener {
@EventHandler @EventHandler
public void onItemDrop(final PlayerDropItemEvent event) { public void onItemDrop(final PlayerDropItemEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(player)); PlotPlayer pp = BukkitUtil.getPlayer(player);
final Plot plot = MainUtil.getPlot(pp.getLocation());
if (plot == null) { if (plot == null) {
return; return;
} }
UUID uuid = UUIDHandler.getUUID(player); UUID uuid = pp.getUUID();
if (plot.isAdded(uuid) && booleanFlag(plot, "item-drop", false)) { if (plot.isAdded(uuid) && booleanFlag(plot, "item-drop", false)) {
event.setCancelled(true); event.setCancelled(true);
} }
@ -204,20 +206,19 @@ public class PlotPlusListener extends PlotListener implements Listener {
} }
if (booleanFlag(plot, "notify-enter", false)) { if (booleanFlag(plot, "notify-enter", false)) {
if (plot.hasOwner()) { if (plot.hasOwner()) {
final Player player = UUIDHandler.uuidWrapper.getPlayer(plot.getOwner()); final PlotPlayer pp = UUIDHandler.getPlayer(plot.getOwner());
if (player == null) { if (pp == null) {
return; return;
} }
final Player trespasser = event.getPlayer(); final Player trespasser = event.getPlayer();
PlotPlayer pt = BukkitUtil.getPlayer(trespasser); PlotPlayer pt = BukkitUtil.getPlayer(trespasser);
PlotPlayer pp = BukkitUtil.getPlayer(player);
if (pp.getUUID().equals(pt.getUUID())) { if (pp.getUUID().equals(pt.getUUID())) {
return; return;
} }
if (Permissions.hasPermission(pt, "plots.flag.notify-enter.bypass")) { if (Permissions.hasPermission(pt, "plots.flag.notify-enter.bypass")) {
return; return;
} }
if (player.isOnline()) { if (pp.isOnline()) {
MainUtil.sendMessage(pp, C.NOTIFY_ENTER.s().replace("%player", trespasser.getName()).replace("%plot", plot.getId().toString())); MainUtil.sendMessage(pp, C.NOTIFY_ENTER.s().replace("%player", trespasser.getName()).replace("%plot", plot.getId().toString()));
} }
} }
@ -254,18 +255,17 @@ public class PlotPlusListener extends PlotListener implements Listener {
} }
if (booleanFlag(plot, "notify-leave", false)) { if (booleanFlag(plot, "notify-leave", false)) {
if (plot.hasOwner()) { if (plot.hasOwner()) {
final Player player = UUIDHandler.uuidWrapper.getPlayer(plot.getOwner()); final PlotPlayer pp = UUIDHandler.getPlayer(plot.getOwner());
if (player == null) { if (pp == null) {
return; return;
} }
PlotPlayer pp = BukkitUtil.getPlayer(player);
if (pp.getUUID().equals(pl.getUUID())) { if (pp.getUUID().equals(pl.getUUID())) {
return; return;
} }
if (Permissions.hasPermission(pl, "plots.flag.notify-leave.bypass")) { if (Permissions.hasPermission(pl, "plots.flag.notify-leave.bypass")) {
return; return;
} }
if (player.isOnline()) { if (pp.isOnline()) {
MainUtil.sendMessage(pp, C.NOTIFY_LEAVE.s().replace("%player", pl.getName()).replace("%plot", plot.getId().toString())); MainUtil.sendMessage(pp, C.NOTIFY_LEAVE.s().replace("%player", pl.getName()).replace("%plot", plot.getId().toString()));
} }
} }