Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-30 13:14:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed augmented plot clearing modifying nearby plots.

Browse Source
This commit is contained in:
boy0001 2015-02-12 03:03:17 +11:00
parent 0f01ff1b7b
commit 1c66c985d5
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/AugmentedPopulator.java
View File

@ -17,6 +17,8 @@ import com.intellectualcrafters.plot.object.PlotGenerator;
import com.intellectualcrafters.plot.object.PlotId; import com.intellectualcrafters.plot.object.PlotId;
import com.intellectualcrafters.plot.object.PlotManager; import com.intellectualcrafters.plot.object.PlotManager;
import com.intellectualcrafters.plot.object.PlotWorld; import com.intellectualcrafters.plot.object.PlotWorld;
import com.intellectualcrafters.plot.object.RegionWrapper;
import com.intellectualcrafters.plot.util.ChunkManager;
import com.intellectualcrafters.plot.util.PlotHelper; import com.intellectualcrafters.plot.util.PlotHelper;
import com.intellectualcrafters.plot.util.TaskManager; import com.intellectualcrafters.plot.util.TaskManager;
@ -174,9 +176,16 @@ public class AugmentedPopulator extends BlockPopulator {
} }
int xx = x + blockInfo.x; int xx = x + blockInfo.x;
int zz = z + blockInfo.z; int zz = z + blockInfo.z;
if (p && manager.getPlotIdAbs(plotworld, new Location(world, xx, 0, zz)) != null) { if (p) {
if (ChunkManager.CURRENT_PLOT_CLEAR != null) {
if (ChunkManager.isIn(ChunkManager.CURRENT_PLOT_CLEAR, xx, zz)) {
continue; continue;
} }
}
else if (manager.getPlotIdAbs(plotworld, new Location(world, xx, 0, zz)) != null) {
continue;
}
}
PlotHelper.setBlock(world, xx, blockInfo.y, zz, blockInfo.id, (byte) 0); PlotHelper.setBlock(world, xx, blockInfo.y, zz, blockInfo.id, (byte) 0);
} }
} }
@ -184,4 +193,8 @@ public class AugmentedPopulator extends BlockPopulator {
populator.populate(world, r,world.getChunkAt(X, Z)); populator.populate(world, r,world.getChunkAt(X, Z));
} }
} }
public boolean isIn(RegionWrapper plot, int x, int z) {
return (x >= plot.minX && x <= plot.maxX && z >= plot.minZ && z <= plot.maxZ);
}
} }

1
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java
View File

@ -261,6 +261,7 @@ public class ChunkManager {
entity.spawn(world, x_offset, z_offset); entity.spawn(world, x_offset, z_offset);
} }
catch (Exception e) { catch (Exception e) {
System.out.print("Failed to restore entity " + entity.x + "," + entity.y + "," + entity.z + " : " + entity.id);
e.printStackTrace(); e.printStackTrace();
} }
} }