Fix bug introduced by PokemonGoF#3037: bot not returning back

bixuanzju · Aug 8, 2016 · bdf9a0c · bdf9a0c
1 parent cbf672e
commit bdf9a0c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pokemongo_bot/cell_workers/move_to_map_pokemon.py b/pokemongo_bot/cell_workers/move_to_map_pokemon.py
@@ -206,12 +206,14 @@ def snipe(self, pokemon):
         Args:
             pokemon: Pokemon to snipe.
         """
+        last_position = self.bot.position[0:2]
         self.bot.heartbeat()
         self._teleport_to(pokemon)
         catch_worker = PokemonCatchWorker(pokemon, self.bot)
         api_encounter_response = catch_worker.create_encounter_api_call()
         time.sleep(SNIPE_SLEEP_SEC)
-        self._teleport_back()
+        self._teleport_back(last_position)
+        self.bot.api.set_position(last_position[0], last_position[1], 0)
         time.sleep(SNIPE_SLEEP_SEC)
         self.bot.heartbeat()
         catch_worker.work(api_encounter_response)
@@ -329,16 +331,14 @@ def _encountered(self, pokemon):
             data=self._pokemon_event_data(pokemon)
         )
 
-    def _teleport_back(self):
+    def _teleport_back(self, last_position):
         """Teleports trainer back to their last position."""
-        last_position = self.bot.position[0:2]
         self.emit_event(
             'move_to_map_pokemon_teleport_back',
             formatted=('Teleporting back to previous location ({last_lat}, '
                        '{last_lon})'),
             data={'last_lat': last_position[0], 'last_lon': last_position[1]}
         )
-        self.bot.api.set_position(last_position[0], last_position[1], 0)
 
     def _move_to(self, pokemon):
         """Moves trainer towards a Pokemon.