Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.7.8

Browse Source
This commit is contained in:
Travis Watkins
2014-04-10 20:04:38 -05:00
parent 0df7555cec
commit 8f771c7378
50 changed files with 1875 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/minecraft/server/WorldServer.java
View File

@@ -9,6 +9,7 @@ import java.util.Random;
import java.util.Set;
import java.util.TreeSet;
import net.minecraft.util.com.google.common.collect.Lists;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -765,14 +766,14 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
}
this.chunkProvider.saveChunks(flag, iprogressupdate);
// CraftBukkit - List -> Collection
Collection list = this.chunkProviderServer.a();
Iterator iterator = list.iterator();
// CraftBukkit - ArrayList -> Collection
Collection arraylist = this.chunkProviderServer.a();
Iterator iterator = arraylist.iterator();
while (iterator.hasNext()) {
Chunk chunk = (Chunk) iterator.next();
if (!this.manager.a(chunk.locX, chunk.locZ)) {
if (chunk != null && !this.manager.a(chunk.locX, chunk.locZ)) {
this.chunkProviderServer.queueUnload(chunk.locX, chunk.locZ);
}
}
@@ -787,7 +788,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
protected void a() throws ExceptionWorldConflict { // CraftBukkit - added throws
this.G();
this.dataManager.saveWorldData(this.worldData, this.server.getPlayerList().q());
this.dataManager.saveWorldData(this.worldData, this.server.getPlayerList().t());
// CraftBukkit start - save worldMaps once, rather than once per shared world
if (!(this instanceof SecondaryWorldServer)) {
this.worldMaps.a();
@@ -961,7 +962,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
}
protected int p() {
return this.server.getPlayerList().o();
return this.server.getPlayerList().s();
}
public MinecraftServer getMinecraftServer() {