diff --git a/OpSecurity V3/pom.xml b/OpSecurity V3/pom.xml index e2c0e85..86723ef 100644 --- a/OpSecurity V3/pom.xml +++ b/OpSecurity V3/pom.xml @@ -6,7 +6,7 @@ net.t2code T2C-OPSecurity - 3.0.3 + 3.0.4 jar 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 08fa254..370e978 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 @@ -47,7 +47,7 @@ public class PermissionCheck { T2Csend.console(Language.permissionWhitelistNotifyKick.value.replace("[player]", player.getName()).replace("[perm]", perm).replace("[uuid]",String.valueOf(player.getUniqueId()))); } - if (PermissionWhitelist.customCommandsCommands.valueBoolean) { + if (PermissionWhitelist.customCommandsEnable.valueBoolean) { for (String cmd : PermissionWhitelist.customCommandsCommands.valueStringList) { T2Ccmd.console(cmd.replace("[player]", player.getName()).replace("[perm]", perm)); } 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 88bd2b6..1e328e4 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 @@ -24,12 +24,12 @@ public class FileSelect { File config = new File(Main.getPath(), "config.yml"); YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config); for (Config value : Config.values()) { - switch (value.cEnum) { + switch (value.configParam) { case STRING: if (!yamlConfiguration.contains(value.path)) { yamlConfiguration.set(value.path, value.valueString); } - value.valueString = T2Creplace.replace(Util.getPrefix(), yamlConfiguration.getString(value.path)); + value.valueString = T2Creplace.replace(Util.getPrefix(), Objects.requireNonNull(yamlConfiguration.getString(value.path))); break; case SOUND: if (!yamlConfiguration.contains(value.path)) { @@ -143,7 +143,7 @@ public class FileSelect { String name = yamlConfiguration.getString(value.pathPlayerName.replace("KEY", key)); PlayerObject playerObject = new PlayerObject( name, - yamlConfiguration.getString(value.pathPlayerUuid.replace("KEY", key).replace("-", ""))); + yamlConfiguration.getString(value.pathPlayerUuid.replace("KEY", key)).replace("-", "")); PlayerCash.getOpHashMap().put(name, playerObject); } break; diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/config/Config.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/config/Config.java index 58c6ebd..a171822 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/config/Config.java +++ b/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/config/Config.java @@ -31,30 +31,30 @@ public enum Config { public Integer valueInt; public Boolean valueBoolean; public Sound sound; - public ConfigParam cEnum; + public ConfigParam configParam; Config(String path, String value, ConfigParam cEnum) { this.path = path; this.valueString = value; - this.cEnum = cEnum; + this.configParam = cEnum; } Config(String path, Sound value, ConfigParam cEnum) { this.path = path; this.sound = value; - this.cEnum = cEnum; + this.configParam = cEnum; } Config(String path, Integer value, ConfigParam cEnum) { this.path = path; this.valueInt = value; - this.cEnum = cEnum; + this.configParam = cEnum; } Config(String path, Boolean value, ConfigParam cEnum) { this.path = path; this.valueBoolean = value; - this.cEnum = cEnum; + this.configParam = cEnum; } public static Sound sound() {