summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/PlayerConnection.java
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2014-03-22 19:25:55 -0500
committerTravis Watkins <amaranth@ubuntu.com>2014-03-22 19:39:03 -0500
commit019a33f50d3f0d34d5824bfd89688355ca4005b5 (patch)
treeea36116ea485a2255a8b2ba0def0d0fa0fb7d8d0 /src/main/java/net/minecraft/server/PlayerConnection.java
parent4873b12890e7af0c7137c3cb25853d6e20361cd4 (diff)
downloadcraftbukkit-019a33f50d3f0d34d5824bfd89688355ca4005b5.tar
craftbukkit-019a33f50d3f0d34d5824bfd89688355ca4005b5.tar.gz
craftbukkit-019a33f50d3f0d34d5824bfd89688355ca4005b5.tar.lz
craftbukkit-019a33f50d3f0d34d5824bfd89688355ca4005b5.tar.xz
craftbukkit-019a33f50d3f0d34d5824bfd89688355ca4005b5.zip
Fix teleport failing right after join. Fixes BUKKIT-5479
Teleporting a player checks to see if the player is disconnected to try to avoid creating ghost players. The check it uses, however, randomly fails when the player is in the middle of joining the server. The check that would work correctly here does not work correctly when the player actually disconnects. To work around this we add a new flag which is cleared on the first tick of the new player and assume they are connected if the flag is set.
Diffstat (limited to 'src/main/java/net/minecraft/server/PlayerConnection.java')
-rw-r--r--src/main/java/net/minecraft/server/PlayerConnection.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 10c2ee72..ca6b33c9 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1850,7 +1850,7 @@ public class PlayerConnection implements PacketPlayInListener {
// CraftBukkit start - Add "isDisconnected" method
public final boolean isDisconnected() {
- return !NetworkManager.a(this.networkManager).config().isAutoRead();
+ return !this.player.joining && !NetworkManager.a(this.networkManager).config().isAutoRead();
}
// CraftBukkit end
}