From 076354361d1de5ab717f6f0e99ebf3c7c345b32c Mon Sep 17 00:00:00 2001
From: Grover-c13 <Grover.c13@gmail.com>
Date: Sat, 23 Jul 2016 22:29:30 +0800
Subject: [PATCH] Merge branch 'iss132' of
 https://github.com/Sadye/PokeGOAPI-Java into Sadye-iss132

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

Style issues
---
 .../java/com/pokegoapi/api/map/pokemon/CatchablePokemon.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/pokegoapi/api/map/pokemon/CatchablePokemon.java b/src/main/java/com/pokegoapi/api/map/pokemon/CatchablePokemon.java
index ad144cca..32ecd439 100644
--- a/src/main/java/com/pokegoapi/api/map/pokemon/CatchablePokemon.java
+++ b/src/main/java/com/pokegoapi/api/map/pokemon/CatchablePokemon.java
@@ -266,7 +266,8 @@ public CatchResult catchPokemon(double normalizedHitPosition,
 				break;
 			}
 			numThrows++;
-		} while (amount < 0 || numThrows < amount);
+		}
+		while (amount < 0 || numThrows < amount);
 
 		api.getInventories().updateInventories();