From d9e6ba508932e3ac35a3895c9cf8e8a82a5c2a0a Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Wed, 5 Jan 2022 01:05:41 +0100 Subject: [PATCH] 2.3.6 Bugfix Bugfix: Upper/lower case of player names in config will be ignored from now on to avoid errors. --- pom.xml | 2 +- .../jatitv/opsecurity/cmdManagement/CmdExecuter.java | 2 -- .../de/jatitv/opsecurity/cmdManagement/Commands.java | 4 ++-- .../opsecurity/config/config/SelectConfig.java | 4 ++-- .../java/de/jatitv/opsecurity/listener/Check.java | 12 ++++++------ .../de/jatitv/opsecurity/listener/OPCommand.java | 12 +++++------- 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 298a514..d12b632 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.jatitv OPSecurity - 2.3.5 + 2.3.6_Snapshot_3 jar OPSecurity diff --git a/src/main/java/de/jatitv/opsecurity/cmdManagement/CmdExecuter.java b/src/main/java/de/jatitv/opsecurity/cmdManagement/CmdExecuter.java index b97ff65..ba612cd 100644 --- a/src/main/java/de/jatitv/opsecurity/cmdManagement/CmdExecuter.java +++ b/src/main/java/de/jatitv/opsecurity/cmdManagement/CmdExecuter.java @@ -1,6 +1,5 @@ // This claas was created by JaTiTV - package de.jatitv.opsecurity.cmdManagement; import de.jatitv.opsecurity.config.config.SelectConfig; @@ -16,7 +15,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; - public class CmdExecuter implements CommandExecutor, TabCompleter { @Override diff --git a/src/main/java/de/jatitv/opsecurity/cmdManagement/Commands.java b/src/main/java/de/jatitv/opsecurity/cmdManagement/Commands.java index f6e22eb..f3261fe 100644 --- a/src/main/java/de/jatitv/opsecurity/cmdManagement/Commands.java +++ b/src/main/java/de/jatitv/opsecurity/cmdManagement/Commands.java @@ -38,8 +38,8 @@ public class Commands { public static void reload(CommandSender sender) { if (sender instanceof Player) { Player player = (Player) sender; - if (Main.opHashMap.containsKey(player.getName())) { - if (Main.opHashMap.get(player.getName()).UUID.equals(player.getUniqueId().toString().replace("-", ""))) { + if (Main.opHashMap.containsKey(player.getName().toLowerCase())) { + if (Main.opHashMap.get(player.getName().toLowerCase()).UUID.equals(player.getUniqueId().toString().replace("-", ""))) { send.player(player, SelectMessages.ReloadStart); Bukkit.getConsoleSender().sendMessage(Main.Prefix + "§8-------------------------------"); Bukkit.getConsoleSender().sendMessage(Main.Prefix + "§6Plugin reload..."); diff --git a/src/main/java/de/jatitv/opsecurity/config/config/SelectConfig.java b/src/main/java/de/jatitv/opsecurity/config/config/SelectConfig.java index 716a462..5970263 100644 --- a/src/main/java/de/jatitv/opsecurity/config/config/SelectConfig.java +++ b/src/main/java/de/jatitv/opsecurity/config/config/SelectConfig.java @@ -105,7 +105,7 @@ public class SelectConfig { PlayerObject player = new PlayerObject( yamlConfiguration.getString("OP_Whitelist.Whitelist." + key + ".UUID").replace("-","")); opWhitelist.add(player); - Main.opHashMap.put(key, player); + Main.opHashMap.put(key.toLowerCase(), player); } no_OP_Player_deop = yamlConfiguration.getBoolean("OP_Whitelist.noOpPlayerDeop.Enable"); @@ -121,7 +121,7 @@ public class SelectConfig { PlayerObject player = new PlayerObject( yamlConfiguration.getString("Permission_Whitelist.Whitelist." + key + ".UUID").replace("-","")); permWhitelist.add(player); - Main.permissionHashMap.put(key, player); + Main.permissionHashMap.put(key.toLowerCase(), player); } PlayerWhithPermission_kick = yamlConfiguration.getBoolean("Permission_Whitelist.PlayerWhithPermission_kick"); diff --git a/src/main/java/de/jatitv/opsecurity/listener/Check.java b/src/main/java/de/jatitv/opsecurity/listener/Check.java index bce8a54..40743e7 100644 --- a/src/main/java/de/jatitv/opsecurity/listener/Check.java +++ b/src/main/java/de/jatitv/opsecurity/listener/Check.java @@ -105,7 +105,7 @@ public class Check { } } } - if (SelectConfig.PlayerWhithPermission_kick && SelectConfig.Perm_Command_enable){ + if (SelectConfig.PlayerWhithPermission_kick && SelectConfig.Perm_Command_enable) { Cmd.console(SelectConfig.KickCommand.replace("[player]", player.getName()).replace("[reason]", Replace.replace(SelectMessages.Perm_kick))); send.console(Replace.replace(SelectMessages.Perm_consoleKick.replace("[player]", player.getName()).replace("[perm]", s))); @@ -116,7 +116,7 @@ public class Check { } if (SelectConfig.PlayerWhithPermission_kick) { - Cmd.console( SelectConfig.KickCommand.replace("[player]", player.getName()).replace("[reason]", Replace.replace(SelectMessages.Perm_kick))); + Cmd.console(SelectConfig.KickCommand.replace("[player]", player.getName()).replace("[reason]", Replace.replace(SelectMessages.Perm_kick))); send.console(Replace.replace(SelectMessages.Perm_consoleKick.replace("[player]", player.getName()).replace("[perm]", s))); return true; @@ -136,16 +136,16 @@ public class Check { } private static Boolean opWhitelist(Player player) { - if (Main.opHashMap.containsKey(player.getName())) { - if (Main.opHashMap.get(player.getName()).UUID.equals(player.getUniqueId().toString().replace("-", ""))) { + if (Main.opHashMap.containsKey(player.getName().toLowerCase())) { + if (Main.opHashMap.get(player.getName().toLowerCase()).UUID.equals(player.getUniqueId().toString().replace("-", ""))) { return true; } else return false; } else return false; } private static Boolean permWhitelist(Player player) { - if (Main.permissionHashMap.containsKey(player.getName())) { - if (Main.permissionHashMap.get(player.getName()).UUID.equals(player.getUniqueId().toString().replace("-",""))) { + if (Main.permissionHashMap.containsKey(player.getName().toLowerCase())) { + if (Main.permissionHashMap.get(player.getName().toLowerCase()).UUID.equals(player.getUniqueId().toString().replace("-", ""))) { return true; } else return false; } else return false; diff --git a/src/main/java/de/jatitv/opsecurity/listener/OPCommand.java b/src/main/java/de/jatitv/opsecurity/listener/OPCommand.java index b21fe37..4b275a4 100644 --- a/src/main/java/de/jatitv/opsecurity/listener/OPCommand.java +++ b/src/main/java/de/jatitv/opsecurity/listener/OPCommand.java @@ -24,27 +24,25 @@ public class OPCommand implements Listener { if (command.charAt(0) == '/') command = command.replaceFirst("/", ""); String arg = command.replace("op ", ""); - - String targetUUID = null; - if (SelectConfig.PlayerMustBeOnlineToOp) { - if (Main.opHashMap.containsKey(arg)) { + if (Main.opHashMap.containsKey(arg.toLowerCase())) { Player target = Bukkit.getPlayer(arg); if (target == null) { return 1; } - if (Main.opHashMap.get(target.getName()).UUID.equals(target.getUniqueId().toString().replace("-", ""))) { + if (Main.opHashMap.get(target.getName().toLowerCase()).UUID.equals(target.getUniqueId().toString().replace("-", ""))) { return 0; } else return 2; } else return 2; } else { - if (Main.opHashMap.containsKey(arg)) { + if (Main.opHashMap.containsKey(arg.toLowerCase())) { + String targetUUID = null; try { targetUUID = NameHistory.getPlayerUUID(arg); } catch (IOException e) { e.printStackTrace(); } - if (Main.opHashMap.get(arg).UUID.equals(targetUUID)) { + if (Main.opHashMap.get(arg.toLowerCase()).UUID.equals(targetUUID)) { return 0; } else return 2; } else return 2;