Skip to content

Commit

Permalink
Merge branch 'iss132' of https://github.com/Sadye/PokeGOAPI-Java into…
Browse files Browse the repository at this point in the history
… Sadye-iss132

# Conflicts:
#	src/main/java/com/pokegoapi/api/map/Map.java
#	src/main/java/com/pokegoapi/api/map/pokemon/CatchablePokemon.java

Style issues
  • Loading branch information
Grover-c13 committed Jul 23, 2016
1 parent f7afed6 commit 0763543
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,8 @@ public CatchResult catchPokemon(double normalizedHitPosition,
break;
}
numThrows++;
} while (amount < 0 || numThrows < amount);
}
while (amount < 0 || numThrows < amount);

api.getInventories().updateInventories();

Expand Down

0 comments on commit 0763543

Please sign in to comment.