Merge remote-tracking branch 'origin/master'

Author: mathsman5133

coc/client.py

@@ -734,7 +734,9 @@ async def get_current_war(
         round_tags = league_group.rounds[-1]
 
         async for war in self.get_league_wars(round_tags, cache=cache, fetch=fetch, update_cache=update_cache):
-            if war.clan_tag == clan_tag:
+            if war.clan and war.clan.tag == clan_tag:
+                return war
+            if war.opponent and war.opponent.tag == clan_tag:
                 return war
 
     def get_current_wars(

coc/players.py

@@ -41,6 +41,7 @@
     Role,
     HERO_ORDER,
     BUILDER_TROOPS_ORDER,
+    ELIXIR_TROOP_ORDER,
     HOME_TROOP_ORDER,
     SUPER_TROOP_ORDER,
     SPELL_ORDER,
@@ -200,7 +201,7 @@ def __init__(self, data, war, clan):
 
         self.town_hall = data.get("townhallLevel")
         self.map_position = data.get("mapPosition")
-        self._best_opponent_attack = data.get("bestOpponentAttack")
+        self._best_opponent_attack = data.get("bestOpponentAttack", {}).get("attackerTag")
 
     def _get_attacks(self):
         # pylint: disable=import-outside-toplevel
@@ -445,7 +446,12 @@ def get_ordered_troops(self, valid_troops):
         --------
         :class:`collections.OrderedDict` - An ordered dict of troops by name.
         """
-        troops_dict = {t.name: t for t in self.troops if t.name in set(valid_troops)}
+        if valid_troops == ELIXIR_TROOP_ORDER:
+            troops_dict = {t.name: t for t in self.troops if t.is_home_base and t.name in set(valid_troops)}
+        elif valid_troops == BUILDER_TROOPS_ORDER:
+            troops_dict = {t.name: t for t in self.troops if t.is_builder_base and t.name in set(valid_troops)}
+        else:
+            troops_dict = {t.name: t for t in self.troops if t.name in set(valid_troops)}
         key_order = {k: v for v, k in enumerate(valid_troops)}
         return OrderedDict(sorted(troops_dict.items(), key=lambda i: key_order.get(i[0], 0)))