TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2025-08-08 13:33:11 +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

15
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java
View file

@ -229,21 +229,15 @@ public class ChunkManager {
Block block = world.getBlockAt(x, y, z);
int id = block.getTypeId();
byte data = block.getData();
<<<<<<< Updated upstream
AbstractSetBlock.setBlockManager.set(world, x + relX, y, z + relZ, id, data);
=======
SetBlockManager.setBlockManager.set(world, x + relX, y, z + relZ, id, data);
>>>>>>> Stashed changes
}
}
mx.increment();
if (x == ex) { // done!
restoreBlocks(world, relX, relZ);
<<<<<<< Updated upstream
AbstractSetBlock.setBlockManager.update(chunks);
=======
SetBlockManager.setBlockManager.update(chunks);
>>>>>>> Stashed changes
for (Chunk chunk : chunks) {
chunk.unload(true, true);
}
@ -359,11 +353,8 @@ public class ChunkManager {
restoreEntities(world, 0, 0);
}
chunk.unload(true, true);
<<<<<<< Updated upstream
AbstractSetBlock.setBlockManager.update(Arrays.asList( new Chunk[] {chunk}));
=======
SetBlockManager.setBlockManager.update(Arrays.asList( new Chunk[] {chunk}));
>>>>>>> Stashed changes
}
CURRENT_PLOT_CLEAR = null;
}