fix: fix effect command

AllayMC · Jun 27, 2024 · 104dd1e · 104dd1e
1 parent b93c37b
commit 104dd1e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Allay-Server/src/main/java/org/allaymc/server/command/defaults/EffectCommand.java b/Allay-Server/src/main/java/org/allaymc/server/command/defaults/EffectCommand.java
@@ -29,12 +29,13 @@ public void prepareCommandTree(CommandTree tree) {
                 .exec(context -> {
                     Collection<EntityPlayer> players = context.getResult(0);
                     EffectType effectType = context.getResult(1);
-                    int seconds = (int) context.getResult(2) * 20; // because effect duration in ticks
+                    int seconds = context.getResult(2);
+                    int time = seconds * 20; // because effect duration in ticks
                     int amplifier = context.getResult(3);
                     boolean hideParticles = context.getResult(4);
 
                     players.forEach(player -> {
-                        player.addEffect(effectType.createInstance(amplifier, seconds, !hideParticles));
+                        player.addEffect(effectType.createInstance(amplifier, time, !hideParticles));
                         context.addOutput(
                                 TrKeys.M_COMMANDS_EFFECT_SUCCESS,
                                 effectType.getIdentifier().path(), // TODO: I18N
@@ -46,8 +47,7 @@ public void prepareCommandTree(CommandTree tree) {
 
                     return context.success();
                 })
-                .root()
-                .playerTarget("player")
+                .up(4)
                 .key("clear")
                 .exec(context -> {
                     Collection<EntityPlayer> players = context.getResult(0);

diff --git a/...ver/src/main/java/org/allaymc/server/entity/component/common/EntityBaseComponentImpl.java b/...ver/src/main/java/org/allaymc/server/entity/component/common/EntityBaseComponentImpl.java
@@ -692,7 +692,10 @@ protected void sendMobEffectPacket(MobEffectPacket packet) {
 
     @Override
     public void removeAllEffects() {
-        this.effects.keySet().forEach(this::removeEffect);
+        // Use for-each instead of forEach() to prevent ConcurrentModificationException
+        for (EffectType effectType : this.effects.keySet()) {
+            removeEffect(effectType);
+        }
     }
 
     protected void calculateEffectColor() {