Merge pull request #4973 from DeXtroTip/fix_incubate_eggs

Fix incubate eggs
PokemonGoF · Aug 31, 2016 · b6ac7d9 · b6ac7d9
2 parents c0f6a36 + b74dd5e
commit b6ac7d9
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/pokemongo_bot/cell_workers/incubate_eggs.py b/pokemongo_bot/cell_workers/incubate_eggs.py
@@ -124,7 +124,8 @@ def _apply_incubators(self, available_eggs, available_incubators):
                         egg["used"] = True
 
     def _check_inventory(self, lookup_ids=[]):
-        inv = {}
+        if lookup_ids:
+            inventory.refresh_inventory()
         matched_pokemon = []
         temp_eggs = []
         temp_used_incubators = []
@@ -212,21 +213,18 @@ def _hatch_eggs(self):
                     pokemon['name'] = "error"
         except:
             pokemon_data = [{"name":"error", "cp":"error", "iv":"error"}]
-        try:
-            if not pokemon_ids or pokemon_data[0]['name'] == "error":
-                self.emit_event(
-                    'egg_hatched',
-                    data={
-                        'pokemon': 'error',
-                        'cp': 'error',
-                        'iv': 'error',
-                        'exp': 'error',
-                        'stardust': 'error',
-                        'candy': 'error',
-                    }
-                )
-                return
-        except IndexError:
+        if not pokemon_ids or not pokemon_data or pokemon_data[0]['name'] == "error":
+            self.emit_event(
+                'egg_hatched',
+                data={
+                    'pokemon': 'error',
+                    'cp': 'error',
+                    'iv': 'error',
+                    'exp': 'error',
+                    'stardust': 'error',
+                    'candy': 'error',
+                }
+            )
             return
         for i in range(len(pokemon_data)):
             msg = "Egg hatched with a {pokemon} (CP {cp} - IV {iv}), {exp} exp, {stardust} stardust and {candy} candies."