EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 11:44:42 +02:00
Code Issues Projects Releases Wiki Activity

nope.avi

Browse Source 
Revert "Protect placeStore. It's ugly and still needs work."

This reverts commit 1fe182babe.
This commit is contained in:
NuclearW
2013-02-17 10:05:35 -05:00
parent f2b03896e2
commit 57e6e5400b
14 changed files with 46 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java
View File

@ -619,9 +619,11 @@ public class HashChunkManager implements ChunkManager {
List<Entity> tempSpawnedMobs = new ArrayList<Entity>(spawnedMobs);
for (Entity entity : tempSpawnedMobs) {
if (entity.isDead() || !entity.isValid()) {
if (entity.isDead())
mobsToRemove.add(entity);
if (!entity.isValid())
mobsToRemove.add(entity);
}
}
spawnedMobs.removeAll(mobsToRemove);

2
src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java
View File

@ -34,7 +34,7 @@ public class BlockStoreConversionZDirectory implements Runnable {
this.world = world;
this.scheduler = mcMMO.p.getServer().getScheduler();
this.manager = new HashChunkletManager();
this.newManager = (HashChunkManager) mcMMO.p.getChunkStore();
this.newManager = (HashChunkManager) mcMMO.placeStore;
this.dataDir = dataDir;
this.xDir = xDir;