diff options
| author | Tyler Murphy <tylermurphy534@gmail.com> | 2021-10-17 22:53:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-17 22:53:32 -0400 |
| commit | 3ad77301c9e5d05e630fac97090c792c9a46ba5f (patch) | |
| tree | ee3506b113bf347e64dfac50930b688eed781453 /src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java | |
| parent | 1.3.0 beta 5 (diff) | |
| parent | lobby bug fixes, titles, game time (diff) | |
| download | kenshinshideandseek-3ad77301c9e5d05e630fac97090c792c9a46ba5f.tar.gz kenshinshideandseek-3ad77301c9e5d05e630fac97090c792c9a46ba5f.tar.bz2 kenshinshideandseek-3ad77301c9e5d05e630fac97090c792c9a46ba5f.zip | |
Merge pull request #7 from tylermurphy534/1.3.0beta6
1.3.0beta6
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java')
| -rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java index c956d3d..9c1e3d7 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java @@ -17,8 +17,13 @@ import net.tylermurphy.hideAndSeek.util.Packet; public class Stop implements ICommand { public void execute(CommandSender sender, String[] args) { + if(!Functions.setup()) { + sender.sendMessage(errorPrefix + "Game is not setup. Run /hs setup to see what you needed to do"); + return; + } if(status.equals("Starting") || status.equals("Playing")) { - Bukkit.broadcastMessage(abortPrefix + "Game has been force stopped."); + if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(abortPrefix + "Game has been force stopped."); + else Functions.broadcastMessage(abortPrefix + "Game has been force stopped."); onStop(); } else { @@ -38,10 +43,11 @@ public class Stop implements ICommand { Functions.resetWorldborder("hideandseek_"+spawnWorld); for(Player player : playerList.values()) { player.setGameMode(GameMode.ADVENTURE); + player.setLevel(0); Hider.add(player.getName()); HiderTeam.addEntry(player.getName()); player.getInventory().clear(); - player.teleport(new Location(Bukkit.getWorld(spawnWorld), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ())); + player.teleport(new Location(Bukkit.getWorld(lobbyWorld), lobbyPosition.getX(),lobbyPosition.getY(),lobbyPosition.getZ())); for(PotionEffect effect : player.getActivePotionEffects()){ player.removePotionEffect(effect.getType()); } @@ -50,6 +56,7 @@ public class Stop implements ICommand { Packet.setGlow(player, temp, false); } } + Functions.unloadMap("hideandseek_"+spawnWorld); } public String getUsage() { |