Cleanup onCommand

Winds-Studio · Dec 30, 2024 · 2a6e2b3 · 2a6e2b3
1 parent 2ad8268
commit 2a6e2b3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/DeathMessagesLegacy/src/main/java/dev/mrshawn/deathmessages/listeners/OnCommand.java b/DeathMessagesLegacy/src/main/java/dev/mrshawn/deathmessages/listeners/OnCommand.java
@@ -18,11 +18,13 @@ public void onCommand(PlayerCommandPreprocessEvent e) {
         Optional<PlayerManager> getPlayer = PlayerManager.getPlayer(e.getPlayer());
         List<String> commands = Settings.getInstance().getConfig().getStringList(Config.CUSTOM_SUICIDE_COMMANDS.getPath());
 
-        for (String command : commands) {
-            if (e.getMessage().equals(command)) {
-                getPlayer.ifPresent(pm -> pm.setCommandDeath(true));
-                break;
+        getPlayer.ifPresent(pm -> {
+            for (String command : commands) {
+                if (e.getMessage().equals(command)) {
+                    pm.setCommandDeath(true);
+                    break;
+                }
             }
-        }
+        });
     }
 }
diff --git a/DeathMessagesModern/src/main/java/dev/mrshawn/deathmessages/listeners/OnCommand.java b/DeathMessagesModern/src/main/java/dev/mrshawn/deathmessages/listeners/OnCommand.java
@@ -18,11 +18,13 @@ public void onCommand(PlayerCommandPreprocessEvent e) {
         Optional<PlayerManager> getPlayer = PlayerManager.getPlayer(e.getPlayer());
         List<String> commands = Settings.getInstance().getConfig().getStringList(Config.CUSTOM_SUICIDE_COMMANDS.getPath());
 
-        for (String command : commands) {
-            if (e.getMessage().equals(command)) {
-                getPlayer.ifPresent(pm -> pm.setCommandDeath(true));
-                break;
+        getPlayer.ifPresent(pm -> {
+            for (String command : commands) {
+                if (e.getMessage().equals(command)) {
+                    pm.setCommandDeath(true);
+                    break;
+                }
             }
-        }
+        });
     }
 }