Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the entity slice loading

Browse Source
This commit is contained in:
Thinkofdeath 2015-03-16 19:44:51 +00:00
parent 22ee419816
commit 30d751b362
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nms-patches/ChunkRegionLoader.patch
View File

@ -1,5 +1,5 @@
--- /home/matt/mc-dev-private//net/minecraft/server/ChunkRegionLoader.java 2015-02-26 22:40:22.327608142 +0000 --- /home/matt/mc-dev-private//net/minecraft/server/ChunkRegionLoader.java 2015-03-16 19:44:31.166833062 +0000
+++ src/main/java/net/minecraft/server/ChunkRegionLoader.java 2015-02-26 22:40:22.331608142 +0000 +++ src/main/java/net/minecraft/server/ChunkRegionLoader.java 2015-03-16 19:44:31.166833062 +0000
@@ -25,7 +25,39 @@ @@ -25,7 +25,39 @@
this.e = file; this.e = file;
} }
@ -107,7 +107,7 @@
} }
chunksection.a(achar); chunksection.a(achar);
@@ -326,6 +395,13 @@ @@ -326,6 +395,17 @@
chunk.a(nbttagcompound.getByteArray("Biomes")); chunk.a(nbttagcompound.getByteArray("Biomes"));
} }
@ -116,12 +116,16 @@
+ } + }
+ +
+ public void loadEntities(Chunk chunk, NBTTagCompound nbttagcompound, World world) { + public void loadEntities(Chunk chunk, NBTTagCompound nbttagcompound, World world) {
+ // moved from Chunk.<init>
+ for (int k = 0; k < chunk.entitySlices.length; ++k) {
+ chunk.entitySlices[k] = new EntitySlice(Entity.class);
+ }
+ // CraftBukkit end + // CraftBukkit end
+ +
NBTTagList nbttaglist1 = nbttagcompound.getList("Entities", 10); NBTTagList nbttaglist1 = nbttagcompound.getList("Entities", 10);
if (nbttaglist1 != null) { if (nbttaglist1 != null) {
@@ -384,7 +460,7 @@ @@ -384,7 +464,7 @@
} }
} }

4
src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
View File

@ -42,10 +42,6 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
queuedChunk.provider.originalGetChunkAt(queuedChunk.x, queuedChunk.z); queuedChunk.provider.originalGetChunkAt(queuedChunk.x, queuedChunk.z);
return; return;
} }
// moved from Chunk.<init>
for (int k = 0; k < chunk.entitySlices.length; ++k) {
chunk.entitySlices[k] = new EntitySlice(Entity.class);
}
queuedChunk.loader.loadEntities(chunk, queuedChunk.compound.getCompound("Level"), queuedChunk.world); queuedChunk.loader.loadEntities(chunk, queuedChunk.compound.getCompound("Level"), queuedChunk.world);
chunk.setLastSaved(queuedChunk.provider.world.getTime()); chunk.setLastSaved(queuedChunk.provider.world.getTime());