Merge pull request #417 from SwordStroker/master

Fixed Transfer Duplicate lines,that caused by cachedInventory.
NecronomiconCoding · Jul 24, 2016 · 719ecf5 · 719ecf5
2 parents d98a952 + 315047a
commit 719ecf5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/PokemonGo.RocketAPI.Logic/Inventory.cs b/PokemonGo.RocketAPI.Logic/Inventory.cs
@@ -195,7 +195,6 @@ public async Task<IEnumerable<PokemonSettings>> GetPokemonSettings()
                     .Where(p => p != null && p.FamilyId != PokemonFamilyId.FamilyUnset);
         }
 
-
         public async Task<IEnumerable<PokemonData>> GetPokemonToEvolve(IEnumerable<PokemonId> filter = null)
         {
             var myPokemons = await GetPokemons();
@@ -233,7 +232,6 @@ public async Task<IEnumerable<PokemonData>> GetPokemonToEvolve(IEnumerable<Pokem
             return pokemonToEvolve;
         }
 
-
         private async Task<GetInventoryResponse> getCachedInventory()
         {
             var now = DateTime.UtcNow;
@@ -259,5 +257,13 @@ private async Task<GetInventoryResponse> getCachedInventory()
             }
 
         }
+
+        public async void DeletePokemonFromInvById(ulong Id)
+        {
+            var inventory = await getCachedInventory();
+            InventoryItem pokemon = inventory.InventoryDelta.InventoryItems.FirstOrDefault(i => i.InventoryItemData.Pokemon != null && i.InventoryItemData.Pokemon.Id == Id);
+            if (pokemon != null)
+                inventory.InventoryDelta.InventoryItems.Remove(pokemon);
+        }
     }
 }
diff --git a/PokemonGo.RocketAPI.Logic/Logic.cs b/PokemonGo.RocketAPI.Logic/Logic.cs
@@ -563,6 +563,7 @@ private async Task TransferDuplicatePokemon(bool keepPokemonsThatCanEvolve = fal
                 if (duplicatePokemon.Cp >= _clientSettings.KeepMinCP || PokemonInfo.CalculatePokemonPerfection(duplicatePokemon) > _clientSettings.KeepMinIVPercentage)
                     continue;
                 var transfer = await _client.TransferPokemon(duplicatePokemon.Id);
+                _inventory.DeletePokemonFromInvById(duplicatePokemon.Id);
                 _stats.IncreasePokemonsTransfered();
                 _stats.UpdateConsoleTitle(_inventory);
                 var bestPokemonOfType = _client.Settings.PrioritizeIVOverCP ? await _inventory.GetHighestPokemonOfTypeByIV(duplicatePokemon) : await _inventory.GetHighestPokemonOfTypeByCP(duplicatePokemon);