From 5f576484f8cebb1639e1e706e4a1d5d8e934b9ab Mon Sep 17 00:00:00 2001 From: T00thpick1 Date: Mon, 23 Jun 2014 21:39:00 -0500 Subject: [PATCH] Do not remove player in world change Fixes BUKKIT-4561 and BUKKIT-4082 and BUKKIT-2094 --- ...Do-not-remove-player-in-world-change.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 CraftBukkit-Patches/0164-Do-not-remove-player-in-world-change.patch diff --git a/CraftBukkit-Patches/0164-Do-not-remove-player-in-world-change.patch b/CraftBukkit-Patches/0164-Do-not-remove-player-in-world-change.patch new file mode 100644 index 0000000000..9d262e76f2 --- /dev/null +++ b/CraftBukkit-Patches/0164-Do-not-remove-player-in-world-change.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: T00thpick1 +Date: Mon, 23 Jun 2014 21:37:24 -0500 +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.r().getTracker().untrackPlayer(entityplayer); + // entityplayer.r().getTracker().untrackEntity(entityplayer); // CraftBukkit + entityplayer.r().getPlayerChunkMap().removePlayer(entityplayer); +- this.players.remove(entityplayer); ++ // this.players.remove(entityplayer); // PaperSpigot -- Fixes BUKKIT-4561 and BUKKIT-4082 and BUKKIT-2094 + this.server.getWorldServer(entityplayer.dimension).removeEntity(entityplayer); + ChunkCoordinates chunkcoordinates = 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); +- this.players.add(entityplayer1); ++ // this.players.add(entityplayer1); // PaperSpigot -- Fixes BUKKIT-4561 and BUKKIT-4082 and BUKKIT-2094 + } + // Added from changeDimension + this.updateClient(entityplayer1); // Update health, etc... +-- \ No newline at end of file