diff options
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/command/Join.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java index 88e650d..4b0baa3 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java @@ -12,8 +12,8 @@ import static net.tylermurphy.hideAndSeek.Store.*; public class Join implements ICommand { public void execute(CommandSender sender, String[] args) { - if(!manualJoin) { - sender.sendMessage(errorPrefix + "Manual join isnt enabled in this server"); + if(!lobbyManualJoin) { + sender.sendMessage(errorPrefix + "Manual join/leave isnt set to manual in this server"); return; } if(!status.equals("Standby")) { @@ -29,23 +29,28 @@ public class Join implements ICommand { sender.sendMessage(errorPrefix + "An internal error has occured"); return; } + if(playerList.containsKey(player.getName())){ + sender.sendMessage(errorPrefix + "You are already in the lobby"); + return; + } playerList.put(player.getName(), player); Hider.add(player.getName()); HiderTeam.addEntry(player.getName()); + playerLastLocationList.put(player.getName(), player.getLocation()); player.teleport(new Location(Bukkit.getWorld(spawnWorld), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ())); - Bukkit.broadcastMessage(messagePrefix + sender.getName() + " has joined the game lobby"); + if(lobbyAnnounced) Bukkit.broadcastMessage(messagePrefix + sender.getName() + " has joined the HideAndSeek lobby"); } public String getLabel() { - return null; + return "join"; } public String getUsage() { - return null; + return ""; } public String getDescription() { - return null; + return "Joins the lobby if game is set to manual join/leave"; } } |