diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-10-03 00:34:51 +0100 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-10-03 00:37:44 +0100 |
commit | 80c2bc266a7684b3a1851ba519ff694fcfc4aada (patch) | |
tree | 536950c33b8fbc391d0fcf9f423c555db92600df /src/main/java/net/minecraft/server | |
parent | bf09121354b4d1bc3c34a86eac9e42d54d06724e (diff) | |
download | craftbukkit-80c2bc266a7684b3a1851ba519ff694fcfc4aada.tar craftbukkit-80c2bc266a7684b3a1851ba519ff694fcfc4aada.tar.gz craftbukkit-80c2bc266a7684b3a1851ba519ff694fcfc4aada.tar.lz craftbukkit-80c2bc266a7684b3a1851ba519ff694fcfc4aada.tar.xz craftbukkit-80c2bc266a7684b3a1851ba519ff694fcfc4aada.zip |
Minimal diffs! Move methods for the new list-name away from nms
Diffstat (limited to 'src/main/java/net/minecraft/server')
-rw-r--r-- | src/main/java/net/minecraft/server/ServerConfigurationManager.java | 51 |
1 files changed, 1 insertions, 50 deletions
diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java index c1caafd9..e5e296d3 100644 --- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java +++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java @@ -48,55 +48,6 @@ public class ServerConfigurationManager { // CraftBukkit start private CraftServer cserver; - public void changeListName(EntityPlayer entityPlayer, String newName) { - String oldName = entityPlayer.listName; - - if (oldName.equals(newName)) { - return; - } - - if (newName.length() > 16) { - throw new IllegalArgumentException("Player list names can only be a maximum of 16 characters long"); - } - - // Collisions will make for invisible people - for (int i = 0; i < this.players.size(); ++i) { - if (((EntityPlayer) this.players.get(i)).listName.equals(newName)) { - throw new IllegalArgumentException(newName + " is already assigned as a player list name for someone"); - } - } - - entityPlayer.listName = newName; - - // Change the name on the client side - this.sendAll(new Packet201PlayerInfo(oldName, false, 9999)); - this.sendAll(new Packet201PlayerInfo(newName, true, entityPlayer.i)); - } - - private void detectListNameConflict(EntityPlayer entityPlayer) { - // Collisions will make for invisible people - for (int i = 0; i < this.players.size(); ++i) { - EntityPlayer testEntityPlayer = (EntityPlayer) this.players.get(i); - - // We have a problem! - if (testEntityPlayer != entityPlayer && testEntityPlayer.listName.equals(entityPlayer.listName)) { - String oldName = entityPlayer.listName; - int spaceLeft = 16 - oldName.length(); - - if (spaceLeft <= 1) { // We also hit the list name length limit! - entityPlayer.listName = oldName.subSequence(0, oldName.length() - 2 - spaceLeft) - + String.valueOf(System.currentTimeMillis() % 99); - } else { - entityPlayer.listName = oldName + String.valueOf(System.currentTimeMillis() % 99); - } - - return; - } - } - } - // CraftBukkit end - - // CraftBukkit start public ServerConfigurationManager(MinecraftServer minecraftserver) { minecraftserver.server = new CraftServer(minecraftserver, this); minecraftserver.console = ColouredConsoleSender.getInstance(); @@ -161,7 +112,7 @@ public class ServerConfigurationManager { public void c(EntityPlayer entityplayer) { // CraftBukkit - detectListNameConflict(entityplayer); + cserver.detectListNameConflict(entityplayer); this.sendAll(new Packet201PlayerInfo(entityplayer.listName, true, 1000)); // CraftBukkit end this.players.add(entityplayer); |