diff --git a/BetterGenshinImpact/GameTask/AutoFight/Model/CombatScenes.cs b/BetterGenshinImpact/GameTask/AutoFight/Model/CombatScenes.cs
index 4f85d80f..bab92d4f 100644
--- a/BetterGenshinImpact/GameTask/AutoFight/Model/CombatScenes.cs
+++ b/BetterGenshinImpact/GameTask/AutoFight/Model/CombatScenes.cs
@@ -308,12 +308,12 @@ public class CombatScenes : IDisposable
     /// </summary>
     /// <param name="avatarIndex">从1开始</param>
     /// <returns></returns>
-    public Avatar? SelectAvatar(int avatarIndex)
+    public Avatar SelectAvatar(int avatarIndex)
     {
         if (avatarIndex < 1 || avatarIndex > AvatarCount)
         {
             Logger.LogError("切换角色编号错误，当前角色数量{Count}，编号{Index}", AvatarCount, avatarIndex);
-            return null;
+            throw new Exception("不存在的角色编号");
         }
 
         return Avatars[avatarIndex - 1];
diff --git a/BetterGenshinImpact/GameTask/AutoFight/Script/CombatCommand.cs b/BetterGenshinImpact/GameTask/AutoFight/Script/CombatCommand.cs
index e973f505..be9df420 100644
--- a/BetterGenshinImpact/GameTask/AutoFight/Script/CombatCommand.cs
+++ b/BetterGenshinImpact/GameTask/AutoFight/Script/CombatCommand.cs
@@ -69,9 +69,7 @@ public class CombatCommand
         Avatar? avatar;
         if (Name == CombatScriptParser.CurrentAvatarName)
         {
-            // 如果是当前角色，不进行角色切换
-            var avatarName = combatScenes.CurrentAvatar();
-            avatar = avatarName is not null ? combatScenes.SelectAvatar(avatarName) : combatScenes.SelectAvatar(1);
+            avatar = combatScenes.SelectAvatar(1);
         }
         else
         {
@@ -81,7 +79,6 @@ public class CombatCommand
             {
                 return;
             }
-
             // 非宏类脚本，等待切换角色成功
             if (Method != Method.Wait
                 && Method != Method.MouseDown
@@ -95,7 +92,6 @@ public class CombatCommand
                 avatar.Switch();
             }
         }
-
         Execute(avatar);
     }