diff --git a/pom.xml b/pom.xml
index c0b25acae..8500f56b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
UTF-8
PlotSquared
- 3.2.4
+ 3.2.6
PlotSquared
jar
diff --git a/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
index 782ef12f1..9a3aec17f 100644
--- a/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -926,10 +926,12 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
if (PS.get().isPlotWorld(loc.getWorld())) {
if (MainUtil.isPlotRoad(loc)) {
e.setCancelled(true);
+ return;
} else {
final Plot plot = MainUtil.getPlot(loc);
if ((plot != null) && FlagManager.isPlotFlagTrue(plot, "disable-physics")) {
e.setCancelled(true);
+ return;
}
}
}
@@ -942,6 +944,7 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
if (PS.get().isPlotWorld(loc.getWorld())) {
if (MainUtil.isPlotRoad(loc)) {
e.setCancelled(true);
+ return;
}
}
}
@@ -1028,7 +1031,10 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
return;
}
final Plot origin = MainUtil.getPlot(BukkitUtil.getLocation(blocks.get(0).getLocation()));
- blocks.get(0);
+ if (origin == null) {
+ e.setCancelled(true);
+ return;
+ }
for (int i = blocks.size() - 1; i >= 0; i--) {
final Location loc = BukkitUtil.getLocation(blocks.get(i).getLocation());
final Plot plot = MainUtil.getPlot(loc);
diff --git a/target/PlotSquared-Bukkit.jar b/target/PlotSquared-Bukkit.jar
index d268e4acc..addb85dae 100644
Binary files a/target/PlotSquared-Bukkit.jar and b/target/PlotSquared-Bukkit.jar differ