simplify

Author: cameronangliss

src/poke_env/environment/abstract_battle.py

@@ -218,15 +218,12 @@ def get_pokemon(
         if identifier[3] != " ":
             identifier = identifier[:2] + identifier[3:]
 
-        if identifier in self._team:
-            return self._team[identifier]
-        elif identifier in self._opponent_team:
-            return self._opponent_team[identifier]
-
         player_role = identifier[:2]
         name = identifier[3:].strip()
         is_mine = player_role == self._player_role
         team = self._team if is_mine or force_self_team else self._opponent_team
+        if identifier in team:
+            return team[identifier]
 
         # if the pokemon has a nickname, this ensures we recognize it
         split_details = [
@@ -246,7 +243,6 @@ def get_pokemon(
             else:
                 self._opponent_team = dict(items)
         team = self._team if is_mine or force_self_team else self._opponent_team
-
         if identifier in team:
             return team[identifier]