From a0fd0f061a327eeaf778b733bd0d114a7236c6bd Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Sun, 7 Apr 2024 19:49:27 +0200 Subject: [PATCH] Fix @pokemon.setstatus to none --- P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb index 9a9ec34ee..39b986631 100644 --- a/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb +++ b/P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb @@ -1051,7 +1051,7 @@ End If Case "setstatus" Dim Index As Integer = int(argument.GetSplit(0, ",")) - Dim Status As Pokemon.StatusProblems = Nothing + Dim Status As Integer = -1 Select Case argument.GetSplit(1, ",") Case "brn" Status = Pokemon.StatusProblems.Burn @@ -1072,8 +1072,8 @@ Case Else Status = Pokemon.StatusProblems.None End Select - If Status <> Nothing AndAlso Core.Player.Pokemons.Count - 1 >= Index Then - Core.Player.Pokemons(Index).Status = Status + If Status <> -1 AndAlso Core.Player.Pokemons.Count - 1 >= Index Then + Core.Player.Pokemons(Index).Status = CType(Status, Pokemon.StatusProblems) If Status = Pokemon.StatusProblems.Fainted Then Core.Player.Pokemons(Index).HP = 0 End If