SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-705: Fix possible CME

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-03-15 21:38:05 +00:00
parent 1434cff8a2
commit 605de3306b
3 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
paper-server/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
View File

@@ -12,6 +12,8 @@ import org.bukkit.craftbukkit.util.LongHash;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.minecraft.server.Entity;
import net.minecraft.server.EntitySlice;
class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChunk, Chunk, Runnable, RuntimeException> {
private final AtomicInteger threadNumber = new AtomicInteger(1);
@@ -40,6 +42,10 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
queuedChunk.provider.originalGetChunkAt(queuedChunk.x, queuedChunk.z);
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);
chunk.setLastSaved(queuedChunk.provider.world.getTime());