diff --git a/OpSecurity V3/pom.xml b/OpSecurity V3/pom.xml index 86723ef..b8ec08e 100644 --- a/OpSecurity V3/pom.xml +++ b/OpSecurity V3/pom.xml @@ -6,7 +6,7 @@ net.t2code T2C-OPSecurity - 3.0.4 + 3.0.5 jar diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/OpCheck.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/OpCheck.java index 8487ce5..bbcb05e 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/OpCheck.java +++ b/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/OpCheck.java @@ -90,7 +90,7 @@ public class OpCheck { public static Boolean opWhitelist(Player player) { for (Map.Entry playerObject : PlayerCash.getOpHashMap().entrySet()) { - if (playerObject.getValue().playerName.equals(player.getName()) && playerObject.getValue().uuid.equals(player.getUniqueId().toString())) return true; + if (playerObject.getValue().playerName.equals(player.getName()) && playerObject.getValue().uuid.equals(player.getUniqueId().toString().replace("-",""))) return true; } return false; } diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/PermissionCheck.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/PermissionCheck.java index 370e978..b7e2d6b 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/PermissionCheck.java +++ b/OpSecurity V3/src/main/java/net/t2code/opsecurity/check/PermissionCheck.java @@ -56,7 +56,7 @@ public class PermissionCheck { private static Boolean permWhitelist(Player player) { for (Map.Entry playerObject : PlayerCash.getPermissionHashMap().entrySet()) { - if (playerObject.getValue().playerName.equals(player.getName()) && playerObject.getValue().uuid.equals(player.getUniqueId().toString())) return true; + if (playerObject.getValue().playerName.equals(player.getName()) && playerObject.getValue().uuid.equals(player.getUniqueId().toString().replace("-",""))) return true; } return false; } diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/FileSelect.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/FileSelect.java index 1e328e4..27df7d3 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/FileSelect.java +++ b/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/FileSelect.java @@ -128,7 +128,7 @@ public class FileSelect { break; case STRINGLIST: if (!yamlConfiguration.contains(value.path)) { - yamlConfiguration.set(value.path, value.valueBoolean); + yamlConfiguration.set(value.path, value.valueStringList); } value.valueStringList = T2Creplace.replace(Util.getPrefix(), yamlConfiguration.getStringList(value.path)); break; diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/events/OpCommand.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/events/OpCommand.java index 118e31d..ab67326 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/events/OpCommand.java +++ b/OpSecurity V3/src/main/java/net/t2code/opsecurity/events/OpCommand.java @@ -6,6 +6,7 @@ import net.t2code.opsecurity.config.opWhitelist.OPWhitelist; import net.t2code.opsecurity.enums.OpCommandRequest; import net.t2code.opsecurity.objects.PlayerCash; import net.t2code.opsecurity.objects.PlayerObject; +import net.t2code.opsecurity.system.Main; import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend; import net.t2code.t2codelib.SPIGOT.api.player.T2CnameHistory; import org.bukkit.Bukkit; @@ -57,10 +58,12 @@ public class OpCommand implements Listener { if (command.charAt(0) == '/') command = command.replaceFirst("/", ""); String arg = command.replace("op ", ""); Player target = Bukkit.getPlayer(arg); + if (OPWhitelist.playerMustBeOnlineToOp.valueBoolean) { if (target == null) return OpCommandRequest.mustOnline; if (!opWhitelist(target.getName(), target.getUniqueId().toString())) return OpCommandRequest.notWhitelisted; } + String targetUUID; if (target != null) { targetUUID = target.getUniqueId().toString(); @@ -77,7 +80,9 @@ public class OpCommand implements Listener { private static Boolean opWhitelist(String playerName, String playerUuid) { for (Map.Entry playerObject : PlayerCash.getOpHashMap().entrySet()) { - if (playerObject.getValue().playerName.equals(playerName) && playerObject.getValue().uuid.equals(playerUuid)) return true; + if (playerObject.getValue().playerName.equals(playerName) && playerObject.getValue().uuid.equals(playerUuid.replace("-", ""))) { + return true; + } } return false; }