From b11eb0f762bd0ed122104fd697d746d8b1a07f07 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 10 May 2014 22:35:45 +0100 Subject: [PATCH 1/4] Added in both player tab colours, Auto Prefixes and a telnet checker --- .../Listener/TFM_PlayerListener.java | 28 +++++++++++++++++++ .../TotalFreedomMod/TFM_AdminList.java | 19 +++++++++++++ 2 files changed, 47 insertions(+) diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 838c2897..fd95ab21 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -775,4 +775,32 @@ public class TFM_PlayerListener implements Listener { TFM_ServerInterface.handlePlayerLogin(event); } + + // Player Tab and auto Tags + + @EventHandler(priority = EventPriority.HIGH) + public static void onPlayerJoinEvent(PlayerJoinEvent event) + { + Player player = event.getPlayer(); + if (TFM_Util.DEVELOPERS.contains(player.getName())) + { + player.setPlayerListName(ChatColor.DARK_PURPLE + player.getName()); + TFM_PlayerData.getPlayerData(player).setTag("&8[&5Developer&8]"); + } + else if (TFM_AdminList.isSeniorAdmin(player)) + { + player.setPlayerListName(ChatColor.LIGHT_PURPLE + player.getName()); + TFM_PlayerData.getPlayerData(player).setTag("&8[&dSenior Admin&8]"); + } + else if (TFM_AdminList.isTelnetAdmin(player, true)) + { + player.setPlayerListName(ChatColor.GREEN + player.getName()); + TFM_PlayerData.getPlayerData(player).setTag("&8[&2Telnet Admin&8]"); + } + else if (TFM_AdminList.isSuperAdmin(player)) + { + player.setPlayerListName(ChatColor.AQUA + player.getName()); + TFM_PlayerData.getPlayerData(player).setTag("&8[&BSuper Admin&8]"); + } + } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java index 4ecf720e..3b6b14a8 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java @@ -405,6 +405,25 @@ public class TFM_AdminList return false; } + public static boolean isTelnetAdmin(CommandSender sender, boolean verifySuperadmin) + { + if (verifySuperadmin) + { + if (!isSuperAdmin(sender)) + { + return false; + } + } + + final TFM_Admin entry = getEntry((Player) sender); + if (entry != null) + { + return entry.isTelnetAdmin(); + } + + return false; + } + public static boolean isIdentityMatched(Player player) { if (!isSuperAdmin(player)) From 46494a2c877a459f31115ff9e733c7ee9a3cdda0 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 10 May 2014 22:40:19 +0100 Subject: [PATCH 2/4] Reset --- .../Listener/TFM_PlayerListener.java | 28 ------------------- .../TotalFreedomMod/TFM_AdminList.java | 19 ------------- 2 files changed, 47 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index fd95ab21..838c2897 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -775,32 +775,4 @@ public class TFM_PlayerListener implements Listener { TFM_ServerInterface.handlePlayerLogin(event); } - - // Player Tab and auto Tags - - @EventHandler(priority = EventPriority.HIGH) - public static void onPlayerJoinEvent(PlayerJoinEvent event) - { - Player player = event.getPlayer(); - if (TFM_Util.DEVELOPERS.contains(player.getName())) - { - player.setPlayerListName(ChatColor.DARK_PURPLE + player.getName()); - TFM_PlayerData.getPlayerData(player).setTag("&8[&5Developer&8]"); - } - else if (TFM_AdminList.isSeniorAdmin(player)) - { - player.setPlayerListName(ChatColor.LIGHT_PURPLE + player.getName()); - TFM_PlayerData.getPlayerData(player).setTag("&8[&dSenior Admin&8]"); - } - else if (TFM_AdminList.isTelnetAdmin(player, true)) - { - player.setPlayerListName(ChatColor.GREEN + player.getName()); - TFM_PlayerData.getPlayerData(player).setTag("&8[&2Telnet Admin&8]"); - } - else if (TFM_AdminList.isSuperAdmin(player)) - { - player.setPlayerListName(ChatColor.AQUA + player.getName()); - TFM_PlayerData.getPlayerData(player).setTag("&8[&BSuper Admin&8]"); - } - } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java index 3b6b14a8..4ecf720e 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java @@ -405,25 +405,6 @@ public class TFM_AdminList return false; } - public static boolean isTelnetAdmin(CommandSender sender, boolean verifySuperadmin) - { - if (verifySuperadmin) - { - if (!isSuperAdmin(sender)) - { - return false; - } - } - - final TFM_Admin entry = getEntry((Player) sender); - if (entry != null) - { - return entry.isTelnetAdmin(); - } - - return false; - } - public static boolean isIdentityMatched(Player player) { if (!isSuperAdmin(player)) From 31e03d6348c76131dc7f9bdc1b2c49e7ef7781f9 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 10 May 2014 22:40:32 +0100 Subject: [PATCH 3/4] Added a telnet checker. --- .../TotalFreedomMod/TFM_AdminList.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java index 4ecf720e..3b6b14a8 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java @@ -405,6 +405,25 @@ public class TFM_AdminList return false; } + public static boolean isTelnetAdmin(CommandSender sender, boolean verifySuperadmin) + { + if (verifySuperadmin) + { + if (!isSuperAdmin(sender)) + { + return false; + } + } + + final TFM_Admin entry = getEntry((Player) sender); + if (entry != null) + { + return entry.isTelnetAdmin(); + } + + return false; + } + public static boolean isIdentityMatched(Player player) { if (!isSuperAdmin(player)) From dbfec1e86d776b6e7a851f1b8e473eb25376dd48 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 10 May 2014 22:42:37 +0100 Subject: [PATCH 4/4] Added Color Tabs and Auto Prefixes. Resolves #173 --- .../Listener/TFM_PlayerListener.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 838c2897..fd95ab21 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -775,4 +775,32 @@ public class TFM_PlayerListener implements Listener { TFM_ServerInterface.handlePlayerLogin(event); } + + // Player Tab and auto Tags + + @EventHandler(priority = EventPriority.HIGH) + public static void onPlayerJoinEvent(PlayerJoinEvent event) + { + Player player = event.getPlayer(); + if (TFM_Util.DEVELOPERS.contains(player.getName())) + { + player.setPlayerListName(ChatColor.DARK_PURPLE + player.getName()); + TFM_PlayerData.getPlayerData(player).setTag("&8[&5Developer&8]"); + } + else if (TFM_AdminList.isSeniorAdmin(player)) + { + player.setPlayerListName(ChatColor.LIGHT_PURPLE + player.getName()); + TFM_PlayerData.getPlayerData(player).setTag("&8[&dSenior Admin&8]"); + } + else if (TFM_AdminList.isTelnetAdmin(player, true)) + { + player.setPlayerListName(ChatColor.GREEN + player.getName()); + TFM_PlayerData.getPlayerData(player).setTag("&8[&2Telnet Admin&8]"); + } + else if (TFM_AdminList.isSuperAdmin(player)) + { + player.setPlayerListName(ChatColor.AQUA + player.getName()); + TFM_PlayerData.getPlayerData(player).setTag("&8[&BSuper Admin&8]"); + } + } }