Fixes for Pokemon capture

2025-08-08 12:45:27 +02:00
parent a5675024a4
commit e5041ec5f0
4 changed files with 30 additions and 6 deletions
--- a/PkmnLib.Dynamic/Models/Battle.cs
+++ b/PkmnLib.Dynamic/Models/Battle.cs
@@ -535,13 +535,16 @@ public class BattleImpl : ScriptSource, IBattle
        }
        EventHook.Invoke(new CaptureAttemptEvent(target, attemptCapture, item));

-        if (!CanSlotBeFilled(sideIndex, position))
+        if (attemptCapture.IsCaught)
        {
-            Sides[sideIndex].MarkPositionAsUnfillable(position);
-        }
-        Sides[sideIndex].ForceClearPokemonFromField(position);
+            if (!CanSlotBeFilled(sideIndex, position))
+            {
+                Sides[sideIndex].MarkPositionAsUnfillable(position);
+            }
+            Sides[sideIndex].ForceClearPokemonFromField(position);

-        ValidateBattleState();
+            ValidateBattleState();
+        }
        return attemptCapture;
    }