TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2025-08-11 06:45:49 +00:00
Code Issues Projects Releases Wiki Activity

yay, conflicts

Browse source
This commit is contained in:
boy0001 2015-02-19 14:38:49 +11:00
parent 4a314144c6
commit f154754e1b
17 changed files with 46 additions and 625 deletions
Download patch file Download diff file Expand all files Collapse all files

5
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ClusterManager.java
View file

@ -288,11 +288,8 @@ public class ClusterManager {
@Override
public void run() {
if (populator == null || plotworld.TYPE == 0) {
<<<<<<< Updated upstream
AbstractSetBlock.setBlockManager.update(Arrays.asList( new Chunk[] {chunk}));
=======
SetBlockManager.setBlockManager.update(Arrays.asList( new Chunk[] {chunk}));
>>>>>>> Stashed changes
world.regenerateChunk(chunk.getX(), chunk.getZ());
chunk.unload(true, true);
}