diff --git a/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java index c2b1f458..8cbb49b8 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java @@ -22,8 +22,7 @@ import org.bukkit.entity.Player; public class AdminList extends FreedomService { public static final List vanished = new ArrayList<>(); - public final List verifiedNoAdmin = new ArrayList<>(); - public final Map> verifiedNoAdminIps = Maps.newHashMap(); + public final Map> verifiedNoAdmin = Maps.newHashMap(); private final Set allAdmins = Sets.newHashSet(); // Includes disabled admins // Only active admins below private final Set activeAdmins = Sets.newHashSet(); @@ -240,8 +239,7 @@ public class AdminList extends FreedomService public boolean isVerifiedAdmin(Player player) { - // Fix of issue FS-33 - return !verifiedNoAdmin.contains(player.getName()) || verifiedNoAdminIps.containsKey(player.getName()) && !verifiedNoAdminIps.get(player.getName()).contains(FUtil.getIp(player)); + return verifiedNoAdmin.containsKey(player.getName()) && verifiedNoAdmin.get(player.getName()).contains(FUtil.getIp(player)); } public boolean isIdentityMatched(Player player) @@ -404,13 +402,8 @@ public class AdminList extends FreedomService return ipTable; } - public List getVerifiedNoAdmin() + public Map> getVerifiedNoAdmin() { return verifiedNoAdmin; } - - public Map> getVerifiedNoAdminIps() - { - return verifiedNoAdminIps; - } } \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java index 28517d51..76582c77 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java @@ -220,7 +220,6 @@ public class Command_saconfig extends FreedomCommand if (plugin.al.isVerifiedAdmin(player)) { plugin.al.verifiedNoAdmin.remove(player.getName()); - plugin.al.verifiedNoAdminIps.remove(player.getName()); } plugin.al.save(admin); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynoadmin.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynoadmin.java index bf9a9847..2c479c6f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynoadmin.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynoadmin.java @@ -34,25 +34,21 @@ public class Command_verifynoadmin extends FreedomCommand if (plugin.al.isAdminImpostor(player)) { - if (!plugin.al.verifiedNoAdmin.contains(player.getName())) - { - plugin.al.verifiedNoAdmin.add(player.getName()); - } String ip = FUtil.getIp(player); - if (!plugin.al.verifiedNoAdminIps.containsKey(player.getName())) + if (!plugin.al.verifiedNoAdmin.containsKey(player.getName())) { List ips = new ArrayList<>(); ips.add(ip); - plugin.al.verifiedNoAdminIps.put(player.getName(), ips); + plugin.al.verifiedNoAdmin.put(player.getName(), ips); } else { - List ips = plugin.al.verifiedNoAdminIps.get(player.getName()); + List ips = plugin.al.verifiedNoAdmin.get(player.getName()); if (!ips.contains(ip)) { ips.add(ip); plugin.al.verifiedNoAdmin.remove(player.getName()); - plugin.al.verifiedNoAdminIps.put(player.getName(), ips); + plugin.al.verifiedNoAdmin.put(player.getName(), ips); } } plugin.rm.updateDisplay(player); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java index e9838cb7..361603c4 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java @@ -72,9 +72,10 @@ public class FUtil "c8e5af82-6aba-4dd7-83e8-474381380cc9", // Paldiu "38ea7c82-7bdc-4f48-b7fd-0e93fc26813d", // AwesomePinch "ba5aafba-9012-418f-9819-a7020d591068", // TFTWPhoenix - "b051abdf-66d1-48c0-96ef-67fb8af96f2a" // Abhi + "b051abdf-66d1-48c0-96ef-67fb8af96f2a", // Abhi + "2e06e049-24c8-42e4-8bcf-d35372af31e6" // unsuperiordev ); - public static final List DEVELOPER_NAMES = Arrays.asList("Madgeek1450", "Prozza", "WickedGamingUK", "Wild1145", "aggelosQQ", "scripthead", "CoolJWB", "elmon_", "speednt", "SupItsDillon", "Paldiu", "AwesomePinch", "TFTWPhoenix","Spigot_Abhiram"); + public static final List DEVELOPER_NAMES = Arrays.asList("Madgeek1450", "Prozza", "WickedGamingUK", "Wild1145", "aggelosQQ", "scripthead", "CoolJWB", "elmon_", "speednt", "SupItsDillon", "Paldiu", "AwesomePinch", "TFTWPhoenix","Spigot_Abhiram", "unsuperiordev"); public static final Map CHAT_COLOR_NAMES = new HashMap<>(); public static final List CHAT_COLOR_POOL = Arrays.asList( ChatColor.DARK_RED,