Merge pull request #53 from bobby29831/1.4.3

Implement better coding practices

1 files changed, 13 insertions, 14 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java
index 8605764..78f9a64 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java
@@ -19,8 +19,7 @@
 
 package net.tylermurphy.hideAndSeek.command;
 
-import static net.tylermurphy.hideAndSeek.configuration.Localization.*;
-
+import net.tylermurphy.hideAndSeek.Main;
 import net.tylermurphy.hideAndSeek.game.Board;
 import net.tylermurphy.hideAndSeek.game.Game;
 import net.tylermurphy.hideAndSeek.util.Status;
@@ -28,36 +27,36 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import net.tylermurphy.hideAndSeek.Main;
-
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-
 import java.util.Optional;
 import java.util.Random;
 
+import static net.tylermurphy.hideAndSeek.configuration.Config.errorPrefix;
+import static net.tylermurphy.hideAndSeek.configuration.Config.minPlayers;
+import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
+
 public class Start implements ICommand {
 
 	public void execute(CommandSender sender, String[] args) {
-		if(Game.isNotSetup()) {
+		if (Game.isNotSetup()) {
 			sender.sendMessage(errorPrefix + message("GAME_SETUP"));
 			return;
 		}
-		if(Game.status != Status.STANDBY) {
+		if (Game.status != Status.STANDBY) {
 			sender.sendMessage(errorPrefix + message("GAME_INPROGRESS"));
 			return;
 		}
-		if(!Board.isPlayer(sender)) {
+		if (!Board.contains(sender)) {
 			sender.sendMessage(errorPrefix + message("GAME_NOT_INGAME"));
 			return;
 		}
-		if(Board.size() < minPlayers) {
+		if (Board.size() < minPlayers) {
 			sender.sendMessage(errorPrefix + message("START_MIN_PLAYERS").addAmount(minPlayers));
 			return;
 		}
 		String seekerName;
-		if(args.length < 1) {
+		if (args.length < 1) {
 			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;
 			}
@@ -66,12 +65,12 @@ public class Start implements ICommand {
 			seekerName = args[0];
 		}
 		Player temp = Bukkit.getPlayer(seekerName);
-		if(temp == null) {
+		if (temp == null) {
 			sender.sendMessage(errorPrefix + message("START_INVALID_NAME").addPlayer(seekerName));
 			return;
 		}
 		Player seeker = Board.getPlayer(temp.getUniqueId());
-		if(seeker == null) {
+		if (seeker == null) {
 			sender.sendMessage(errorPrefix + message("START_INVALID_NAME").addPlayer(seekerName));
 			return;
 		}