From b7c815265c077f8dde945fcd550b109795475540 Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Wed, 8 Nov 2023 18:17:42 -0800
Subject: [PATCH] Refactor `BattleService::startBattle`

---
 .../emu/lunarcore/game/battle/BattleService.java   | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/emu/lunarcore/game/battle/BattleService.java b/src/main/java/emu/lunarcore/game/battle/BattleService.java
index 81bd6bf..9fac6be 100644
--- a/src/main/java/emu/lunarcore/game/battle/BattleService.java
+++ b/src/main/java/emu/lunarcore/game/battle/BattleService.java
@@ -33,10 +33,10 @@ public class BattleService extends BaseGameService {
     public void startBattle(Player player, int casterId, int attackedGroupId, MazeSkill castedSkill, Set<Integer> targets) {
         // Setup variables
         List<GameEntity> targetEntities = new ArrayList<>();
-        boolean isPlayerCaster = false; // Set true if the player is the one casting
+        boolean isPlayerCaster = player.getScene().getAvatarEntityIds().contains(casterId);
         
         // Check if attacker is the player or not
-        if (player.getScene().getAvatarEntityIds().contains(casterId)) {
+        if (isPlayerCaster) {
             // Player is the attacker
             for (int entityId : targets) {
                 GameEntity entity = player.getScene().getEntities().get(entityId);
@@ -45,8 +45,6 @@ public class BattleService extends BaseGameService {
                     targetEntities.add(entity);
                 }
             }
-
-            isPlayerCaster = true;
         } else {
             // Player is ambushed
             GameEntity entity = player.getScene().getEntities().get(casterId);
@@ -114,16 +112,14 @@ public class BattleService extends BaseGameService {
             if (isPlayerCaster) {
                 GameAvatar avatar = player.getCurrentLeaderAvatar();
                 
-                if (avatar != null) {
+                if (avatar != null && castedSkill != null) {
                     // Maze skill attack event
-                    if (castedSkill != null) {
-                        castedSkill.onAttack(avatar, battle);
-                    }
+                    castedSkill.onAttack(avatar, battle);
                     // Add elemental weakness buff to enemies
                     MazeBuff buff = battle.addBuff(avatar.getExcel().getDamageType().getEnterBattleBuff(), battle.getLineup().getLeader());
                     if (buff != null) {
                         buff.addTargetIndex(battle.getLineup().getLeader());
-                        buff.addDynamicValue("SkillIndex", castedSkill != null ? castedSkill.getIndex() : 1);
+                        buff.addDynamicValue("SkillIndex", castedSkill.getIndex());
                     }
                 }
             }