testserver/Spigot-Server-Patches/0013-Do-not-remove-player-i...

32 lines
1.6 KiB
Diff
Raw Normal View History

2014-12-13 04:52:49 +00:00
From f6381508cca1054a8c6714829d2c4a2a4e08a3c8 Mon Sep 17 00:00:00 2001
From: T00thpick1 <t00thpick1dirko@gmail.com>
2014-11-28 01:17:45 +00:00
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
2014-12-13 04:52:49 +00:00
index 34ee440..383b113 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
2014-12-13 04:52:49 +00:00
@@ -465,7 +465,7 @@ public abstract class PlayerList {
2014-11-28 01:17:45 +00:00
entityplayer.u().getTracker().untrackPlayer(entityplayer);
// entityplayer.u().getTracker().untrackEntity(entityplayer); // CraftBukkit
entityplayer.u().getPlayerChunkMap().removePlayer(entityplayer);
- this.players.remove(entityplayer);
2014-11-28 01:17:45 +00:00
+ // this.players.remove(entityplayer); // PaperSpigot - Fixes BUKKIT-4561, BUKKIT-4082, and BUKKIT-2094
this.server.getWorldServer(entityplayer.dimension).removeEntity(entityplayer);
2014-11-28 01:17:45 +00:00
BlockPosition blockposition = entityplayer.getBed();
boolean flag1 = entityplayer.isRespawnForced();
2014-12-13 04:52:49 +00:00
@@ -559,7 +559,7 @@ public abstract class PlayerList {
if (!entityplayer.playerConnection.isDisconnected()) {
worldserver.getPlayerChunkMap().addPlayer(entityplayer1);
worldserver.addEntity(entityplayer1);
- this.players.add(entityplayer1);
2014-11-28 01:17:45 +00:00
+ //this.players.add(entityplayer1); // PaperSpigot - Fixes BUKKIT-4561, BUKKIT-4082, and BUKKIT-2094
this.f.put(entityplayer1.getUniqueID(), entityplayer1);
}
// Added from changeDimension
--
1.9.1