diff --git a/OpSecurity V3/pom.xml b/OpSecurity V3/pom.xml
index b8ec08e..97f8b34 100644
--- a/OpSecurity V3/pom.xml
+++ b/OpSecurity V3/pom.xml
@@ -6,7 +6,7 @@
net.t2code
T2C-OPSecurity
- 3.0.5
+ 3.0.6
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 bbcb05e..f2f5691 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
@@ -50,7 +50,7 @@ public class OpCheck {
OPWhitelist.noOpPlayerKickEnable.valueBoolean && OPWhitelist.noOpPlayerDeopEnable.valueBoolean && OPWhitelist.noOpPlayerDeopPlayerSendMessage.valueBoolean
? Language.opWhitelistKick.value + "
" + Language.opWhitelistDeop.value : Language.opWhitelistKick.value));
} else player.kickPlayer(OPWhitelist.noOpPlayerDeopEnable.valueBoolean && OPWhitelist.noOpPlayerDeopPlayerSendMessage.valueBoolean
- ? Language.opWhitelistKick.value + "\n \n" + Language.opWhitelistDeop.value : Language.opWhitelistKick.value);
+ ? Language.opWhitelistKick.value + "\n \n" + Language.opWhitelistDeop.value : Language.opWhitelistKick.value);
}
T2Csend.console(Language.opWhitelistNotifyDeop.value.replace("[player]", player.getName().replace("[uuid]", String.valueOf(player.getUniqueId()))) + "
"
+ Language.opWhitelistNotifyKick.value.replace("[player]", player.getName().replace("[uuid]", String.valueOf(player.getUniqueId()))).replace("[uuid]", String.valueOf(player.getUniqueId())));
@@ -90,7 +90,15 @@ 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().replace("-",""))) return true;
+ T2Csend.debug(Main.getPlugin(), "--------- " + player.getName());
+ T2Csend.debug(Main.getPlugin(), "opWhitelist playerObject Name: " + playerObject.getValue().playerName);
+ T2Csend.debug(Main.getPlugin(), "opWhitelist Player Name: " + player.getName());
+ T2Csend.debug(Main.getPlugin(), "opWhitelist playerObject UUID: " + playerObject.getValue().uuid);
+ T2Csend.debug(Main.getPlugin(), "opWhitelist Player UUID: " + player.getUniqueId().toString().replace("-", ""));
+ if (playerObject.getValue().playerName.equals(player.getName()) && playerObject.getValue().uuid.equals(player.getUniqueId().toString().replace("-", ""))) {
+ T2Csend.debug(Main.getPlugin(), "opWhitelist Player on list!");
+ 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 b7e2d6b..6f5a74b 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
@@ -19,8 +19,8 @@ public class PermissionCheck {
public static Boolean onCheck(Player player, Boolean join) {
if (!PermissionWhitelist.enable.valueBoolean) return false;
for (String perm : PermissionWhitelist.permissions.valueStringList) {
- if (!player.hasPermission(perm)) continue;
- if (permWhitelist(player)) continue;
+ if (!player.hasPermission(perm)) return false;
+ if (permWhitelist(player)) return false;
Bukkit.getScheduler().runTask(Main.getPlugin(), new Runnable() {
@Override
public void run() {
@@ -42,7 +42,7 @@ public class PermissionCheck {
if (PermissionWhitelist.playerWithPermissionKick.valueBoolean) {
if (Config.kickCustomCommand.valueBoolean) {
- T2Ccmd.console(Config.kickCommand.valueString.replace("[player]", player.getName()).replace("[reason]", Language.permissionWhitelistKick.value));
+ T2Ccmd.console(Config.kickCommand.valueString.replace("[perm]", perm).replace("[player]", player.getName()).replace("[reason]", Language.permissionWhitelistKick.value));
} else player.kickPlayer(Language.permissionWhitelistKick.value);
T2Csend.console(Language.permissionWhitelistNotifyKick.value.replace("[player]",
player.getName()).replace("[perm]", perm).replace("[uuid]",String.valueOf(player.getUniqueId())));
@@ -55,8 +55,17 @@ 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().replace("-",""))) return true;
+ T2Csend.debug(Main.getPlugin(), "--------- " + player.getName());
+ T2Csend.debug(Main.getPlugin(),"permWhitelist playerObject Name: "+playerObject.getValue().playerName );
+ T2Csend.debug(Main.getPlugin(),"permWhitelist Player Name: "+player.getName() );
+ T2Csend.debug(Main.getPlugin(),"permWhitelist playerObject UUID: "+playerObject.getValue().uuid );
+ T2Csend.debug(Main.getPlugin(),"permWhitelist Player UUID: "+player.getUniqueId().toString().replace("-","") );
+ if (playerObject.getValue().playerName.equals(player.getName()) && playerObject.getValue().uuid.equals(player.getUniqueId().toString().replace("-",""))){
+ T2Csend.debug(Main.getPlugin(),"permWhitelist Player on list!");
+ 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 27df7d3..f7d04fa 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
@@ -196,7 +196,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.getPermissionHashMap().put(name, playerObject);
}
break;
diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/language/Language.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/language/Language.java
index edb7f7c..e3ef8d6 100644
--- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/language/Language.java
+++ b/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/language/Language.java
@@ -58,8 +58,9 @@ public enum Language {
"[prefix] Player Name: [player]
UUID: [uuid]'>[player] has permission [perm] and is not authorized to do so! Therefore he was kicked! Name: [player]
UUID: [uuid]'>[player] is not on the Player list!"),
permissionWhitelistKick("permissionWhitelist.kick",null,
- "Du wurdest gekickt, da du Permissions besitzt, für die du keine Berechtigung besitzt!",
- "You were kicked because you have permissions to which you do not have permission!"),
+ "&4Du wurdest gekickt, da du Permissions besitzt, für die du keine Berechtigung besitzt!",
+ "&4You were kicked because you have permissions to which you do not have permission!"),
+
exactKickReason("console.exactKickReason", null,
"[prefix] Genauer Grund: [reason]",
"[prefix] Exact reason: [reason]");
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 ab67326..14048cd 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
@@ -80,7 +80,13 @@ public class OpCommand implements Listener {
private static Boolean opWhitelist(String playerName, String playerUuid) {
for (Map.Entry playerObject : PlayerCash.getOpHashMap().entrySet()) {
+ T2Csend.debug(Main.getPlugin(), "--------- " + playerName);
+ T2Csend.debug(Main.getPlugin(),"opWhitelist (op command) playerObject Name: "+playerObject.getValue().playerName );
+ T2Csend.debug(Main.getPlugin(),"opWhitelist (op command) Player Name: "+ playerName );
+ T2Csend.debug(Main.getPlugin(),"opWhitelist (op command) playerObject UUID: "+playerObject.getValue().uuid );
+ T2Csend.debug(Main.getPlugin(),"opWhitelist (op command) Player UUID: "+ playerUuid );
if (playerObject.getValue().playerName.equals(playerName) && playerObject.getValue().uuid.equals(playerUuid.replace("-", ""))) {
+ T2Csend.debug(Main.getPlugin(),"opWhitelist (op command) on list!");
return true;
}
}