Slight update to fix some inventory issues.

Author: Matthew J. Mjelde

src/main/java/com/pokegoapi/api/inventory/Inventories.java

@@ -31,6 +31,7 @@
 import com.pokegoapi.exceptions.LoginFailedException;
 import com.pokegoapi.exceptions.RemoteServerException;
 import com.pokegoapi.main.ServerRequest;
+import com.pokegoapi.util.Log;
 import lombok.Getter;
 
 
@@ -101,37 +102,24 @@ public void updateInventories(boolean forceUpdate) throws LoginFailedException,
 		for (InventoryItemOuterClass.InventoryItem inventoryItem
 				: response.getInventoryDelta().getInventoryItemsList()) {
 			InventoryItemDataOuterClass.InventoryItemData itemData = inventoryItem.getInventoryItemData();
-			if (inventoryItem.getDeletedItemKey() > 0) {
-				if (itemData.getPokemonData().getPokemonId() != PokemonIdOuterClass.PokemonId.MISSINGNO) {
-					pokebank.removePokemon(new Pokemon(inventoryItem.getInventoryItemData().getPokemonData()));
-				}
-				if (itemData.getItem().getItemId() != ItemIdOuterClass.ItemId.UNRECOGNIZED) {
-					ItemOuterClass.Item item = inventoryItem.getInventoryItemData().getItem();
-					itemBag.removeItem(inventoryItem.getInventoryItemData().getItem().getItemId(), item.getCount());
-				}
-				if (itemData.getPokemonFamily().getFamilyId() != PokemonFamilyIdOuterClass.PokemonFamilyId.UNRECOGNIZED) {
-					candyjar.removeCandy(
-							inventoryItem.getInventoryItemData().getPokemonFamily().getFamilyId(),
-							inventoryItem.getInventoryItemData().getPokemonFamily().getCandy()
-					);
-				}
-			} else {
-				if (itemData.getPokemonData().getPokemonId() != PokemonIdOuterClass.PokemonId.MISSINGNO) {
-					pokebank.addPokemon(new Pokemon(inventoryItem.getInventoryItemData().getPokemonData()));
-				}
-				if (itemData.getItem().getItemId() != ItemIdOuterClass.ItemId.UNRECOGNIZED) {
-					ItemOuterClass.Item item = inventoryItem.getInventoryItemData().getItem();
-					itemBag.addItem(new Item(item));
-				}
-				if (itemData.getPokemonFamily().getFamilyId() != PokemonFamilyIdOuterClass.PokemonFamilyId.UNRECOGNIZED) {
-					candyjar.addCandy(
-							inventoryItem.getInventoryItemData().getPokemonFamily().getFamilyId(),
-							inventoryItem.getInventoryItemData().getPokemonFamily().getCandy()
-					);
-				}
-				if (itemData.hasPlayerStats()) {
-					stats = inventoryItem.getInventoryItemData().getPlayerStats();
-				}
+
+			if (itemData.getPokemonData().getPokemonId() != PokemonIdOuterClass.PokemonId.MISSINGNO) {
+				pokebank.addPokemon(new Pokemon(inventoryItem.getInventoryItemData().getPokemonData()));
+			}
+			if (itemData.getItem().getItemId() != ItemIdOuterClass.ItemId.UNRECOGNIZED &&
+					itemData.getItem().getItemId() != ItemIdOuterClass.ItemId.ITEM_UNKNOWN) {
+				ItemOuterClass.Item item = inventoryItem.getInventoryItemData().getItem();
+				itemBag.addItem(new Item(item));
+			}
+			if (itemData.getPokemonFamily().getFamilyId() != PokemonFamilyIdOuterClass.PokemonFamilyId.UNRECOGNIZED
+					&& itemData.getPokemonFamily().getFamilyId() != PokemonFamilyIdOuterClass.PokemonFamilyId.FAMILY_UNSET) {
+				candyjar.setCandy(
+						inventoryItem.getInventoryItemData().getPokemonFamily().getFamilyId(),
+						inventoryItem.getInventoryItemData().getPokemonFamily().getCandy()
+				);
+			}
+			if (itemData.hasPlayerStats()) {
+				stats = inventoryItem.getInventoryItemData().getPlayerStats();
 			}
 
 			lastInventoryUpdate = System.currentTimeMillis();

src/main/java/com/pokegoapi/api/pokemon/Pokemon.java

@@ -73,6 +73,12 @@ public Result transferPokemon() throws LoginFailedException, RemoteServerExcepti
 			return ReleasePokemonResponse.Result.FAILED;
 		}
 
+		if(response.getResult() == Result.SUCCESS){
+			pgo.getInventories().getPokebank().removePokemon(this);
+		}
+
+		pgo.getInventories().getPokebank().removePokemon(this);
+
 		pgo.getInventories().updateInventories();
 
 		return response.getResult();
@@ -103,6 +109,7 @@ public NicknamePokemonResponse.Result renamePokemon(String nickname)
 			throw new RemoteServerException(e);
 		}
 
+		pgo.getInventories().getPokebank().removePokemon(this);
 		pgo.getInventories().updateInventories();
 
 		return response.getResult();
@@ -130,6 +137,8 @@ public EvolutionResult evolve() throws LoginFailedException, RemoteServerExcepti
 
 		EvolutionResult result = new EvolutionResult(response);
 
+		pgo.getInventories().getPokebank().removePokemon(this);
+
 		pgo.getInventories().updateInventories();
 
 		return result;