Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
2019-04-23 12:00:00 +10:00 · 2019-04-23 12:00:00 +10:00 · a0f2b74c8d
commit a0f2b74c8d
parent 0e98365784
560 changed files with 10642 additions and 10867 deletions
--- a/paper-server/nms-patches/PlayerList.patch
+++ b/paper-server/nms-patches/PlayerList.patch
@ -1,6 +1,6 @@
 --- a/net/minecraft/server/PlayerList.java
 +++ b/net/minecraft/server/PlayerList.java
-@@ -18,6 +18,29 @@
+@@ -18,6 +18,27 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@ -10,11 +10,9 @@
 +
 +import org.bukkit.craftbukkit.CraftServer;
 +import org.bukkit.craftbukkit.CraftWorld;
-+import org.bukkit.craftbukkit.chunkio.ChunkIOExecutor;
 +
 +import org.bukkit.Bukkit;
 +import org.bukkit.Location;
-+import org.bukkit.TravelAgent;
 +import org.bukkit.craftbukkit.util.CraftChatMessage;
 +import org.bukkit.entity.Player;
 +import org.bukkit.event.player.PlayerChangedWorldEvent;
@ -30,7 +28,7 @@
 public abstract class PlayerList {
 
     public static final File a = new File("banned-players.json");
-@@ -27,14 +50,16 @@
+@@ -27,14 +48,16 @@
     private static final Logger f = LogManager.getLogger();
     private static final SimpleDateFormat g = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z");
     private final MinecraftServer server;
@ -49,16 +47,16 @@
 +    // CraftBukkit end
     public IPlayerFileData playerFileData;
     private boolean hasWhitelist;
-     protected int maxPlayers;
-@@ -43,13 +68,23 @@
+     protected final int maxPlayers;
+@@ -43,13 +66,23 @@
     private boolean u;
     private int v;
 
 +    // CraftBukkit start
 +    private CraftServer cserver;
 +
-     public PlayerList(MinecraftServer minecraftserver) {
-+        this.cserver = minecraftserver.server = new CraftServer(minecraftserver, this);
+     public PlayerList(MinecraftServer minecraftserver, int i) {
+        this.cserver = minecraftserver.server = new CraftServer((DedicatedServer) minecraftserver, this);
 +        minecraftserver.console = org.bukkit.craftbukkit.command.ColouredConsoleSender.getInstance();
 +        minecraftserver.reader.addCompleter(new org.bukkit.craftbukkit.command.ConsoleCommandCompleter(minecraftserver.server));
 +        // CraftBukkit end
@ -74,12 +72,12 @@
 +        // this.p = Maps.newHashMap();
 +        // CraftBukkit end
         this.server = minecraftserver;
+         this.maxPlayers = i;
         this.getProfileBans().a(true);
-         this.getIPBans().a(true);
-@@ -64,6 +99,12 @@
- 
+@@ -65,6 +98,12 @@
         usercache.a(gameprofile);
         NBTTagCompound nbttagcompound = this.a(entityplayer);
+         WorldServer worldserver = this.server.getWorldServer(entityplayer.dimension);
 +        // CraftBukkit start - Better rename detection
 +        if (nbttagcompound != null && nbttagcompound.hasKey("bukkit")) {
 +            NBTTagCompound bukkit = nbttagcompound.getCompound("bukkit");
@ -87,40 +85,107 @@
 +        }
 +        // CraftBukkit end
 
-         entityplayer.spawnIn(this.server.getWorldServer(entityplayer.dimension));
+         entityplayer.spawnIn(worldserver);
         entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
-@@ -73,7 +114,8 @@
+@@ -74,13 +113,15 @@
             s1 = networkmanager.getSocketAddress().toString();
         }
 
 -        PlayerList.f.info("{}[{}] logged in with entity id {} at ({}, {}, {})", entityplayer.getDisplayName().getString(), s1, entityplayer.getId(), entityplayer.locX, entityplayer.locY, entityplayer.locZ);
 +        // CraftBukkit - Moved message to after join
 +        // PlayerList.f.info("{}[{}] logged in with entity id {} at ({}, {}, {})", entityplayer.getDisplayName().getString(), s1, entityplayer.getId(), entityplayer.locX, entityplayer.locY, entityplayer.locZ);
-         WorldServer worldserver = this.server.getWorldServer(entityplayer.dimension);
         WorldData worlddata = worldserver.getWorldData();
 
-@@ -81,6 +123,7 @@
+         this.a(entityplayer, (EntityPlayer) null, worldserver);
         PlayerConnection playerconnection = new PlayerConnection(this.server, networkmanager, entityplayer);
 
-         playerconnection.sendPacket(new PacketPlayOutLogin(entityplayer.getId(), entityplayer.playerInteractManager.getGameMode(), worlddata.isHardcore(), worldserver.worldProvider.getDimensionManager(), worldserver.getDifficulty(), this.getMaxPlayers(), worlddata.getType(), worldserver.getGameRules().getBoolean("reducedDebugInfo")));
+         playerconnection.sendPacket(new PacketPlayOutLogin(entityplayer.getId(), entityplayer.playerInteractManager.getGameMode(), worlddata.isHardcore(), worldserver.worldProvider.getDimensionManager(), this.getMaxPlayers(), worlddata.getType(), this.s, worldserver.getGameRules().getBoolean("reducedDebugInfo")));
 +        entityplayer.getBukkitEntity().sendSupportedChannels(); // CraftBukkit
-         playerconnection.sendPacket(new PacketPlayOutCustomPayload(PacketPlayOutCustomPayload.b, (new PacketDataSerializer(Unpooled.buffer())).a(this.getServer().getServerModName())));
+         playerconnection.sendPacket(new PacketPlayOutCustomPayload(PacketPlayOutCustomPayload.a, (new PacketDataSerializer(Unpooled.buffer())).a(this.getServer().getServerModName())));
         playerconnection.sendPacket(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
         playerconnection.sendPacket(new PacketPlayOutAbilities(entityplayer.abilities));
-@@ -100,8 +143,10 @@
+@@ -99,19 +140,61 @@
+         } else {
             chatmessage = new ChatMessage("multiplayer.player.joined.renamed", new Object[] { entityplayer.getScoreboardDisplayName(), s});
         }
+        // CraftBukkit start
+        chatmessage.a(EnumChatFormat.YELLOW);
+        String joinMessage = CraftChatMessage.fromComponent(chatmessage);
 
 -        this.sendMessage(chatmessage.a(EnumChatFormat.YELLOW));
-        this.onPlayerJoin(entityplayer);
-+        chatmessage.a(EnumChatFormat.YELLOW);
-+        this.onPlayerJoin(entityplayer, CraftChatMessage.fromComponent(chatmessage));
-+        // CraftBukkit end
-+        worldserver = server.getWorldServer(entityplayer.dimension);  // CraftBukkit - Update in case join event changed it
         playerconnection.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
-         this.b(entityplayer, worldserver);
+         this.players.add(entityplayer);
+         this.j.put(entityplayer.getUniqueID(), entityplayer);
+-        this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { entityplayer}));
+        // this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { entityplayer})); // CraftBukkit - replaced with loop below
+
+        // CraftBukkit start
+        PlayerJoinEvent playerJoinEvent = new PlayerJoinEvent(cserver.getPlayer(entityplayer), joinMessage);
+        cserver.getPluginManager().callEvent(playerJoinEvent);
+
+        if (!entityplayer.playerConnection.networkManager.isConnected()) {
+            return;
+        }
+
+        joinMessage = playerJoinEvent.getJoinMessage();
+
+        if (joinMessage != null && joinMessage.length() > 0) {
+            for (IChatBaseComponent line : org.bukkit.craftbukkit.util.CraftChatMessage.fromString(joinMessage)) {
+                server.getPlayerList().sendAll(new PacketPlayOutChat(line));
+            }
+        }
+        // CraftBukkit end
+
+        // CraftBukkit start - sendAll above replaced with this loop
+        PacketPlayOutPlayerInfo packet = new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, entityplayer);
+ 
+         for (int i = 0; i < this.players.size(); ++i) {
+-            entityplayer.playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { (EntityPlayer) this.players.get(i)}));
+            EntityPlayer entityplayer1 = (EntityPlayer) this.players.get(i);
+
+            if (entityplayer1.getBukkitEntity().canSee(entityplayer.getBukkitEntity())) {
+                entityplayer1.playerConnection.sendPacket(packet);
+            }
+
+            if (!entityplayer.getBukkitEntity().canSee(entityplayer1.getBukkitEntity())) {
+                continue;
+            }
+
+            entityplayer.playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { entityplayer1}));
+        }
+        entityplayer.sentListPacket = true;
+        // CraftBukkit end
+
+        entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityMetadata(entityplayer.getId(), entityplayer.datawatcher, true)); // CraftBukkit - BungeeCord#2321, send complete data to self on spawn
+
+        // CraftBukkit start - Only add if the player wasn't moved in the event
+        if (entityplayer.world == worldserver && !worldserver.getPlayers().contains(entityplayer)) {
+            worldserver.addPlayerJoin(entityplayer);
+            this.server.getBossBattleCustomData().a(entityplayer);
+         }
+ 
+-        worldserver.addPlayerJoin(entityplayer);
+-        this.server.getBossBattleCustomData().a(entityplayer);
+        worldserver = server.getWorldServer(entityplayer.dimension);  // CraftBukkit - Update in case join event changed it
+        // CraftBukkit end
+         this.a(entityplayer, worldserver);
         if (!this.server.getResourcePack().isEmpty()) {
-@@ -153,6 +198,8 @@
+             entityplayer.setResourcePack(this.server.getResourcePack(), this.server.getResourcePackHash());
+@@ -127,8 +210,11 @@
+ 
+         if (nbttagcompound != null && nbttagcompound.hasKeyOfType("RootVehicle", 10)) {
+             NBTTagCompound nbttagcompound1 = nbttagcompound.getCompound("RootVehicle");
+-            Entity entity = EntityTypes.a(nbttagcompound1.getCompound("Entity"), worldserver, (entity1) -> {
+-                return !worldserver.addEntitySerialized(entity1) ? null : entity1;
+            // CraftBukkit start
+            WorldServer finalWorldServer = worldserver;
+            Entity entity = EntityTypes.a(nbttagcompound1.getCompound("Entity"), finalWorldServer, (entity1) -> {
+                return !finalWorldServer.addEntitySerialized(entity1) ? null : entity1;
+                // CraftBukkit end
+             });
+ 
+             if (entity != null) {
+@@ -164,6 +250,8 @@
         }
 
         entityplayer.syncInventory();
@ -129,40 +194,45 @@
     }
 
     public void sendScoreboard(ScoreboardServer scoreboardserver, EntityPlayer entityplayer) {
-@@ -185,26 +232,27 @@
+@@ -196,31 +284,32 @@
     }
 
     public void setPlayerFileData(WorldServer worldserver) {
 +        if (playerFileData != null) return; // CraftBukkit
-         this.playerFileData = worldserver.getDataManager().getPlayerFileData();
+         this.playerFileData = worldserver.getDataManager();
         worldserver.getWorldBorder().a(new IWorldBorderListener() {
+             @Override
             public void a(WorldBorder worldborder, double d0) {
 -                PlayerList.this.sendAll(new PacketPlayOutWorldBorder(worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction.SET_SIZE));
 +                PlayerList.this.sendAll(new PacketPlayOutWorldBorder(worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction.SET_SIZE), worldborder.world);
             }
 
+             @Override
             public void a(WorldBorder worldborder, double d0, double d1, long i) {
 -                PlayerList.this.sendAll(new PacketPlayOutWorldBorder(worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction.LERP_SIZE));
 +                PlayerList.this.sendAll(new PacketPlayOutWorldBorder(worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction.LERP_SIZE), worldborder.world);
             }
 
+             @Override
             public void a(WorldBorder worldborder, double d0, double d1) {
 -                PlayerList.this.sendAll(new PacketPlayOutWorldBorder(worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction.SET_CENTER));
 +                PlayerList.this.sendAll(new PacketPlayOutWorldBorder(worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction.SET_CENTER), worldborder.world);
             }
 
+             @Override
             public void a(WorldBorder worldborder, int i) {
 -                PlayerList.this.sendAll(new PacketPlayOutWorldBorder(worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction.SET_WARNING_TIME));
 +                PlayerList.this.sendAll(new PacketPlayOutWorldBorder(worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction.SET_WARNING_TIME), worldborder.world);
             }
 
+             @Override
             public void b(WorldBorder worldborder, int i) {
 -                PlayerList.this.sendAll(new PacketPlayOutWorldBorder(worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction.SET_WARNING_BLOCKS));
 +                PlayerList.this.sendAll(new PacketPlayOutWorldBorder(worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction.SET_WARNING_BLOCKS), worldborder.world);
             }
 
-             public void b(WorldBorder worldborder, double d0) {}
-@@ -252,14 +300,15 @@
+             @Override
+@@ -248,14 +337,15 @@
     }
 
     protected void savePlayerFile(EntityPlayer entityplayer) {
@ -180,75 +250,10 @@
 
         if (advancementdataplayer != null) {
             advancementdataplayer.c();
-@@ -267,29 +316,80 @@
+@@ -263,10 +353,21 @@
 
     }
 
-    public void onPlayerJoin(EntityPlayer entityplayer) {
-+    public void onPlayerJoin(EntityPlayer entityplayer, String joinMessage) { // CraftBukkit added param
-         this.players.add(entityplayer);
-         this.j.put(entityplayer.getUniqueID(), entityplayer);
-        this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { entityplayer}));
-+        // this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { entityplayer})); // CraftBukkit - replaced with loop below
-         WorldServer worldserver = this.server.getWorldServer(entityplayer.dimension);
- 
-+        // CraftBukkit start
-+        PlayerJoinEvent playerJoinEvent = new PlayerJoinEvent(cserver.getPlayer(entityplayer), joinMessage);
-+        cserver.getPluginManager().callEvent(playerJoinEvent);
-+
-+        if (!entityplayer.playerConnection.networkManager.isConnected()) {
-+            return;
-+        }
-+
-+        joinMessage = playerJoinEvent.getJoinMessage();
-+
-+        if (joinMessage != null && joinMessage.length() > 0) {
-+            for (IChatBaseComponent line : org.bukkit.craftbukkit.util.CraftChatMessage.fromString(joinMessage)) {
-+                server.getPlayerList().sendAll(new PacketPlayOutChat(line));
-+            }
-+        }
-+
-+        ChunkIOExecutor.adjustPoolSize(getPlayerCount());
-+        // CraftBukkit end
-+
-+        // CraftBukkit start - sendAll above replaced with this loop
-+        PacketPlayOutPlayerInfo packet = new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, entityplayer);
-+
-         for (int i = 0; i < this.players.size(); ++i) {
-            entityplayer.playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { (EntityPlayer) this.players.get(i)}));
-+            EntityPlayer entityplayer1 = (EntityPlayer) this.players.get(i);
-+
-+            if (entityplayer1.getBukkitEntity().canSee(entityplayer.getBukkitEntity())) {
-+                entityplayer1.playerConnection.sendPacket(packet);
-+            }
-+
-+            if (!entityplayer.getBukkitEntity().canSee(entityplayer1.getBukkitEntity())) {
-+                continue;
-+            }
-+
-+            entityplayer.playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { entityplayer1}));
-         }
-+        entityplayer.sentListPacket = true;
-+        // CraftBukkit end
-+
-+        entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityMetadata(entityplayer.getId(), entityplayer.datawatcher, true)); // CraftBukkit - BungeeCord#2321, send complete data to self on spawn
- 
-        worldserver.addEntity(entityplayer);
-        this.a(entityplayer, (WorldServer) null);
-        this.server.getBossBattleCustomData().a(entityplayer);
-+        // CraftBukkit start - Only add if the player wasn't moved in the event
-+        if (entityplayer.world == worldserver && !worldserver.players.contains(entityplayer)) {
-+            worldserver.addEntity(entityplayer);
-+            this.a(entityplayer, (WorldServer) null);
-+            this.server.getBossBattleCustomData().a(entityplayer);
-+        }
-+        // CraftBukkit end
-     }
- 
-     public void updateChunks(EntityPlayer entityplayer) {
-         entityplayer.getWorldServer().getPlayerChunkMap().movePlayer(entityplayer);
-     }
- 
 -    public void disconnect(EntityPlayer entityplayer) {
 +    public String disconnect(EntityPlayer entityplayer) { // CraftBukkit - return string
         WorldServer worldserver = entityplayer.getWorldServer();
@ -268,7 +273,7 @@
         this.savePlayerFile(entityplayer);
         if (entityplayer.isPassenger()) {
             Entity entity = entityplayer.getRootVehicle();
-@@ -320,18 +420,68 @@
+@@ -297,18 +398,66 @@
 
         if (entityplayer1 == entityplayer) {
             this.j.remove(uuid);
@ -297,8 +302,6 @@
 +        cserver.getScoreboardManager().removePlayer(entityplayer.getBukkitEntity());
 +        // CraftBukkit end
 +
-+        ChunkIOExecutor.adjustPoolSize(this.getPlayerCount()); // CraftBukkit
-+
 +        return playerQuitEvent.getQuitMessage(); // CraftBukkit
     }
 
@ -343,7 +346,7 @@
             GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.k.get(gameprofile);
 
             chatmessage = new ChatMessage("multiplayer.disconnect.banned.reason", new Object[] { gameprofilebanentry.getReason()});
-@@ -339,10 +489,12 @@
+@@ -316,10 +465,12 @@
                 chatmessage.addSibling(new ChatMessage("multiplayer.disconnect.banned.expiration", new Object[] { PlayerList.g.format(gameprofilebanentry.getExpires())}));
             }
 
@ -359,7 +362,7 @@
             IpBanEntry ipbanentry = this.l.get(socketaddress);
 
             chatmessage = new ChatMessage("multiplayer.disconnect.banned_ip.reason", new Object[] { ipbanentry.getReason()});
-@@ -350,13 +502,25 @@
+@@ -327,13 +478,25 @@
                 chatmessage.addSibling(new ChatMessage("multiplayer.disconnect.banned_ip.expiration", new Object[] { PlayerList.g.format(ipbanentry.getExpires())}));
             }
 
@ -388,7 +391,7 @@
         UUID uuid = EntityHuman.a(gameprofile);
         List<EntityPlayer> list = Lists.newArrayList();
 
-@@ -391,17 +555,27 @@
+@@ -368,14 +531,24 @@
         }
 
         return new EntityPlayer(this.server, this.server.getWorldServer(DimensionManager.OVERWORLD), gameprofile, (PlayerInteractManager) object);
