TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2025-08-07 04:53:00 +00:00
Code Issues Projects Releases Wiki Activity

[NEEDS TESTING] [FIX] merging: roads, signs, bedrock

Browse source
This commit is contained in:
boy0001 2014-12-15 23:23:44 +11:00
parent 439a5da294
commit 46a00357b3
3 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java
View file

@ -141,9 +141,13 @@ public class PlotHelper {
final boolean ly = y < pos2.y;
final PlotId id = new PlotId(x, y);
final Plot plot = PlotMain.getPlots(world).get(id);
Plot plot2 = null;
removeSign(world, plot);
if (lx) {
if (ly) {
if (!plot.settings.getMerged(1) || !plot.settings.getMerged(2)) {
@ -179,6 +183,7 @@ public class PlotHelper {
}
manager.finishPlotMerge(world, plotworld, plotIds);
return result;
}
@ -245,7 +250,9 @@ public class PlotHelper {
final PlotWorld plotworld = PlotMain.getWorldSettings(world);
final Location loc = manager.getSignLoc(world, plotworld, p);
final Block bs = loc.getBlock();
bs.setType(Material.AIR);
if (bs.getType() != Material.WALL_SIGN) {
bs.setType(Material.AIR);
}
}
public static void setSign(final Player player, final Plot p) {