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

Fixes #1484

Browse Source
This commit is contained in:
Jesse Boyd 2018-05-17 16:23:27 +10:00
parent a83b51eb12
commit d6c472fcdf
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
3 changed files with 62 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,22 +6,8 @@ import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.flag.Flags; import com.intellectualcrafters.plot.flag.Flags;
import com.intellectualcrafters.plot.flag.IntegerFlag; import com.intellectualcrafters.plot.flag.IntegerFlag;
import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.*;
import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.util.*;
import com.intellectualcrafters.plot.object.PlotArea;
import com.intellectualcrafters.plot.object.PlotBlock;
import com.intellectualcrafters.plot.object.PlotHandler;
import com.intellectualcrafters.plot.object.PlotId;
import com.intellectualcrafters.plot.object.PlotInventory;
import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.StringWrapper;
import com.intellectualcrafters.plot.util.EventUtil;
import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.MathMan;
import com.intellectualcrafters.plot.util.Permissions;
import com.intellectualcrafters.plot.util.RegExUtil;
import com.intellectualcrafters.plot.util.TaskManager;
import com.intellectualcrafters.plot.util.UUIDHandler;
import com.plotsquared.bukkit.BukkitMain; import com.plotsquared.bukkit.BukkitMain;
import com.plotsquared.bukkit.object.BukkitLazyBlock; import com.plotsquared.bukkit.object.BukkitLazyBlock;
import com.plotsquared.bukkit.object.BukkitPlayer; import com.plotsquared.bukkit.object.BukkitPlayer;
@ -271,7 +257,7 @@ public class PlayerEvents extends PlotListener implements Listener {
case DRAGON_EGG: case DRAGON_EGG:
case ANVIL: case ANVIL:
case SAND: case SAND:
case GRAVEL: case GRAVEL: {
Block block = event.getBlock(); Block block = event.getBlock();
Location loc = BukkitUtil.getLocation(block.getLocation()); Location loc = BukkitUtil.getLocation(block.getLocation());
PlotArea area = loc.getPlotArea(); PlotArea area = loc.getPlotArea();
@ -286,8 +272,49 @@ public class PlayerEvents extends PlotListener implements Listener {
event.setCancelled(true); event.setCancelled(true);
} }
return; return;
}
default: default:
break; if (Settings.Redstone.DETECT_INVALID_EDGE_PISTONS) {
Block block = event.getBlock();
switch (block.getType()) {
case PISTON_BASE:
case PISTON_STICKY_BASE:
Location loc = BukkitUtil.getLocation(block.getLocation());
PlotArea area = loc.getPlotArea();
if (area == null) {
return;
}
Plot plot = area.getOwnedPlotAbs(loc);
if (plot == null) {
return;
}
int data = block.getData();
switch (data) {
case 5:
case 13:
loc.setX(loc.getX() + 1);
break;
case 4:
case 12:
loc.setX(loc.getX() - 1);
break;
case 3:
case 11:
loc.setZ(loc.getZ() + 1);
break;
case 2:
case 10:
loc.setZ(loc.getZ() - 1);
break;
}
Plot newPlot = area.getOwnedPlotAbs(loc);
if (!plot.equals(newPlot)) {
event.setCancelled(true);
return;
}
}
}
break;
} }
} }
@ -1247,17 +1274,26 @@ public class PlayerEvents extends PlotListener implements Listener {
return; return;
} }
Plot plot = area.getOwnedPlot(location); Plot plot = area.getOwnedPlot(location);
BlockFace dir = event.getDirection();
// Location head = location.add(-dir.getModX(), -dir.getModY(), -dir.getModZ());
//
// if (!Objects.equals(plot, area.getOwnedPlot(head))) {
// // FIXME: cancelling the event doesn't work here. See issue #1484
// event.setCancelled(true);
// return;
// }
if (this.pistonBlocks) { if (this.pistonBlocks) {
try { try {
BlockFace dir = event.getDirection();
for (Block pulled : event.getBlocks()) { for (Block pulled : event.getBlocks()) {
location = BukkitUtil.getLocation(pulled.getLocation().add(dir.getModX(), dir.getModY(), dir.getModZ())); Location from = BukkitUtil.getLocation(pulled.getLocation().add(dir.getModX(), dir.getModY(), dir.getModZ()));
if (!area.contains(location.getX(), location.getZ())) { Location to = BukkitUtil.getLocation(pulled.getLocation());
if (!area.contains(to.getX(), to.getZ())) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
Plot newPlot = area.getOwnedPlot(location); Plot fromPlot = area.getOwnedPlot(from);
if (!Objects.equals(plot, newPlot)) { Plot toPlot = area.getOwnedPlot(to);
if (!Objects.equals(fromPlot, toPlot)) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
@ -1267,7 +1303,6 @@ public class PlayerEvents extends PlotListener implements Listener {
} }
} }
if (!this.pistonBlocks && block.getType() != Material.PISTON_BASE) { if (!this.pistonBlocks && block.getType() != Material.PISTON_BASE) {
BlockFace dir = event.getDirection();
location = BukkitUtil.getLocation(block.getLocation().add(dir.getModX() * 2, dir.getModY() * 2, dir.getModZ() * 2)); location = BukkitUtil.getLocation(block.getLocation().add(dir.getModX() * 2, dir.getModY() * 2, dir.getModZ() * 2));
if (!area.contains(location)) { if (!area.contains(location)) {
event.setCancelled(true); event.setCancelled(true);

2
Core/src/main/java/com/intellectualcrafters/plot/commands/Owner.java
View File

@ -73,7 +73,7 @@ public class Owner extends SetCommand {
} }
final String finalName = name; final String finalName = name;
final UUID finalUUID = uuid; final UUID finalUUID = uuid;
boolean removeDenied = plot.isDenied(finalUUID); final boolean removeDenied = plot.isDenied(finalUUID);
Runnable run = new Runnable() { Runnable run = new Runnable() {
@Override @Override
public void run() { public void run() {

2
Core/src/main/java/com/intellectualcrafters/plot/config/Settings.java
View File

@ -276,6 +276,8 @@ public class Settings extends Config {
public static boolean DISABLE_UNOCCUPIED = false; public static boolean DISABLE_UNOCCUPIED = false;
@Comment("Disable redstone when all owners/trusted/members are offline") @Comment("Disable redstone when all owners/trusted/members are offline")
public static boolean DISABLE_OFFLINE = false; public static boolean DISABLE_OFFLINE = false;
@Comment("Detect and cancel invalid pistons on the edge of plots (e.g. placed with WorldEdit)")
public static boolean DETECT_INVALID_EDGE_PISTONS = false;
} }
public static final class Claim { public static final class Claim {