@ -404,12 +407,8 @@
 +
 +    public EntityPlayer moveToWorld(EntityPlayer entityplayer, DimensionManager dimensionmanager, boolean flag, Location location, boolean avoidSuffocation) {
 +        entityplayer.stopRiding(); // CraftBukkit
-         entityplayer.getWorldServer().getTracker().untrackPlayer(entityplayer);
-        entityplayer.getWorldServer().getTracker().untrackEntity(entityplayer);
-+        // entityplayer.getWorldServer().getTracker().untrackEntity(entityplayer); // CraftBukkit
-         entityplayer.getWorldServer().getPlayerChunkMap().removePlayer(entityplayer);
         this.players.remove(entityplayer);
-         this.server.getWorldServer(entityplayer.dimension).removeEntity(entityplayer);
+         entityplayer.getWorldServer().removePlayer(entityplayer);
         BlockPosition blockposition = entityplayer.getBed();
         boolean flag1 = entityplayer.isRespawnForced();
 
@ -417,7 +416,7 @@
         entityplayer.dimension = dimensionmanager;
         Object object;
 
-@@ -412,6 +586,11 @@
+@@ -386,6 +559,11 @@
         }
 
         EntityPlayer entityplayer1 = new EntityPlayer(this.server, this.server.getWorldServer(entityplayer.dimension), entityplayer.getProfile(), (PlayerInteractManager) object);
