From d37ad3fc4500cf4d35db718bdaf964bad03840e4 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Sun, 17 Oct 2021 22:52:57 -0400 Subject: lobby bug fixes, titles, game time --- .../net/tylermurphy/hideAndSeek/command/Leave.java | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java') diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java index 5015516..4dec452 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java @@ -1,9 +1,11 @@ package net.tylermurphy.hideAndSeek.command; import org.bukkit.Bukkit; +import org.bukkit.Location; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import net.tylermurphy.hideAndSeek.util.Functions; import net.tylermurphy.hideAndSeek.util.ICommand; import static net.tylermurphy.hideAndSeek.Store.*; @@ -11,16 +13,8 @@ import static net.tylermurphy.hideAndSeek.Store.*; public class Leave implements ICommand { public void execute(CommandSender sender, String[] args) { - if(!lobbyManualJoin) { - sender.sendMessage(errorPrefix + "Manual join/leave isnt enabled in this server"); - return; - } - if(!status.equals("Standby")) { - sender.sendMessage(errorPrefix + "Game is currently in session"); - return; - } - if(!lobbyStarted) { - sender.sendMessage(errorPrefix + "There is currently no lobby in session"); + if(!Functions.setup()) { + sender.sendMessage(errorPrefix + "Game is not setup. Run /hs setup to see what you needed to do"); return; } Player player = Bukkit.getServer().getPlayer(sender.getName()); @@ -32,13 +26,16 @@ public class Leave implements ICommand { sender.sendMessage(errorPrefix + "You are currently not in the lobby"); return; } + if(!Seeker.contains(player.getName())) { + if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + sender.getName() + " has left the HideAndSeek lobby"); + else Functions.broadcastMessage(messagePrefix + sender.getName() + " has left the HideAndSeek lobby"); + } playerList.remove(player.getName()); Hider.remove(player.getName()); Seeker.remove(player.getName()); HiderTeam.removeEntry(player.getName()); SeekerTeam.removeEntry(player.getName()); - player.teleport(playerLastLocationList.get(player.getName())); - if(lobbyAnnounced) Bukkit.broadcastMessage(messagePrefix + sender.getName() + " has left the HideAndSeek lobby"); + player.teleport(new Location(Bukkit.getWorld(exitWorld), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ())); } public String getLabel() { -- cgit v1.2.3-freya