It can't be this simple

2026-10-20 22:26:24 -04:00 · 2024-03-23 03:11:55 -05:00
1 changed files with 5 additions and 0 deletions
@@ -4,6 +4,7 @@ import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.text.yellow
 import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
+import com.cobblemon.mod.common.net.messages.client.battle.BattleSwitchPokemonPacket
 import com.cobblemon.mod.common.util.battleLang

 /**
@@ -19,7 +20,11 @@ class ReplaceInstruction(val message: BattleMessage): InterpreterInstruction {
        battle.dispatchWaiting(1F) {
            val pokemon = message.battlePokemon(0, battle) ?: return@dispatchWaiting
            val entity = pokemon.entity
+            val actor = pokemon.actor
+            val pnx = message.pnxAndUuid(0)?.first
+
            entity?.let { it.effects.mockEffect?.end(it) }
+            pnx?.let {battle.sendSidedUpdate(actor, BattleSwitchPokemonPacket(pnx, pokemon, true, null), BattleSwitchPokemonPacket(pnx, pokemon, false, null)) }
        }
    }
 }