@ -429,7 +428,7 @@
 
         entityplayer1.playerConnection = entityplayer.playerConnection;
         entityplayer1.copyFrom(entityplayer, flag);
-@@ -425,43 +604,160 @@
+@@ -399,40 +577,97 @@
             entityplayer1.addScoreboardTag(s);
         }
 
@ -437,22 +436,22 @@
 +        // WorldServer worldserver = this.server.getWorldServer(entityplayer.dimension);  // CraftBukkit - handled later
 
 -        this.a(entityplayer1, entityplayer, worldserver);
-+        // this.a(entityplayer1, entityplayer, worldserver); // CraftBukkit - removed
-         BlockPosition blockposition1;
- 
 -        if (blockposition != null) {
-            blockposition1 = EntityHuman.getBed(this.server.getWorldServer(entityplayer.dimension), blockposition, flag1);
+-            BlockPosition blockposition1 = EntityHuman.getBed(this.server.getWorldServer(entityplayer.dimension), blockposition, flag1);
+-
 -            if (blockposition1 != null) {
 -                entityplayer1.setPositionRotation((double) ((float) blockposition1.getX() + 0.5F), (double) ((float) blockposition1.getY() + 0.1F), (double) ((float) blockposition1.getZ() + 0.5F), 0.0F, 0.0F);
 -                entityplayer1.setRespawnPosition(blockposition, flag1);
 -            } else {
 -                entityplayer1.playerConnection.sendPacket(new PacketPlayOutGameStateChange(0, 0.0F));
+        // this.a(entityplayer1, entityplayer, worldserver); // CraftBukkit - removed
+
 +        // CraftBukkit start - fire PlayerRespawnEvent
 +        if (location == null) {
 +            boolean isBedSpawn = false;
 +            CraftWorld cworld = (CraftWorld) this.server.server.getWorld(entityplayer.spawnWorld);
 +            if (cworld != null && blockposition != null) {
-+                blockposition1 = EntityHuman.getBed(cworld.getHandle(), blockposition, flag1);
+                BlockPosition blockposition1 = EntityHuman.getBed(cworld.getHandle(), blockposition, flag1);
 +                if (blockposition1 != null) {
 +                    isBedSpawn = true;
 +                    location = new Location(cworld, (double) ((float) blockposition1.getX() + 0.5F), (double) ((float) blockposition1.getY() + 0.1F), (double) ((float) blockposition1.getZ() + 0.5F));
@ -481,39 +480,40 @@
 +        entityplayer1.forceSetPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
 +        // CraftBukkit end
 
-         worldserver.getChunkProvider().getChunkAt((int) entityplayer1.locX >> 4, (int) entityplayer1.locZ >> 4, true, true);
- 
-        while (!worldserver.getCubes(entityplayer1, entityplayer1.getBoundingBox()) && entityplayer1.locY < 256.0D) {
-+        while (avoidSuffocation && !worldserver.getCubes(entityplayer1, entityplayer1.getBoundingBox()) && entityplayer1.locY < 256.0D) {
+-        while (!worldserver.getCubes(entityplayer1) && entityplayer1.locY < 256.0D) {
+        while (avoidSuffocation && !worldserver.getCubes(entityplayer1) && entityplayer1.locY < 256.0D) {
             entityplayer1.setPosition(entityplayer1.locX, entityplayer1.locY + 1.0D, entityplayer1.locZ);
         }
 +        // CraftBukkit start
 +        // Force the client to refresh their chunk cache
 +        if (fromWorld.getEnvironment() == worldserver.getWorld().getEnvironment()) {
-+            entityplayer1.playerConnection.sendPacket(new PacketPlayOutRespawn(worldserver.worldProvider.getDimensionManager().getDimensionID() >= 0 ? DimensionManager.NETHER : DimensionManager.OVERWORLD, worldserver.getDifficulty(), worldserver.getWorldData().getType(), entityplayer.playerInteractManager.getGameMode()));
+            entityplayer1.playerConnection.sendPacket(new PacketPlayOutRespawn(worldserver.worldProvider.getDimensionManager().getDimensionID() >= 0 ? DimensionManager.NETHER : DimensionManager.OVERWORLD, worldserver.getWorldData().getType(), entityplayer.playerInteractManager.getGameMode()));
 +        }
 
-        entityplayer1.playerConnection.sendPacket(new PacketPlayOutRespawn(entityplayer1.dimension, entityplayer1.world.getDifficulty(), entityplayer1.world.getWorldData().getType(), entityplayer1.playerInteractManager.getGameMode()));
-+        entityplayer1.playerConnection.sendPacket(new PacketPlayOutRespawn(worldserver.worldProvider.getDimensionManager(), worldserver.getDifficulty(), worldserver.getWorldData().getType(), entityplayer1.playerInteractManager.getGameMode()));
+-        WorldData worlddata = entityplayer1.world.getWorldData();
+        WorldData worlddata = worldserver.getWorldData();
+ 
+-        entityplayer1.playerConnection.sendPacket(new PacketPlayOutRespawn(entityplayer1.dimension, worlddata.getType(), entityplayer1.playerInteractManager.getGameMode()));
+        entityplayer1.playerConnection.sendPacket(new PacketPlayOutRespawn(worldserver.worldProvider.getDimensionManager(), worldserver.getWorldData().getType(), entityplayer1.playerInteractManager.getGameMode()));
 +        entityplayer1.spawnIn(worldserver);
 +        entityplayer1.dead = false;
 +        entityplayer1.playerConnection.teleport(new Location(worldserver.getWorld(), entityplayer1.locX, entityplayer1.locY, entityplayer1.locZ, entityplayer1.yaw, entityplayer1.pitch));
 +        entityplayer1.setSneaking(false);
-         blockposition1 = worldserver.getSpawn();
+         BlockPosition blockposition2 = worldserver.getSpawn();
+ 
 -        entityplayer1.playerConnection.a(entityplayer1.locX, entityplayer1.locY, entityplayer1.locZ, entityplayer1.yaw, entityplayer1.pitch);
 +        // entityplayer1.playerConnection.a(entityplayer1.locX, entityplayer1.locY, entityplayer1.locZ, entityplayer1.yaw, entityplayer1.pitch);
-         entityplayer1.playerConnection.sendPacket(new PacketPlayOutSpawnPosition(blockposition1));
+         entityplayer1.playerConnection.sendPacket(new PacketPlayOutSpawnPosition(blockposition2));
+         entityplayer1.playerConnection.sendPacket(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
         entityplayer1.playerConnection.sendPacket(new PacketPlayOutExperience(entityplayer1.exp, entityplayer1.expTotal, entityplayer1.expLevel));
-         this.b(entityplayer1, worldserver);
-         this.f(entityplayer1);
-        worldserver.getPlayerChunkMap().addPlayer(entityplayer1);
-        worldserver.addEntity(entityplayer1);
+         this.a(entityplayer1, worldserver);
+         this.d(entityplayer1);
+-        worldserver.addPlayerRespawn(entityplayer1);
 -        this.players.add(entityplayer1);
 -        this.j.put(entityplayer1.getUniqueID(), entityplayer1);
 -        entityplayer1.syncInventory();
 +        if (!entityplayer.playerConnection.isDisconnected()) {
-+            worldserver.getPlayerChunkMap().addPlayer(entityplayer1);
-+            worldserver.addEntity(entityplayer1);
+            worldserver.addPlayerRespawn(entityplayer1);
 +            this.players.add(entityplayer1);
 +            this.j.put(entityplayer1.getUniqueID(), entityplayer1);
 +        }
@ -528,10 +528,7 @@
 +        }
 +
 +        // Fire advancement trigger
-+        CriterionTriggers.v.a(entityplayer, ((CraftWorld) fromWorld).getHandle().worldProvider.getDimensionManager(), worldserver.worldProvider.getDimensionManager());
-+        if (((CraftWorld) fromWorld).getHandle().worldProvider.getDimensionManager() == DimensionManager.NETHER && worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD && entityplayer.M() != null) {
-+            CriterionTriggers.C.a(entityplayer, entityplayer.M());
-+        }
+        entityplayer.b(((CraftWorld) fromWorld).getHandle());
 +
 +        // Don't fire on respawn
 +        if (fromWorld != location.getWorld()) {
@ -547,241 +544,7 @@
         return entityplayer1;
     }
 
-+    // CraftBukkit start - Replaced the standard handling of portals with a more customised method.
-+    public void changeDimension(EntityPlayer entityplayer, DimensionManager dimensionManager, TeleportCause cause) {
-+        WorldServer exitWorld = null;
-+        if (entityplayer.dimension.getDimensionID() < CraftWorld.CUSTOM_DIMENSION_OFFSET) { // plugins must specify exit from custom Bukkit worlds
-+            exitWorld = server.getWorldServer(dimensionManager);
-+        }
-+
-+        Location enter = entityplayer.getBukkitEntity().getLocation();
-+        Location exit = null;
-+        boolean useTravelAgent = false; // don't use agent for custom worlds or return from THE_END
-+        if (exitWorld != null) {
-+            if ((cause == TeleportCause.END_PORTAL) && (dimensionManager == DimensionManager.OVERWORLD)) {
-+                // THE_END -> NORMAL; use bed if available, otherwise default spawn
-+                exit = ((org.bukkit.craftbukkit.entity.CraftPlayer) entityplayer.getBukkitEntity()).getBedSpawnLocation();
-+                if (exit == null || ((CraftWorld) exit.getWorld()).getHandle().dimension != DimensionManager.OVERWORLD) {
-+                    BlockPosition randomSpawn = entityplayer.getSpawnPoint(exitWorld);
-+                    exit = new Location(exitWorld.getWorld(), randomSpawn.getX(), randomSpawn.getY(), randomSpawn.getZ());
-+                } else {
-+                    exit = exit.add(0.5F, 0.1F, 0.5F); // SPIGOT-3879
-+                }
-+            } else {
-+                // NORMAL <-> NETHER or NORMAL -> THE_END
-+                exit = this.calculateTarget(enter, exitWorld);
-+                useTravelAgent = true;
-+            }
-+        }
-+
-+        TravelAgent agent = exit != null ? (TravelAgent) ((CraftWorld) exit.getWorld()).getHandle().getTravelAgent() : org.bukkit.craftbukkit.CraftTravelAgent.DEFAULT; // return arbitrary TA to compensate for implementation dependent plugins
-+        PlayerPortalEvent event = new PlayerPortalEvent(entityplayer.getBukkitEntity(), enter, exit, agent, cause);
-+        event.useTravelAgent(useTravelAgent);
-+        Bukkit.getServer().getPluginManager().callEvent(event);
-+        if (event.isCancelled() || event.getTo() == null) {
-+            return;
-+        }
-+
-+        exit = event.useTravelAgent() ? event.getPortalTravelAgent().findOrCreate(event.getTo()) : event.getTo();
-+        if (exit == null) {
-+            return;
-+        }
-+        exitWorld = ((CraftWorld) exit.getWorld()).getHandle();
-+
-+        org.bukkit.event.player.PlayerTeleportEvent tpEvent = new org.bukkit.event.player.PlayerTeleportEvent(entityplayer.getBukkitEntity(), enter, exit, cause);
-+        Bukkit.getServer().getPluginManager().callEvent(tpEvent);
-+        if (tpEvent.isCancelled() || tpEvent.getTo() == null) {
-+            return;
-+        }
-+
-+        Vector velocity = entityplayer.getBukkitEntity().getVelocity();
-+        exitWorld.getTravelAgent().adjustExit(entityplayer, exit, velocity);
-+
-+        entityplayer.worldChangeInvuln = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
-+        this.moveToWorld(entityplayer, exitWorld.dimension, true, exit, false); // Vanilla doesn't check for suffocation when handling portals, so neither should we
-+        if (entityplayer.motX != velocity.getX() || entityplayer.motY != velocity.getY() || entityplayer.motZ != velocity.getZ()) {
-+            entityplayer.getBukkitEntity().setVelocity(velocity);
-+        }
-+    }
-+
-     public void f(EntityPlayer entityplayer) {
-         GameProfile gameprofile = entityplayer.getProfile();
-         int i = this.server.a(gameprofile);
-@@ -498,42 +794,69 @@
-     }
- 
-     public void changeWorld(Entity entity, DimensionManager dimensionmanager, WorldServer worldserver, WorldServer worldserver1) {
-+        // CraftBukkit start - Split into modular functions
-+        Location exit = calculateTarget(entity.getBukkitEntity().getLocation(), worldserver1);
-+        repositionEntity(entity, exit, true);
-+    }
-+
-+    // Copy of original changeWorld(Entity, int, WorldServer, WorldServer) method with only location calculation logic
-+    public Location calculateTarget(Location enter, World target) {
-+        WorldServer worldserver = ((CraftWorld) enter.getWorld()).getHandle();
-+        WorldServer worldserver1 = ((CraftWorld) target.getWorld()).getHandle();
-+        DimensionManager dimensionmanager = worldserver.dimension;
-+
-+        double y = enter.getY();
-+        float yaw = enter.getYaw();
-+        float pitch = enter.getPitch();
-+        double d0 = enter.getX();
-+        double d1 = enter.getZ();
-+        double d2 = 8.0D;
-+        /*
-         double d0 = entity.locX;
-         double d1 = entity.locZ;
-         double d2 = 8.0D;
-         float f = entity.yaw;
-+        */
- 
-         worldserver.methodProfiler.enter("moving");
-        if (entity.dimension == DimensionManager.NETHER) {
-+        if (worldserver1.dimension == DimensionManager.NETHER) {
-             d0 = MathHelper.a(d0 / 8.0D, worldserver1.getWorldBorder().b() + 16.0D, worldserver1.getWorldBorder().d() - 16.0D);
-             d1 = MathHelper.a(d1 / 8.0D, worldserver1.getWorldBorder().c() + 16.0D, worldserver1.getWorldBorder().e() - 16.0D);
-+            /*
-             entity.setPositionRotation(d0, entity.locY, d1, entity.yaw, entity.pitch);
-             if (entity.isAlive()) {
-                 worldserver.entityJoinedWorld(entity, false);
-             }
-        } else if (entity.dimension == DimensionManager.OVERWORLD) {
-+            */
-+        } else if (worldserver1.dimension == DimensionManager.OVERWORLD) {
-             d0 = MathHelper.a(d0 * 8.0D, worldserver1.getWorldBorder().b() + 16.0D, worldserver1.getWorldBorder().d() - 16.0D);
-             d1 = MathHelper.a(d1 * 8.0D, worldserver1.getWorldBorder().c() + 16.0D, worldserver1.getWorldBorder().e() - 16.0D);
-+            /*
-             entity.setPositionRotation(d0, entity.locY, d1, entity.yaw, entity.pitch);
-             if (entity.isAlive()) {
-                 worldserver.entityJoinedWorld(entity, false);
-             }
-+            */
-         } else {
-             BlockPosition blockposition;
- 
-             if (dimensionmanager == DimensionManager.THE_END) {
-+                // use default NORMAL world spawn instead of target
-+                worldserver1 = this.server.getWorldServer(DimensionManager.OVERWORLD);
-                 blockposition = worldserver1.getSpawn();
-             } else {
-                 blockposition = worldserver1.getDimensionSpawn();
-             }
- 
-             d0 = (double) blockposition.getX();
-            entity.locY = (double) blockposition.getY();
-+            y = (double) blockposition.getY();
-             d1 = (double) blockposition.getZ();
-+            /*
-             entity.setPositionRotation(d0, entity.locY, d1, 90.0F, 0.0F);
-             if (entity.isAlive()) {
-                 worldserver.entityJoinedWorld(entity, false);
-             }
-+            */
-         }
- 
-         worldserver.methodProfiler.exit();
-@@ -541,22 +864,119 @@
-             worldserver.methodProfiler.enter("placing");
-             d0 = (double) MathHelper.clamp((int) d0, -29999872, 29999872);
-             d1 = (double) MathHelper.clamp((int) d1, -29999872, 29999872);
-+            /*
-             if (entity.isAlive()) {
-                 entity.setPositionRotation(d0, entity.locY, d1, entity.yaw, entity.pitch);
-                 worldserver1.getTravelAgent().a(entity, f);
-                 worldserver1.addEntity(entity);
-                 worldserver1.entityJoinedWorld(entity, false);
-             }
-+            */
-+
-+            worldserver.methodProfiler.exit();
-+        }
-+
-+        // entity.spawnIn(worldserver1);
-+        return new Location(worldserver1.getWorld(), d0, y, d1, yaw, pitch);
-+    }
-+
-+    // copy of original a(Entity, int, WorldServer, WorldServer) method with only entity repositioning logic
-+    public void repositionEntity(Entity entity, Location exit, boolean portal) {
-+        WorldServer worldserver = (WorldServer) entity.world;
-+        WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
-+        DimensionManager dimensionmanager = worldserver.dimension;
-+
-+        /*
-+        double d0 = entity.locX;
-+        double d1 = entity.locZ;
-+        double d2 = 8.0D;
-+        float f = entity.yaw;
-+        */
-+
-+        worldserver.methodProfiler.enter("moving");
-+        entity.setPositionRotation(exit.getX(), exit.getY(), exit.getZ(), exit.getYaw(), exit.getPitch());
-+        if (entity.isAlive()) {
-+            worldserver.entityJoinedWorld(entity, false);
-+        }
-+        /*
-+        if (entity.dimension == DimensionManager.NETHER) {
-+            d0 = MathHelper.a(d0 / 8.0D, worldserver1.getWorldBorder().b() + 16.0D, worldserver1.getWorldBorder().d() - 16.0D);
-+            d1 = MathHelper.a(d1 / 8.0D, worldserver1.getWorldBorder().c() + 16.0D, worldserver1.getWorldBorder().e() - 16.0D);
-+            entity.setPositionRotation(d0, entity.locY, d1, entity.yaw, entity.pitch);
-+            if (entity.isAlive()) {
-+                worldserver.entityJoinedWorld(entity, false);
-+            }
-+        } else if (entity.dimension == DimensionManager.OVERWORLD) {
-+            d0 = MathHelper.a(d0 * 8.0D, worldserver1.getWorldBorder().b() + 16.0D, worldserver1.getWorldBorder().d() - 16.0D);
-+            d1 = MathHelper.a(d1 * 8.0D, worldserver1.getWorldBorder().c() + 16.0D, worldserver1.getWorldBorder().e() - 16.0D);
-+            entity.setPositionRotation(d0, entity.locY, d1, entity.yaw, entity.pitch);
-+            if (entity.isAlive()) {
-+                worldserver.entityJoinedWorld(entity, false);
-+            }
-+        } else {
-+            BlockPosition blockposition;
-+
-+            if (dimensionmanager == DimensionManager.THE_END) {
-+                // use default NORMAL world spawn instead of target
-+                worldserver1 = this.server.worlds.get(0);
-+                blockposition = worldserver1.getSpawn();
-+            } else {
-+                blockposition = worldserver1.getDimensionSpawn();
-+            }
-+
-+            d0 = (double) blockposition.getX();
-+            entity.locY = (double) blockposition.getY();
-+            d1 = (double) blockposition.getZ();
-+            entity.setPositionRotation(d0, entity.locY, d1, 90.0F, 0.0F);
-+            if (entity.isAlive()) {
-+                worldserver.entityJoinedWorld(entity, false);
-+            }
-+        }
-+        */
-+
-+        worldserver.methodProfiler.exit();
-+        if (dimensionmanager != DimensionManager.THE_END) {
-+            worldserver.methodProfiler.enter("placing");
-+            /*
-+            d0 = (double) MathHelper.clamp((int) d0, -29999872, 29999872);
-+            d1 = (double) MathHelper.clamp((int) d1, -29999872, 29999872);
-+            */
-+            if (entity.isAlive()) {
-+                // entity.setPositionRotation(d0, entity.locY, d1, entity.yaw, entity.pitch);
-+                // worldserver1.getTravelAgent().a(entity, f);
-+                if (portal) {
-+                    Vector velocity = entity.getBukkitEntity().getVelocity();
-+                    worldserver1.getTravelAgent().adjustExit(entity, exit, velocity);
-+                    entity.setPositionRotation(exit.getX(), exit.getY(), exit.getZ(), exit.getYaw(), exit.getPitch());
-+                    if (entity.motX != velocity.getX() || entity.motY != velocity.getY() || entity.motZ != velocity.getZ()) {
-+                        entity.getBukkitEntity().setVelocity(velocity);
-+                    }
-+                }
-+                // worldserver1.addEntity(entity);
-+                worldserver1.entityJoinedWorld(entity, false);
-+            }
- 
-             worldserver.methodProfiler.exit();
-         }
- 
-         entity.spawnIn(worldserver1);
-+        // CraftBukkit end
-     }
+@@ -445,7 +680,18 @@
 
     public void tick() {
         if (++this.v > 600) {
@ -801,7 +564,7 @@
             this.v = 0;
         }
 
-@@ -569,6 +989,25 @@
+@@ -458,6 +704,25 @@
 
     }
 
@ -817,8 +580,8 @@
 +    }
 +
 +    public void sendAll(Packet packet, World world) {
-+        for (int i = 0; i < world.players.size(); ++i) {
-+            ((EntityPlayer) world.players.get(i)).playerConnection.sendPacket(packet);
+        for (int i = 0; i < world.getPlayers().size(); ++i) {
+            ((EntityPlayer) world.getPlayers().get(i)).playerConnection.sendPacket(packet);
 +        }
 +
 +    }
@ -827,7 +590,7 @@
     public void a(Packet<?> packet, DimensionManager dimensionmanager) {
         for (int i = 0; i < this.players.size(); ++i) {
             EntityPlayer entityplayer = (EntityPlayer) this.players.get(i);
-@@ -669,6 +1108,7 @@
+@@ -558,6 +823,7 @@
             entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, b0));
         }
 
@ -835,7 +598,7 @@
         this.server.getCommandDispatcher().a(entityplayer);
     }
 
-@@ -701,6 +1141,12 @@
+@@ -590,6 +856,12 @@
         for (int i = 0; i < this.players.size(); ++i) {
             EntityPlayer entityplayer = (EntityPlayer) this.players.get(i);
 
@ -848,28 +611,28 @@
             if (entityplayer != entityhuman && entityplayer.dimension == dimensionmanager) {
                 double d4 = d0 - entityplayer.locX;
                 double d5 = d1 - entityplayer.locY;
-@@ -740,7 +1186,7 @@
+@@ -629,7 +901,7 @@
     public void reloadWhitelist() {}
 
-     public void b(EntityPlayer entityplayer, WorldServer worldserver) {
+     public void a(EntityPlayer entityplayer, WorldServer worldserver) {
 -        WorldBorder worldborder = this.server.getWorldServer(DimensionManager.OVERWORLD).getWorldBorder();
 +        WorldBorder worldborder = entityplayer.world.getWorldBorder(); // CraftBukkit
 
         entityplayer.playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
         entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(worldserver.getTime(), worldserver.getDayTime(), worldserver.getGameRules().getBoolean("doDaylightCycle")));
-@@ -748,17 +1194,26 @@
+@@ -637,17 +909,26 @@
 
         entityplayer.playerConnection.sendPacket(new PacketPlayOutSpawnPosition(blockposition));
         if (worldserver.isRaining()) {
 -            entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(1, 0.0F));
-            entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(7, worldserver.i(1.0F)));
-            entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(8, worldserver.g(1.0F)));
+-            entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(7, worldserver.h(1.0F)));
+-            entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(8, worldserver.f(1.0F)));
 +            // CraftBukkit start - handle player weather
 +            // entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(1, 0.0F));
-+            // entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(7, worldserver.i(1.0F)));
-+            // entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(8, worldserver.g(1.0F)));
+            // entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(7, worldserver.h(1.0F)));
+            // entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(8, worldserver.f(1.0F)));
 +            entityplayer.setPlayerWeather(org.bukkit.WeatherType.DOWNFALL, false);
-+            entityplayer.updateWeather(-worldserver.o, worldserver.o, -worldserver.q, worldserver.q);
+            entityplayer.updateWeather(-worldserver.j, worldserver.j, -worldserver.l, worldserver.l);
 +            // CraftBukkit end
         }
 
@ -882,16 +645,16 @@
 +        entityplayer.getBukkitEntity().updateScaledHealth(); // CraftBukkit - Update scaled health on respawn and worldchange
         entityplayer.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex));
 +        // CraftBukkit start - from GameRules
-+        int i = entityplayer.world.getGameRules().get("reducedDebugInfo").b() ? 22 : 23;
+        int i = entityplayer.world.getGameRules().get("reducedDebugInfo").getBooleanValue() ? 22 : 23;
 +        entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, (byte) i));
 +        // CraftBukkit end
     }
 
     public int getPlayerCount() {
-@@ -819,26 +1274,39 @@
+@@ -704,26 +985,39 @@
     }
 
