From 9263823b95a2be105dde822e4cd6f6d0de0cd673 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Fri, 20 Mar 2015 21:39:37 -0500 Subject: [PATCH] Remove patch that kept the player on world changes --- ...Do-not-remove-player-in-world-change.patch | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 Spigot-Server-Patches/Do-not-remove-player-in-world-change.patch diff --git a/Spigot-Server-Patches/Do-not-remove-player-in-world-change.patch b/Spigot-Server-Patches/Do-not-remove-player-in-world-change.patch deleted file mode 100644 index aa0275972..000000000 --- a/Spigot-Server-Patches/Do-not-remove-player-in-world-change.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: T00thpick1 -Date: Sat, 7 Mar 2015 20:54:33 -0600 -Subject: [PATCH] Do not remove player in world change - - -diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/server/PlayerList.java -+++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -0,0 +0,0 @@ public abstract class PlayerList { - entityplayer.u().getTracker().untrackPlayer(entityplayer); - // entityplayer.u().getTracker().untrackEntity(entityplayer); // CraftBukkit - entityplayer.u().getPlayerChunkMap().removePlayer(entityplayer); -- this.players.remove(entityplayer); -+ //this.players.remove(entityplayer); // PaperSpigot - Don't remove player in world change. Fixes BUKKIT-4561, BUKKIT-4082, and BUKKIT-2094 - this.server.getWorldServer(entityplayer.dimension).removeEntity(entityplayer); - BlockPosition blockposition = entityplayer.getBed(); - boolean flag1 = entityplayer.isRespawnForced(); -@@ -0,0 +0,0 @@ public abstract class PlayerList { - - if (!entityplayer.playerConnection.isDisconnected()) { - worldserver.getPlayerChunkMap().addPlayer(entityplayer1); -- worldserver.addEntity(entityplayer1); -+ //worldserver.addEntity(entityplayer1); // PaperSpigot - Don't remove player in world change. Fixes BUKKIT-4561, BUKKIT-4082, and BUKKIT-2094 - this.players.add(entityplayer1); - this.j.put(entityplayer1.getUniqueID(), entityplayer1); - } --- \ No newline at end of file