From d5d6f18fb4e35553f29bf6e341172dc0c81f0add Mon Sep 17 00:00:00 2001 From: StevenLawson Date: Thu, 7 Aug 2014 20:47:15 -0400 Subject: [PATCH] Truncate string argument on calls calls to setPlayerListName. Resolves #262. --- .../Listener/TFM_PlayerListener.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 2041e8bc..d6512a04 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -858,26 +858,37 @@ public class TFM_PlayerListener implements Listener @EventHandler(priority = EventPriority.HIGH) public static void onPlayerJoinEvent(PlayerJoinEvent event) { - Player player = event.getPlayer(); + final Player player = event.getPlayer(); + + String name = player.getName(); + if (TFM_Util.DEVELOPERS.contains(player.getName())) { - player.setPlayerListName(ChatColor.DARK_PURPLE + player.getName()); + name = ChatColor.DARK_PURPLE + name; TFM_PlayerData.getPlayerData(player).setTag("&8[&5Developer&8]"); } else if (TFM_AdminList.isSeniorAdmin(player)) { - player.setPlayerListName(ChatColor.LIGHT_PURPLE + player.getName()); + name = ChatColor.LIGHT_PURPLE + name; TFM_PlayerData.getPlayerData(player).setTag("&8[&dSenior Admin&8]"); } else if (TFM_AdminList.isTelnetAdmin(player, true)) { - player.setPlayerListName(ChatColor.DARK_GREEN + player.getName()); + name = ChatColor.DARK_GREEN + name; TFM_PlayerData.getPlayerData(player).setTag("&8[&2Telnet Admin&8]"); } else if (TFM_AdminList.isSuperAdmin(player)) { - player.setPlayerListName(ChatColor.AQUA + player.getName()); + name = ChatColor.AQUA + name; TFM_PlayerData.getPlayerData(player).setTag("&8[&BSuper Admin&8]"); } + + try + { + player.setPlayerListName(name.substring(0, 16)); + } + catch (IllegalArgumentException ex) + { + } } }