-     public void u() {
+     public void shutdown() {
 -        for (int i = 0; i < this.players.size(); ++i) {
 -            ((EntityPlayer) this.players.get(i)).playerConnection.disconnect(new ChatMessage("multiplayer.disconnect.server_shutdown", new Object[0]));
 +        // CraftBukkit start - disconnect safely
@ -933,7 +696,7 @@
 
         if (serverstatisticmanager == null) {
             File file = new File(this.server.getWorldServer(DimensionManager.OVERWORLD).getDataManager().getDirectory(), "stats");
-@@ -853,7 +1321,7 @@
+@@ -738,7 +1032,7 @@
             }
 
             serverstatisticmanager = new ServerStatisticManager(this.server, file1);
@ -942,9 +705,9 @@
         }
 
         return serverstatisticmanager;
-@@ -861,14 +1329,14 @@
+@@ -746,14 +1040,14 @@
 
-     public AdvancementDataPlayer h(EntityPlayer entityplayer) {
+     public AdvancementDataPlayer f(EntityPlayer entityplayer) {
         UUID uuid = entityplayer.getUniqueID();
 -        AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) this.p.get(uuid);
 +        AdvancementDataPlayer advancementdataplayer = (AdvancementDataPlayer) entityplayer.getAdvancementData(); // CraftBukkit
@ -959,7 +722,7 @@
         }
 
         advancementdataplayer.a(entityplayer);
-@@ -904,13 +1372,20 @@
+@@ -789,13 +1083,20 @@
     }
 
     public void reload() {