mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream B/CB/S

Browse source 
Remove two features added upstream
This commit is contained in:
Zach Brown 2016-08-27 18:41:58 -05:00
commit fcbbc76319
14 changed files with 29 additions and 697 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Spigot-Server-Patches/Chunk-save-queue-improvements.patch
View file

@ -91,7 +91,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
}
public boolean c() {
- if (this.b.isEmpty()) {
- // CraftBukkit start
- Iterator<Map.Entry<ChunkCoordIntPair, NBTTagCompound>> iter = this.b.entrySet().iterator();
- if (!iter.hasNext()) {
- // CraftBukkit end
+ // Paper start - Chunk queue improvements
+ QueuedChunk chunk = queue.poll();
+ if (chunk == null) {
@ -102,14 +105,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
return false;
} else {
- ChunkCoordIntPair chunkcoordintpair = (ChunkCoordIntPair) this.b.keySet().iterator().next();
- // CraftBukkit start
- Map.Entry<ChunkCoordIntPair, NBTTagCompound> entry = iter.next();
- iter.remove(); // Pop single entry
- ChunkCoordIntPair chunkcoordintpair = entry.getKey();
- // CraftBukkit end
+ ChunkCoordIntPair chunkcoordintpair = chunk.coords; // Paper - Chunk queue improvements
boolean flag;
try {
- this.c.add(chunkcoordintpair);
- NBTTagCompound nbttagcompound = (NBTTagCompound) this.b.remove(chunkcoordintpair);
- NBTTagCompound nbttagcompound = (NBTTagCompound) entry.getValue(); // CraftBukkit
+ //this.c.add(chunkcoordintpair);
+ NBTTagCompound nbttagcompound = chunk.compound; // Paper - Chunk queue improvements