process protocol, and THEN request

src/poke_env/environment/abstract_battle.py

@@ -449,8 +449,8 @@ def parse_message(self, split_message: List[str]):
             if event[-1].startswith("[anim]"):
                 event = event[:-1]
 
-            if event[-1].startswith("[from]move: "):
-                override_move = event.pop()[12:]
+            if event[-1].startswith("[from] move: "):
+                override_move = event.pop()[13:]
 
                 if override_move == "Sleep Talk":
                     # Sleep talk was used, but also reveals another move
@@ -461,7 +461,7 @@ def parse_message(self, split_message: List[str]):
                     override_move = None
                 elif self.logger is not None:
                     self.logger.warning(
-                        "Unmanaged [from]move message received - move %s in cleaned up "
+                        "Unmanaged [from] move message received - move %s in cleaned up "
                         "message %s in battle %s turn %d",
                         override_move,
                         event,
@@ -472,8 +472,8 @@ def parse_message(self, split_message: List[str]):
             if event[-1] == "null":
                 event = event[:-1]
 
-            if event[-1].startswith("[from]ability: "):
-                revealed_ability = event.pop()[15:]
+            if event[-1].startswith("[from] ability: "):
+                revealed_ability = event.pop()[16:]
                 pokemon = event[2]
                 self.get_pokemon(pokemon).ability = revealed_ability
 
@@ -483,7 +483,7 @@ def parse_message(self, split_message: List[str]):
                     return
                 elif self.logger is not None:
                     self.logger.warning(
-                        "Unmanaged [from]ability: message received - ability %s in "
+                        "Unmanaged [from] ability: message received - ability %s in "
                         "cleaned up message %s in battle %s turn %d",
                         revealed_ability,
                         event,

src/poke_env/environment/battle.py

@@ -94,6 +94,16 @@ def parse_request(self, request: Dict[str, Any]) -> None:
             self._teampreview = False
         self._update_team_from_request(request["side"])
 
+        if self.active_pokemon is not None:
+            active_mon = self.get_pokemon(
+                request["side"]["pokemon"][0]["ident"],
+                force_self_team=True,
+                details=request["side"]["pokemon"][0]["details"],
+            )
+            if active_mon != self.active_pokemon:
+                self.active_pokemon.switch_out()
+                active_mon.switch_in()
+
         if "active" in request:
             active_request = request["active"][0]
 

src/poke_env/environment/double_battle.py

@@ -130,6 +130,13 @@ def parse_request(self, request: Dict[str, Any]) -> None:
         if side["pokemon"]:
             self._player_role = side["pokemon"][0]["ident"][:2]
         self._update_team_from_request(side)
+        if self.player_role is not None:
+            self._active_pokemon[f"{self.player_role}a"] = self.team[
+                request["side"]["pokemon"][0]["ident"]
+            ]
+            self._active_pokemon[f"{self.player_role}b"] = self.team[
+                request["side"]["pokemon"][1]["ident"]
+            ]
 
         if "active" in request:
             for active_pokemon_number, active_request in enumerate(request["active"]):
@@ -139,41 +146,6 @@ def parse_request(self, request: Dict[str, Any]) -> None:
                     force_self_team=True,
                     details=pokemon_dict["details"],
                 )
-                if self.player_role is not None:
-                    if (
-                        active_pokemon_number == 0
-                        and f"{self.player_role}a" not in self._active_pokemon
-                    ):
-                        self._active_pokemon[f"{self.player_role}a"] = active_pokemon
-                    elif f"{self.player_role}b" not in self._active_pokemon:
-                        self._active_pokemon[f"{self.player_role}b"] = active_pokemon
-                    elif (
-                        active_pokemon_number == 0
-                        and self._active_pokemon[f"{self.player_role}a"].fainted
-                        and self._active_pokemon[f"{self.player_role}b"]
-                        == active_pokemon
-                    ):
-                        (
-                            self._active_pokemon[f"{self.player_role}a"],
-                            self._active_pokemon[f"{self.player_role}b"],
-                        ) = (
-                            self._active_pokemon[f"{self.player_role}b"],
-                            self._active_pokemon[f"{self.player_role}a"],
-                        )
-                    elif (
-                        active_pokemon_number == 1
-                        and self._active_pokemon[f"{self.player_role}b"].fainted
-                        and not active_pokemon.fainted
-                        and self._active_pokemon[f"{self.player_role}a"]
-                        == active_pokemon
-                    ):
-                        (
-                            self._active_pokemon[f"{self.player_role}a"],
-                            self._active_pokemon[f"{self.player_role}b"],
-                        ) = (
-                            self._active_pokemon[f"{self.player_role}b"],
-                            self._active_pokemon[f"{self.player_role}a"],
-                        )
 
                 if active_pokemon.fainted:
                     continue

src/poke_env/environment/pokemon.py

@@ -378,6 +378,7 @@ def set_hp_status(self, hp_status: str, store=False):
                 self.end_effect("yawn")
         else:
             hp = hp_status
+            self._status = None
 
         current_hp, max_hp = "".join([c for c in hp if c in "0123456789/"]).split("/")
         self._current_hp = int(current_hp)