1 files changed, 26 insertions, 39 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java
index e4dd16e..b41277b 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java
@@ -1,36 +1,47 @@
+/*
+ * This file is part of Kenshins Hide and Seek
+ *
+ * Copyright (c) 2021 Tyler Murphy.
+ *
+ * Kenshins Hide and Seek free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * he Free Software Foundation version 3.
+ *
+ * Kenshins Hide and Seek is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 package net.tylermurphy.hideAndSeek.command;
 
 import static net.tylermurphy.hideAndSeek.configuration.Config.*;
 
+import net.tylermurphy.hideAndSeek.game.Game;
+import net.tylermurphy.hideAndSeek.util.Status;
+import net.tylermurphy.hideAndSeek.util.WinType;
 import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
 
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.events.Worldborder;
-import net.tylermurphy.hideAndSeek.util.Packet;
-import net.tylermurphy.hideAndSeek.util.Util;
 import static net.tylermurphy.hideAndSeek.configuration.Localization.*;
 
 public class Stop implements ICommand {
 
 	public void execute(CommandSender sender, String[] args) {
-		if(!Util.isSetup()) {
+		if(Game.isNotSetup()) {
 			sender.sendMessage(errorPrefix + "Game is not setup. Run /hs setup to see what you needed to do");
 			return;
 		}
-		if(Main.plugin.status.equals("Starting") || Main.plugin.status.equals("Playing")) {
+		if(Game.status == Status.STARTING || Game.status == Status.PLAYING) {
 			if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(abortPrefix + message("STOP"));
-			else Util.broadcastMessage(abortPrefix + message("STOP"));
-			onStop();
-			
+			else Game.broadcastMessage(abortPrefix + message("STOP"));
+			Game.stop(WinType.NONE);
 		} else {
 			sender.sendMessage(errorPrefix + message("GAME_NOT_INPROGRESS"));
-			return;
 		}
 	}
 
@@ -38,30 +49,6 @@ public class Stop implements ICommand {
 		return "stop";
 	}
 	
-	public static void onStop() {
-		if(Main.plugin.status.equals("Standby")) return;
-		Main.plugin.status = "Standby";
-		Main.plugin.gameId++;
-		Main.plugin.timeLeft = 0;
-		Worldborder.resetWorldborder("hideandseek_"+spawnWorld);
-		for(Player player : Main.plugin.board.getPlayers()) {
-			Main.plugin.board.createLobbyBoard(player);
-			player.setGameMode(GameMode.ADVENTURE);
-			Main.plugin.board.addHider(player);
-			player.getInventory().clear();
-			player.teleport(new Location(Bukkit.getWorld(lobbyWorld), lobbyPosition.getX(),lobbyPosition.getY(),lobbyPosition.getZ()));
-			for(PotionEffect effect : player.getActivePotionEffects()){
-			    player.removePotionEffect(effect.getType());
-			}
-			player.addPotionEffect(new PotionEffect(PotionEffectType.HEAL, 1, 100));
-			for(Player temp : Main.plugin.board.getPlayers()) {
-				Packet.setGlow(player, temp, false);
-			}
-		}
-		Main.plugin.worldLoader.unloadMap();
-		Main.plugin.board.reloadLobbyBoards();
-	}
-	
 	public String getUsage() {
 		return "";
 	}