Merge pull request #225 from vmarchaud/Development

Fix for a NPE in CandyJar + fix checkstyle

Author: vmarchaud

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

@@ -81,6 +81,10 @@ public void removeCandy(PokemonFamilyId family, int amount) {
 	 * @return number of candies in jar
 	 */
 	public int getCandies(PokemonFamilyId family) {
-		return this.candies.get(family);
+		if (candies.containsKey(family)) {
+			return this.candies.get(family);
+		} else {
+			return 0;
+		}
 	}
 }

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

@@ -272,7 +272,7 @@ public int getIndividualStamina() {
 	 * Calculates the pokemons IV ratio.
 	 * @return the pokemons IV ratio as a double between 0 and 1.0, 1.0 being perfect IVs
 	 */
-	public double getIVRatio() {
+	public double getIvRatio() {
 		return (this.getIndividualAttack() + this.getIndividualDefense() + this.getIndividualStamina()) / 45.0;
 	}