diff options
author | Erik Broes <erikbroes@grum.nl> | 2012-01-12 19:43:34 +0100 |
---|---|---|
committer | Erik Broes <erikbroes@grum.nl> | 2012-01-12 19:43:34 +0100 |
commit | 7d0e739f96d51197e8f7dd5acd7b950b2f598670 (patch) | |
tree | 0b2332a04109adc25091cf92fbe9531a0872edfd /src/main/java/net/minecraft/server/ServerConfigurationManager.java | |
parent | 897551e39e0e24812acc0704e963d347dfa4a8ef (diff) | |
download | craftbukkit-7d0e739f96d51197e8f7dd5acd7b950b2f598670.tar craftbukkit-7d0e739f96d51197e8f7dd5acd7b950b2f598670.tar.gz craftbukkit-7d0e739f96d51197e8f7dd5acd7b950b2f598670.tar.lz craftbukkit-7d0e739f96d51197e8f7dd5acd7b950b2f598670.tar.xz craftbukkit-7d0e739f96d51197e8f7dd5acd7b950b2f598670.zip |
Fix balance of CraftBukkit start/end.
Diffstat (limited to 'src/main/java/net/minecraft/server/ServerConfigurationManager.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ServerConfigurationManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java index 0213adc8..0673c19b 100644 --- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java +++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java @@ -111,7 +111,7 @@ public class ServerConfigurationManager { } public void c(EntityPlayer entityplayer) { - // CraftBukkit + // CraftBukkit start cserver.detectListNameConflict(entityplayer); this.sendAll(new Packet201PlayerInfo(entityplayer.listName, true, 1000)); // CraftBukkit end @@ -223,6 +223,7 @@ public class ServerConfigurationManager { } public EntityPlayer moveToWorld(EntityPlayer entityplayer, int i, boolean flag, Location location) { + // CraftBukkit end this.server.getTracker(entityplayer.dimension).untrackPlayer(entityplayer); // this.server.getTracker(entityplayer.dimension).untrackEntity(entityplayer); // CraftBukkit this.getPlayerManager(entityplayer.dimension).removePlayer(entityplayer); |