32 lines
1.6 KiB
Diff
32 lines
1.6 KiB
Diff
From 5e437f19ad25e1bf79d005085db0a007387b23e0 Mon Sep 17 00:00:00 2001
|
|
From: T00thpick1 <t00thpick1dirko@gmail.com>
|
|
Date: Fri, 28 Nov 2014 01:25:45 -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 3fabad4..c4b11c9 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
@@ -465,7 +465,7 @@ 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 - Fixes BUKKIT-4561, BUKKIT-4082, and BUKKIT-2094
|
|
this.server.getWorldServer(entityplayer.dimension).removeEntity(entityplayer);
|
|
BlockPosition blockposition = entityplayer.getBed();
|
|
boolean flag1 = entityplayer.isRespawnForced();
|
|
@@ -559,7 +559,7 @@ 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, BUKKIT-4082, and BUKKIT-2094
|
|
this.f.put(entityplayer1.getUniqueID(), entityplayer1);
|
|
}
|
|
// Added from changeDimension
|
|
--
|
|
1.9.5.msysgit.0
|
|
|