Move all battle state from IPokemon to an ephemeral IBattlePokemon wrapper
This commit is contained in:
@@ -6,9 +6,9 @@ namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
|
||||
public class Disable : Script, IScriptOnSecondaryEffect
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public void OnSecondaryEffect(IExecutingMove move, IPokemon target, byte hit)
|
||||
public void OnSecondaryEffect(IExecutingMove move, IBattlePokemon target, byte hit)
|
||||
{
|
||||
var battleData = move.User.BattleData;
|
||||
var battleData = move.User;
|
||||
if (battleData == null)
|
||||
return;
|
||||
if (target.Volatile.Contains<DisableEffect>())
|
||||
@@ -16,7 +16,7 @@ public class Disable : Script, IScriptOnSecondaryEffect
|
||||
move.GetHitData(target, hit).Fail();
|
||||
return;
|
||||
}
|
||||
var lastMove = target.BattleData?.LastMoveChoice;
|
||||
var lastMove = target.LastMoveChoice;
|
||||
if (lastMove == null)
|
||||
{
|
||||
move.GetHitData(target, hit).Fail();
|
||||
|
||||
Reference in New Issue
Block a user