Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-28 17:38:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #613

Browse Source
This commit is contained in:
boy0001 2015-09-14 20:43:51 +10:00
parent 064a555ba1
commit 4002ed4de1
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
View File

@ -425,16 +425,6 @@ public class MainUtil {
return myplots; return myplots;
} }
public static boolean equals(final Object a, final Object b) {
if (a == b) {
return true;
}
if ((a == null) ^ (b == null)) {
return false;
}
return a.equals(b);
}
/** /**
* Get the number of plots for a player * Get the number of plots for a player
* *

12
src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
View File

@ -5,6 +5,7 @@ import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -935,7 +936,7 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
for (final Block b : blocks) { for (final Block b : blocks) {
final Location bloc = BukkitUtil.getLocation(b.getLocation().add(relative)); final Location bloc = BukkitUtil.getLocation(b.getLocation().add(relative));
final Plot newPlot = MainUtil.getPlot(bloc); final Plot newPlot = MainUtil.getPlot(bloc);
if (!MainUtil.equals(plot, newPlot)) { if (!Objects.equals(plot, newPlot)) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
@ -972,14 +973,13 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
if ((block.getType() != Material.PISTON_STICKY_BASE) && (block.getType() != Material.PISTON_BASE) && (block.getType() != Material.PISTON_MOVING_PIECE)) { if ((block.getType() != Material.PISTON_STICKY_BASE) && (block.getType() != Material.PISTON_BASE) && (block.getType() != Material.PISTON_MOVING_PIECE)) {
return; return;
} }
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (pistonBlocks) { if (pistonBlocks) {
try { try {
for (final Block pulled : event.getBlocks()) { for (final Block pulled : event.getBlocks()) {
final Plot other = MainUtil.getPlot(BukkitUtil.getLocation(pulled.getLocation())); final Plot other = MainUtil.getPlot(BukkitUtil.getLocation(pulled.getLocation()));
if (!MainUtil.equals(plot, other)) { if (!Objects.equals(plot, other)) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
@ -990,9 +990,9 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
} }
if (!pistonBlocks && (block.getType() != Material.PISTON_BASE)) { if (!pistonBlocks && (block.getType() != Material.PISTON_BASE)) {
final BlockFace dir = event.getDirection(); final BlockFace dir = event.getDirection();
final Location bloc = BukkitUtil.getLocation(block.getLocation().subtract(dir.getModX() * 2, dir.getModY() * 2, dir.getModZ() * 2)); final Location bloc = BukkitUtil.getLocation(block.getLocation().add(dir.getModX() * 2, dir.getModY() * 2, dir.getModZ() * 2));
final Plot newPlot = MainUtil.getPlot(bloc); final Plot newPlot = MainUtil.getPlot(bloc);
if (!MainUtil.equals(plot, newPlot)) { if (!Objects.equals(plot, newPlot)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@ -1012,7 +1012,7 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
for (int i = blocks.size() - 1; i >= 0; i--) { for (int i = blocks.size() - 1; i >= 0; i--) {
final Location loc = BukkitUtil.getLocation(blocks.get(i).getLocation()); final Location loc = BukkitUtil.getLocation(blocks.get(i).getLocation());
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (!MainUtil.equals(plot, origin)) { if (!Objects.equals(plot, origin)) {
e.getBlocks().remove(i); e.getBlocks().remove(i);
} }
} }