refactor: general improvements, fix spacing inconsistencies

1 files changed, 110 insertions, 110 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
index 2f8f8be..83b304d 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
@@ -68,36 +68,36 @@ public class Game {
 		worldLoader = new WorldLoader(spawnWorld);
 	}
 
-	public static void start(){
+	public static void start() {
 		Optional<Player> rand = Board.getPlayers().stream().skip(new Random().nextInt(Board.size())).findFirst();
-		if(!rand.isPresent()){
+		if (!rand.isPresent()) {
 			Main.plugin.getLogger().warning("Failed to select random seeker.");
 			return;
 		}
 		String seekerName = rand.get().getName();
 		Player temp = Bukkit.getPlayer(seekerName);
-		if(temp == null){
+		if (temp == null) {
 			Main.plugin.getLogger().warning("Failed to select random seeker.");
 			return;
 		}
 		Player seeker = Board.getPlayer(temp.getUniqueId());
-		if(seeker == null){
+		if (seeker == null) {
 			Main.plugin.getLogger().warning("Failed to select random seeker.");
 			return;
 		}
 		start(seeker);
 	}
 
-	public static void start(Player seeker){
-		if(status == Status.STARTING || status == Status.PLAYING) return;
-		if(mapSaveEnabled && worldLoader.getWorld() != null) {
+	public static void start(Player seeker) {
+		if (status == Status.STARTING || status == Status.PLAYING) return;
+		if (mapSaveEnabled && worldLoader.getWorld() != null) {
 			worldLoader.rollback();
-		} else if(mapSaveEnabled) {
+		} else if (mapSaveEnabled) {
 			worldLoader.loadMap();
 		}
 		Board.reload();
 		for(Player temp : Board.getPlayers()) {
-			if(temp.getName().equals(seeker.getName()))
+			if (temp.getName().equals(seeker.getName()))
 				continue;
 			Board.addHider(temp);
 		}
@@ -107,7 +107,7 @@ public class Game {
 			player.getInventory().clear();
 			player.setGameMode(GameMode.ADVENTURE);
 			player.teleport(new Location(Bukkit.getWorld(getGameWorld()), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ()));
-			for(PotionEffect effect : player.getActivePotionEffects()){
+			for(PotionEffect effect : player.getActivePotionEffects()) {
 				player.removePotionEffect(effect.getType());
 			}
 		}
@@ -121,20 +121,20 @@ public class Game {
 			player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED,1000000,5,false,false));
 			Titles.sendTitle(player, 10, 70, 20, ChatColor.WHITE + "" + message("HIDER_TEAM_NAME"), ChatColor.WHITE + message("HIDERS_SUBTITLE").toString());
 		}
-		if(tauntEnabled)
+		if (tauntEnabled)
 			taunt = new Taunt();
 		if (glowEnabled)
 			glow = new Glow();
 		worldBorder = new Border();
 		worldBorder.resetWorldborder(getGameWorld());
-		if(gameLength > 0)
+		if (gameLength > 0)
 			timeLeft = gameLength;
 		for(Player player : Board.getPlayers())
 			Board.createGameBoard(player);
 		Board.reloadGameBoards();
 		status = Status.STARTING;
 		int temp = gameId;
-		if(countdownDisplay != CountdownDisplay.TITLE) {
+		if (countdownDisplay != CountdownDisplay.TITLE) {
 			sendHideCountdownMessage(messagePrefix + message("START_COUNTDOWN").addAmount(30), gameId, 0);
 		}
 		sendHideCountdownMessage(messagePrefix + message("START_COUNTDOWN").addAmount(20), gameId, 20 * 10);
@@ -144,33 +144,33 @@ public class Game {
 		sendHideCountdownMessage(messagePrefix + message("START_COUNTDOWN").addAmount(2), gameId, 20 * 28);
 		sendHideCountdownMessage(messagePrefix + message("START_COUNTDOWN").addAmount(1), gameId, 20 * 29);
 		Bukkit.getServer().getScheduler().runTaskLater(Main.plugin, () -> {
-			if(temp != gameId) return;
+			if (temp != gameId) return;
 			sendHideCountdownMessage(messagePrefix + message("START"), gameId, 0);
 			for(Player player : Board.getPlayers()) resetPlayer(player);
 			status = Status.PLAYING;
 		}, 20 * 30);
 	}
 
-	public static void stop(WinType type){
-		if(status == Status.STANDBY || status == Status.ENDING) return;
+	public static void stop(WinType type) {
+		if (status == Status.STANDBY || status == Status.ENDING) return;
 		status = Status.ENDING;
 		for(Player player : Board.getPlayers()) {
 			player.getInventory().clear();
-			for(PotionEffect effect : player.getActivePotionEffects()){
+			for(PotionEffect effect : player.getActivePotionEffects()) {
 				player.removePotionEffect(effect.getType());
 			}
 			player.addPotionEffect(new PotionEffect(PotionEffectType.HEAL, 1, 100));
-			if(Version.atLeast("1.9")){
+			if (Version.atLeast("1.9")) {
 				for(Player temp : Board.getPlayers()) {
 					Packet.setGlow(player, temp, false);
 				}
 			}
 		}
 		List<UUID> players = Board.getPlayers().stream().map(Entity::getUniqueId).collect(Collectors.toList());
-		if(type == WinType.HIDER_WIN){
+		if (type == WinType.HIDER_WIN) {
 			List<UUID> winners = Board.getHiders().stream().map(Entity::getUniqueId).collect(Collectors.toList());
 			Database.playerInfo.addWins(players, winners, Board.getHiderKills(), Board.getHiderDeaths(), Board.getSeekerKills(), Board.getSeekerDeaths(), type);
-		} else if(type == WinType.SEEKER_WIN){
+		} else if (type == WinType.SEEKER_WIN) {
 			List<UUID> winners = new ArrayList<>();
 			winners.add(Board.getFirstSeeker().getUniqueId());
 			Database.playerInfo.addWins(players, winners, Board.getHiderKills(), Board.getHiderDeaths(), Board.getSeekerKills(), Board.getSeekerDeaths(), type);
@@ -178,8 +178,8 @@ public class Game {
 		Bukkit.getScheduler().scheduleSyncDelayedTask(Main.plugin, Game::end, 5*20);
 	}
 
-	public static void end(){
-		if(status == Status.STANDBY) return;
+	public static void end() {
+		if (status == Status.STANDBY) return;
 		tick = 0;
 		countdownTime = -1;
 		status = Status.STANDBY;
@@ -187,21 +187,21 @@ public class Game {
 		timeLeft = 0;
 		worldBorder.resetWorldborder(getGameWorld());
 		for(Player player : Board.getPlayers()) {
-			for(Player player2 : Board.getPlayers()){
+			for(Player player2 : Board.getPlayers()) {
 				player.showPlayer(player2);
 			}
 			player.setAllowFlight(false);
 			player.setFlying(false);
-			if(Version.atLeast("1.9")){
+			if (Version.atLeast("1.9")) {
 				for(Player temp : Board.getPlayers()) {
 					Packet.setGlow(player, temp, false);
 				}
 			}
-			for(PotionEffect effect : player.getActivePotionEffects()){
+			for(PotionEffect effect : player.getActivePotionEffects()) {
 				player.removePotionEffect(effect.getType());
 			}
 			player.addPotionEffect(new PotionEffect(PotionEffectType.HEAL, 1, 100));
-			if(leaveOnEnd){
+			if (leaveOnEnd) {
 				Board.removeBoard(player);
 				Board.remove(player);
 				player.getInventory().clear();
@@ -212,33 +212,33 @@ public class Game {
 				player.setGameMode(GameMode.ADVENTURE);
 				Board.addHider(player);
 				player.getInventory().clear();
-				if(lobbyStartItem != null && (!lobbyItemStartAdmin || player.isOp()))
+				if (lobbyStartItem != null && (!lobbyItemStartAdmin || player.isOp()))
 					player.getInventory().setItem(lobbyItemStartPosition, lobbyStartItem);
-				if(lobbyLeaveItem != null)
+				if (lobbyLeaveItem != null)
 					player.getInventory().setItem(lobbyItemLeavePosition, lobbyLeaveItem);
-				for(PotionEffect effect : player.getActivePotionEffects()){
+				for(PotionEffect effect : player.getActivePotionEffects()) {
 					player.removePotionEffect(effect.getType());
 				}
 				player.addPotionEffect(new PotionEffect(PotionEffectType.HEAL, 1, 100));
 			}
 		}
 		RespawnHandler.temp_loc.clear();
-		if(mapSaveEnabled) worldLoader.unloadMap();
+		if (mapSaveEnabled) worldLoader.unloadMap();
 		Board.reloadLobbyBoards();
 	}
 
-	public static void join(Player player){
-		if(Game.status == Status.STANDBY || Game.status == Status.ENDING) {
+	public static void join(Player player) {
+		if (Game.status == Status.STANDBY || Game.status == Status.ENDING) {
 			player.teleport(new Location(Bukkit.getWorld(lobbyWorld), lobbyPosition.getX(),lobbyPosition.getY(),lobbyPosition.getZ()));
 			player.getInventory().clear();
-			if(lobbyStartItem != null && (!lobbyItemStartAdmin || player.hasPermission("hideandseek.start")))
+			if (lobbyStartItem != null && (!lobbyItemStartAdmin || player.hasPermission("hideandseek.start")))
 				player.getInventory().setItem(lobbyItemStartPosition, lobbyStartItem);
-			if(lobbyLeaveItem != null)
+			if (lobbyLeaveItem != null)
 				player.getInventory().setItem(lobbyItemLeavePosition, lobbyLeaveItem);
 			Board.addHider(player);
-			if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + message("GAME_JOIN").addPlayer(player));
+			if (announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + message("GAME_JOIN").addPlayer(player));
 			else Game.broadcastMessage(messagePrefix + message("GAME_JOIN").addPlayer(player));
-			for(PotionEffect effect : player.getActivePotionEffects()){
+			for(PotionEffect effect : player.getActivePotionEffects()) {
 				player.removePotionEffect(effect.getType());
 			}
 			player.setGameMode(GameMode.ADVENTURE);
@@ -248,7 +248,7 @@ public class Game {
 			Board.addSpectator(player);
 			player.sendMessage(messagePrefix + message("GAME_JOIN_SPECTATOR"));
 			player.setGameMode(GameMode.ADVENTURE);
-			for(Player player2 : Board.getPlayers()){
+			for(Player player2 : Board.getPlayers()) {
 				player2.hidePlayer(player);
 			}
 			Board.createGameBoard(player);
@@ -260,7 +260,7 @@ public class Game {
 		}
 
 		player.setFoodLevel(20);
-		if(Version.atLeast("1.9")) {
+		if (Version.atLeast("1.9")) {
 			AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
 			if (attribute != null) player.setHealth(attribute.getValue());
 		} else {
@@ -272,25 +272,25 @@ public class Game {
 		player.setFlying(false);
 		player.setAllowFlight(false);
 		player.setFallDistance(0.0F);
-		for(Player player2 : Board.getPlayers()){
+		for(Player player2 : Board.getPlayers()) {
 			player2.showPlayer(player);
 			player.showPlayer(player2);
 		}
-		if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + message("GAME_LEAVE").addPlayer(player));
+		if (announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + message("GAME_LEAVE").addPlayer(player));
 		else Game.broadcastMessage(messagePrefix + message("GAME_LEAVE").addPlayer(player));
-		if(Board.isHider(player) && status != Status.ENDING && status != Status.STANDBY){
+		if (Board.isHider(player) && status != Status.ENDING && status != Status.STANDBY) {
 			hiderLeave = true;
 		}
 		Board.removeBoard(player);
 		Board.remove(player);
 		player.getInventory().clear();
-		if(Game.status == Status.STANDBY) {
+		if (Game.status == Status.STANDBY) {
 			Board.reloadLobbyBoards();
 		} else {
 			Board.reloadGameBoards();
 			Board.reloadBoardTeams();
 		}
-		for(PotionEffect effect : player.getActivePotionEffects()){
+		for(PotionEffect effect : player.getActivePotionEffects()) {
 			player.removePotionEffect(effect.getType());
 		}
 		handleBungeeLeave(player);
@@ -308,25 +308,25 @@ public class Game {
 	}
 
 	public static void onTick() {
-		if(isNotSetup()) return;
-		if(status == Status.STANDBY) whileWaiting();
-		else if(status == Status.STARTING) whileStarting();
-		else if(status == Status.PLAYING) whilePlaying();
+		if (isNotSetup()) return;
+		if (status == Status.STANDBY) whileWaiting();
+		else if (status == Status.STARTING) whileStarting();
+		else if (status == Status.PLAYING) whilePlaying();
 		tick++;
 	}
 
 	private static void whileWaiting() {
-		if(!lobbyCountdownEnabled) return;
-		if(lobbyMin <= Board.size()){
-			if(countdownTime == -1)
+		if (!lobbyCountdownEnabled) return;
+		if (lobbyMin <= Board.size()) {
+			if (countdownTime == -1)
 				countdownTime = countdown;
-			if(Board.size() >= changeCountdown)
+			if (Board.size() >= changeCountdown)
 				countdownTime = Math.min(countdownTime, 10);
-			if(tick % 20 == 0) {
+			if (tick % 20 == 0) {
 				countdownTime--;
 				Board.reloadLobbyBoards();
 			}
-			if(countdownTime == 0){
+			if (countdownTime == 0) {
 				start();
 			}
 		} else {
@@ -335,7 +335,7 @@ public class Game {
 	}
 
 	private static void whileStarting() {
-		for(Player spectator : Board.getSpectators()){
+		for(Player spectator : Board.getSpectators()) {
 			spectator.setFlying(spectator.getAllowFlight());
 		}
 		checkWinConditions();
@@ -347,46 +347,46 @@ public class Game {
 			for(Player seeker : Board.getSeekers()) {
 				try {
 					temp = (int) hider.getLocation().distance(seeker.getLocation());
-				} catch (Exception e){
+				} catch (Exception e) {
 					//Players in different worlds, NOT OK!!!
 				}
-				if(distance > temp) {
+				if (distance > temp) {
 					distance = temp;
 				}
 			}
-			if(seekerPing) switch(tick%10) {
+			if (seekerPing) switch(tick%10) {
 				case 0:
-					if(distance < seekerPingLevel1) heartbeatSound.play(hider, seekerPingLeadingVolume, seekerPingPitch);
-					if(distance < seekerPingLevel3) ringingSound.play(hider, seekerPingVolume, seekerPingPitch);
+					if (distance < seekerPingLevel1) heartbeatSound.play(hider, seekerPingLeadingVolume, seekerPingPitch);
+					if (distance < seekerPingLevel3) ringingSound.play(hider, seekerPingVolume, seekerPingPitch);
 					break;
 				case 3:
-					if(distance < seekerPingLevel1) heartbeatSound.play(hider, seekerPingVolume, seekerPingPitch);
-					if(distance < seekerPingLevel3) ringingSound.play(hider, seekerPingVolume, seekerPingPitch);
+					if (distance < seekerPingLevel1) heartbeatSound.play(hider, seekerPingVolume, seekerPingPitch);
+					if (distance < seekerPingLevel3) ringingSound.play(hider, seekerPingVolume, seekerPingPitch);
 					break;
 				case 6:
-					if(distance < seekerPingLevel3) ringingSound.play(hider, seekerPingVolume, seekerPingPitch);
+					if (distance < seekerPingLevel3) ringingSound.play(hider, seekerPingVolume, seekerPingPitch);
 					break;
 				case 9:
-					if(distance < seekerPingLevel2) ringingSound.play(hider, seekerPingVolume, seekerPingPitch);
+					if (distance < seekerPingLevel2) ringingSound.play(hider, seekerPingVolume, seekerPingPitch);
 					break;
 			}
 		}
-		for(Player spectator : Board.getSpectators()){
+		for(Player spectator : Board.getSpectators()) {
 			spectator.setFlying(spectator.getAllowFlight());
 		}
-		if(tick%20 == 0) {
-			if(gameLength > 0) {
+		if (tick%20 == 0) {
+			if (gameLength > 0) {
 				Board.reloadGameBoards();
 				timeLeft--;
 			}
-			if(worldborderEnabled) worldBorder.update();
-			if(tauntEnabled) taunt.update();
+			if (worldborderEnabled) worldBorder.update();
+			if (tauntEnabled) taunt.update();
 			if (glowEnabled) glow.update();
 		}
 		checkWinConditions();
 	}
 
-	public static void resetWorldBorder(String worldName){
+	public static void resetWorldBorder(String worldName) {
 		worldBorder = new Border();
 		worldBorder.resetWorldborder(worldName);
 	}
@@ -398,18 +398,18 @@ public class Game {
 	}
 
 	public static boolean isNotSetup() {
-		if(spawnPosition.getBlockX() == 0 && spawnPosition.getBlockY() == 0 && spawnPosition.getBlockZ() == 0) return true;
-		if(lobbyPosition.getBlockX() == 0 && lobbyPosition.getBlockY() == 0 && lobbyPosition.getBlockZ() == 0) return true;
-		if(exitPosition.getBlockX() == 0 && exitPosition.getBlockY() == 0 && exitPosition.getBlockZ() == 0) return true;
-		if(mapSaveEnabled) {
+		if (spawnPosition.getBlockX() == 0 && spawnPosition.getBlockY() == 0 && spawnPosition.getBlockZ() == 0) return true;
+		if (lobbyPosition.getBlockX() == 0 && lobbyPosition.getBlockY() == 0 && lobbyPosition.getBlockZ() == 0) return true;
+		if (exitPosition.getBlockX() == 0 && exitPosition.getBlockY() == 0 && exitPosition.getBlockZ() == 0) return true;
+		if (mapSaveEnabled) {
 			File destination = new File(Main.root + File.separator + getGameWorld());
 			if (!destination.exists()) return true;
 		}
 		return saveMinX == 0 || saveMinZ == 0 || saveMaxX == 0 || saveMaxZ == 0;
 	}
 
-	public static String getGameWorld(){
-		if(mapSaveEnabled) return "hideandseek_"+spawnWorld;
+	public static String getGameWorld() {
+		if (mapSaveEnabled) return "hideandseek_"+spawnWorld;
 		else return spawnWorld;
 	}
 
@@ -419,35 +419,35 @@ public class Game {
 			player.removePotionEffect(effect.getType());
 		}
 		if (Board.isSeeker(player)) {
-			if(pvpEnabled)
+			if (pvpEnabled)
 				for(ItemStack item : Items.SEEKER_ITEMS)
 					player.getInventory().addItem(item);
 			for(PotionEffect effect : Items.SEEKER_EFFECTS)
 				player.addPotionEffect(effect);
 		} else if (Board.isHider(player)) {
-			if(pvpEnabled)
+			if (pvpEnabled)
 				for(ItemStack item : Items.HIDER_ITEMS)
 					player.getInventory().addItem(item);
 			for(PotionEffect effect : Items.HIDER_EFFECTS)
 				player.addPotionEffect(effect);
-			if(glowEnabled) {
+			if (glowEnabled) {
 				player.getInventory().addItem(glowPowerupItem);
 			}
 		}
 	}
 
-	public static void removeItems(Player player){
+	public static void removeItems(Player player) {
 		for(ItemStack si : Items.SEEKER_ITEMS)
 			for(ItemStack i : player.getInventory().getContents())
-				if(si.isSimilar(i)) player.getInventory().remove(i);
+				if (si.isSimilar(i)) player.getInventory().remove(i);
 		for(ItemStack hi : Items.HIDER_ITEMS)
 			for(ItemStack i : player.getInventory().getContents())
-				if(hi.isSimilar(i)) player.getInventory().remove(i);
+				if (hi.isSimilar(i)) player.getInventory().remove(i);
 	}
 
-	private static void checkWinConditions(){
-		if(Board.sizeHider() < 1) {
-			if(hiderLeave){
+	private static void checkWinConditions() {
+		if (Board.sizeHider() < 1) {
+			if (hiderLeave) {
 				if (announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_HIDERS_QUIT"));
 				else broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_HIDERS_QUIT"));
 				stop(WinType.NONE);
@@ -456,12 +456,12 @@ public class Game {
 				else broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_HIDERS_FOUND"));
 				stop(WinType.SEEKER_WIN);
 			}
-		} else if(Board.sizeSeeker() < 1) {
-			if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(abortPrefix + message("GAME_GAMEOVER_SEEKERS_QUIT"));
+		} else if (Board.sizeSeeker() < 1) {
+			if (announceMessagesToNonPlayers) Bukkit.broadcastMessage(abortPrefix + message("GAME_GAMEOVER_SEEKERS_QUIT"));
 			else broadcastMessage(abortPrefix + message("GAME_GAMEOVER_SEEKERS_QUIT"));
 			stop(WinType.NONE);
-		} else if(timeLeft < 1) {
-			if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_TIME"));
+		} else if (timeLeft < 1) {
+			if (announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_TIME"));
 			else broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_TIME"));
 			stop(WinType.HIDER_WIN);
 		}
@@ -470,14 +470,14 @@ public class Game {
 
 	private static void sendHideCountdownMessage(String message, int gameId, int delay) {
 		Bukkit.getScheduler().runTaskLaterAsynchronously(Main.plugin, () -> {
-			if(gameId == Game.gameId){
-				for(Player player : Board.getPlayers()){
-					if(countdownDisplay == CountdownDisplay.CHAT){
+			if (gameId == Game.gameId) {
+				for(Player player : Board.getPlayers()) {
+					if (countdownDisplay == CountdownDisplay.CHAT) {
 						player.sendMessage(message);
-					} else if(countdownDisplay == CountdownDisplay.ACTIONBAR){
+					} else if (countdownDisplay == CountdownDisplay.ACTIONBAR) {
 						ActionBar.clearActionBar(player);
 						ActionBar.sendActionBar(player,message);
-					} else if(countdownDisplay == CountdownDisplay.TITLE){
+					} else if (countdownDisplay == CountdownDisplay.TITLE) {
 						Titles.clearTitle(player);
 						Titles.sendTitle(player, 10, 40, 10, " ", message);
 					}
@@ -499,9 +499,9 @@ class Taunt {
 	}
 
 	protected void update() {
-		if(delay == 0) {
-			if(running) launchTaunt();
-			else if(tauntLast || Board.sizeHider() > 1) executeTaunt();
+		if (delay == 0) {
+			if (running) launchTaunt();
+			else if (tauntLast || Board.sizeHider() > 1) executeTaunt();
 		} else {
 			delay--;
 			delay = Math.max(delay, 0);
@@ -510,7 +510,7 @@ class Taunt {
 
 	private void executeTaunt() {
 		Optional<Player> rand = Board.getHiders().stream().skip(new Random().nextInt(Board.size())).findFirst();
-		if(!rand.isPresent()){
+		if (!rand.isPresent()) {
 			Main.plugin.getLogger().warning("Failed to select random seeker.");
 			return;
 		}
@@ -522,10 +522,10 @@ class Taunt {
 		delay = 30;
 	}
 
-	private void launchTaunt(){
+	private void launchTaunt() {
 		Player taunted = Board.getPlayer(tauntPlayer);
-		if(taunted != null) {
-			if(!Board.isHider(taunted)){
+		if (taunted != null) {
+			if (!Board.isHider(taunted)) {
 				Main.plugin.getLogger().info("Taunted played died and is now seeker. Skipping taunt.");
 				tauntPlayer = null;
 				running = false;
@@ -533,7 +533,7 @@ class Taunt {
 				return;
 			}
 			World world = taunted.getLocation().getWorld();
-			if(world == null){
+			if (world == null) {
 				Main.plugin.getLogger().severe("Game world is null while trying to launch taunt.");
 				tauntPlayer = null;
 				running = false;
@@ -561,7 +561,7 @@ class Taunt {
 		delay = tauntDelay;
 	}
 
-	public int getDelay(){
+	public int getDelay() {
 		return delay;
 	}
 
@@ -580,11 +580,11 @@ class Border {
 		delay = 60 * worldborderDelay;
 	}
 
-	void update(){
-		if(delay == 30 && !running){
+	void update() {
+		if (delay == 30 && !running) {
 			broadcastMessage(worldborderPrefix + message("WORLDBORDER_WARN"));
-		} else if(delay == 0){
-			if(running){
+		} else if (delay == 0) {
+			if (running) {
 				delay = 60 * worldborderDelay;
 				running = false;
 			}
@@ -594,9 +594,9 @@ class Border {
 	}
 
 	private void decreaceWorldborder() {
-		if(currentWorldborderSize == 100) return;
+		if (currentWorldborderSize == 100) return;
 		int change = worldborderChange;
-		if(currentWorldborderSize-worldborderChange < 100){
+		if (currentWorldborderSize-worldborderChange < 100) {
 			change = currentWorldborderSize-100;
 		}
 		running = true;
@@ -613,7 +613,7 @@ class Border {
 		World world = Bukkit.getWorld(worldName);
 		assert world != null;
 		org.bukkit.WorldBorder border = world.getWorldBorder();
-		if(worldborderEnabled) {
+		if (worldborderEnabled) {
 			border.setSize(worldborderSize);
 			border.setCenter(worldborderPosition.getX(), worldborderPosition.getZ());
 			currentWorldborderSize = worldborderSize;
@@ -623,7 +623,7 @@ class Border {
 		}
 	}
 
-	public int getDelay(){
+	public int getDelay() {
 		return delay;
 	}