Skip to content

Commit d66a627

Browse files
author
Matthew J. Mjelde
committed
Fix catching of pokemon. Also added updating of inventories to a few methods related to pokemon
1 parent 7ad922e commit d66a627

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

src/main/java/com/pokegoapi/api/map/pokemon/CatchablePokemon.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,9 @@ public CatchResult catchPokemon() throws LoginFailedException, RemoteServerExcep
130130
Pokeball ball = Pokeball.POKEBALL;
131131
if (api.getInventories().getItemBag().getItem(ItemIdOuterClass.ItemId.ITEM_POKE_BALL).getCount() == 0) {
132132
ball = Pokeball.GREATBALL;
133-
}
134-
if (api.getInventories().getItemBag().getItem(ItemIdOuterClass.ItemId.ITEM_GREAT_BALL).getCount() == 0) {
133+
} else if (api.getInventories().getItemBag().getItem(ItemIdOuterClass.ItemId.ITEM_GREAT_BALL).getCount() == 0) {
135134
ball = Pokeball.ULTRABALL;
136-
}
137-
if (api.getInventories().getItemBag().getItem(ItemIdOuterClass.ItemId.ITEM_ULTRA_BALL).getCount() == 0) {
135+
} else if (api.getInventories().getItemBag().getItem(ItemIdOuterClass.ItemId.ITEM_ULTRA_BALL).getCount() == 0) {
138136
ball = Pokeball.MASTERBALL;
139137
}
140138
return catchPokemon(ball);
@@ -214,6 +212,8 @@ public CatchResult catchPokemon(
214212
}
215213
while (amount < 0 || numThrows < amount);
216214

215+
api.getInventories().updateInventories();
216+
217217
return new CatchResult(response);
218218
}
219219

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ public Result transferPokemon() throws LoginFailedException, RemoteServerExcepti
7373
return ReleasePokemonResponse.Result.FAILED;
7474
}
7575

76+
pgo.getInventories().updateInventories();
77+
7678
return response.getResult();
7779
}
7880

@@ -101,6 +103,8 @@ public NicknamePokemonResponse.Result renamePokemon(String nickname)
101103
throw new RemoteServerException(e);
102104
}
103105

106+
pgo.getInventories().updateInventories();
107+
104108
return response.getResult();
105109
}
106110

@@ -126,6 +130,8 @@ public EvolutionResult evolve() throws LoginFailedException, RemoteServerExcepti
126130

127131
EvolutionResult result = new EvolutionResult(response);
128132

133+
pgo.getInventories().updateInventories();
134+
129135
return result;
130136
}
131137

0 commit comments

Comments
 (0)