Refactor MobSkill#applyEffect, split into multiple smaller methods

src/main/java/server/life/MobSkill.java

@@ -39,8 +39,10 @@ import tools.ArrayMap;
 import tools.Randomizer;
 
 import java.awt.*;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import java.util.*;
+import java.util.Map;
 
 /**
  * @author Danny (Leifde)
@@ -191,26 +193,17 @@ public class MobSkill {
         applyEffect(null, monster, false, Collections.emptyList());
     }
 
-    public void applyEffect(Character player, Monster monster, boolean skill, List<Character> banishPlayers) {
+    // TODO: avoid output argument banishPlayersOutput
+    public void applyEffect(Character player, Monster monster, boolean skill, List<Character> banishPlayersOutput) {
         Disease disease = null;
         Map<MonsterStatus, Integer> stats = new ArrayMap<>();
-        List<Integer> reflection = new LinkedList<>();
+        List<Integer> reflection = new ArrayList<>();
         switch (type) {
             case ATTACK_UP, ATTACK_UP_M, PAD -> stats.put(MonsterStatus.WEAPON_ATTACK_UP, x);
             case MAGIC_ATTACK_UP, MAGIC_ATTACK_UP_M, MAD -> stats.put(MonsterStatus.MAGIC_ATTACK_UP, x);
             case DEFENSE_UP, DEFENSE_UP_M, PDR -> stats.put(MonsterStatus.WEAPON_DEFENSE_UP, x);
             case MAGIC_DEFENSE_UP, MAGIC_DEFENSE_UP_M, MDR -> stats.put(MonsterStatus.MAGIC_DEFENSE_UP, x);
-            case HEAL_M -> {
+            case HEAL_M -> applyHealEffect(skill, monster);
-                if (lt != null && rb != null && skill) {
-                    List<MapObject> objects = getObjectsInRange(monster, MapObjectType.MONSTER);
-                    final int hps = (getX() / 1000) * (int) (950 + 1050 * Math.random());
-                    for (MapObject mons : objects) {
-                        ((Monster) mons).heal(hps, getY());
-                    }
-                } else {
-                    monster.heal(getX(), getY());
-                }
-            }
             case SEAL -> disease = Disease.SEAL;
             case DARKNESS -> disease = Disease.DARKNESS;
             case WEAKNESS -> disease = Disease.WEAKEN;
@@ -218,26 +211,10 @@ public class MobSkill {
             case CURSE -> disease = Disease.CURSE;
             case POISON -> disease = Disease.POISON;
             case SLOW -> disease = Disease.SLOW;
-            case DISPEL -> {
+            case DISPEL -> applyDispelEffect(skill, monster, player);
-                if (lt != null && rb != null && skill) {
-                    for (Character character : getPlayersInRange(monster)) {
-                        character.dispel();
-                    }
-                } else {
-                    player.dispel();
-                }
-            }
             case SEDUCE -> disease = Disease.SEDUCE;
-            case BANISH -> {
+            case BANISH -> applyBanishEffect(skill, monster, player, banishPlayersOutput);
-                if (lt != null && rb != null && skill) {
+            case AREA_POISON -> spawnMonsterMist(monster);
-                    banishPlayers.addAll(getPlayersInRange(monster));
-                } else {
-                    banishPlayers.add(player);
-                }
-            }
-            case AREA_POISON -> {
-                monster.getMap().spawnMist(new Mist(calculateBoundingBox(monster.getPosition()), monster, this), x * 100, false, false, false);
-            }
             case REVERSE_INPUT -> disease = Disease.CONFUSE;
             case UNDEAD -> disease = Disease.ZOMBIFY;
             case PHYSICAL_IMMUNE -> {
@@ -271,7 +248,53 @@ public class MobSkill {
             case EVA -> stats.put(MonsterStatus.AVOID, x);
             case SPEED -> stats.put(MonsterStatus.SPEED, x);
             case SEAL_SKILL -> stats.put(MonsterStatus.SEAL_SKILL, x);
-            case SUMMON -> {
+            case SUMMON -> summonMonsters(monster);
+        }
+        if (stats.size() > 0) {
+            applyMonsterBuffs(stats, skill, monster, reflection);
+        }
+        if (disease != null) {
+            applyDisease(disease, skill, monster, player);
+        }
+    }
+
+    private void applyHealEffect(boolean skill, Monster monster) {
+        if (lt != null && rb != null && skill) {
+            List<MapObject> objects = getObjectsInRange(monster, MapObjectType.MONSTER);
+            final int hps = (getX() / 1000) * (int) (950 + 1050 * Math.random());
+            for (MapObject mons : objects) {
+                ((Monster) mons).heal(hps, getY());
+            }
+        } else {
+            monster.heal(getX(), getY());
+        }
+    }
+
+    private void applyDispelEffect(boolean skill, Monster monster, Character player) {
+        if (lt != null && rb != null && skill) {
+            getPlayersInRange(monster).forEach(Character::dispel);
+        } else {
+            player.dispel();
+        }
+    }
+
+    private void applyBanishEffect(boolean skill, Monster monster, Character player,
+                                   List<Character> banishPlayersOutput) {
+        if (lt != null && rb != null && skill) {
+            banishPlayersOutput.addAll(getPlayersInRange(monster));
+        } else {
+            banishPlayersOutput.add(player);
+        }
+    }
+
+    private void spawnMonsterMist(Monster monster) {
+        Rectangle mistArea = calculateBoundingBox(monster.getPosition());
+        var mist = new Mist(mistArea, monster, this);
+        int mistDuration = x * 100;
+        monster.getMap().spawnMist(mist, mistDuration, false, false, false);
+    }
+
+    private void summonMonsters(Monster monster) {
         int skillLimit = this.getLimit();
         MapleMap map = monster.getMap();
 
@@ -344,8 +367,8 @@ public class MobSkill {
             }
         }
     }
-        }
+
-        if (stats.size() > 0) {
+    private void applyMonsterBuffs(Map<MonsterStatus, Integer> stats, boolean skill, Monster monster, List<Integer> reflection) {
         if (lt != null && rb != null && skill) {
             for (MapObject mons : getObjectsInRange(monster, MapObjectType.MONSTER)) {
                 ((Monster) mons).applyMonsterBuff(stats, getX(), type.getId(), getDuration(), this, reflection);
@@ -354,7 +377,8 @@ public class MobSkill {
             monster.applyMonsterBuff(stats, getX(), type.getId(), getDuration(), this, reflection);
         }
     }
-        if (disease != null) {
+
+    private void applyDisease(Disease disease, boolean skill, Monster monster, Character player) {
         if (lt != null && rb != null && skill) {
             int i = 0;
             for (Character character : getPlayersInRange(monster)) {
@@ -373,7 +397,6 @@ public class MobSkill {
             player.giveDebuff(disease, this);
         }
     }
-    }
 
     private List<Character> getPlayersInRange(Monster monster) {
         return monster.getMap().getPlayersInRange(calculateBoundingBox(monster.getPosition()));

src/main/java/tools/ArrayMap.java

@@ -23,6 +23,7 @@ package tools;
 
 import java.util.*;
 
+// TODO: remove
 public class ArrayMap<K, V> extends AbstractMap<K, V> {
 
     static class Entry<K, V> implements Map.Entry<K, V> {