EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-11-04 03:03:43 +01:00
Code Issues Projects Releases Wiki Activity

Optimize move event

Browse Source
This commit is contained in:
boy0001
2015-04-09 22:25:09 +10:00
parent 635a4bd7a4
commit b0050dd2e8
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,26 +197,23 @@ public class WorldEditListener implements Listener {
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onPlayerMove(final PlayerMoveEvent e) { public void onPlayerMove(final PlayerMoveEvent e) {
final Location t = e.getTo(); final Location t = e.getTo();
if (!isPlotWorld(t)) {
return;
}
final Location f = e.getFrom(); final Location f = e.getFrom();
if ((f.getX() == t.getX()) && (f.getZ() == t.getZ())) {
return;
}
final Player p = e.getPlayer();
final PlotPlayer pp = BukkitUtil.getPlayer(p);
if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) {
if (!PWE.hasMask(pp)) {
return;
}
}
final com.intellectualcrafters.plot.object.Location locf = BukkitUtil.getLocation(f); final com.intellectualcrafters.plot.object.Location locf = BukkitUtil.getLocation(f);
final com.intellectualcrafters.plot.object.Location loct = BukkitUtil.getLocation(t); final com.intellectualcrafters.plot.object.Location loct = BukkitUtil.getLocation(t);
if ((locf.getX() != loct.getX()) || (locf.getZ() != loct.getZ())) { if ((locf.getX() != loct.getX()) || (locf.getZ() != loct.getZ())) {
final Player p = e.getPlayer();
final PlotPlayer pp = BukkitUtil.getPlayer(p);
if (!isPlotWorld(t)) {
return;
}
final PlotId idF = MainUtil.getPlotId(locf); final PlotId idF = MainUtil.getPlotId(locf);
final PlotId idT = MainUtil.getPlotId(loct); final PlotId idT = MainUtil.getPlotId(loct);
if ((idT != null) && !(idF == idT)) { if ((idT != null) && !(idF == idT)) {
if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) {
if (!PWE.hasMask(pp)) {
return;
}
}
PWE.setMask(pp, loct, false); PWE.setMask(pp, loct, false);
} }
} }