From d076b77686c4ce44d9aa034b33fa6d818110cb01 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Wed, 20 Oct 2021 21:37:38 -0400 Subject: nametags fix --- src/main/java/net/tylermurphy/hideAndSeek/command/Join.java | 1 + src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java | 6 ++++++ src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java | 1 - src/main/java/net/tylermurphy/hideAndSeek/command/Start.java | 3 ++- src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) (limited to 'src/main/java/net/tylermurphy/hideAndSeek/command') diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java index e70411e..3ad24b8 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java @@ -35,6 +35,7 @@ public class Join implements ICommand { else Util.broadcastMessage(messagePrefix + sender.getName() + " has joined the HideAndSeek lobby"); player.teleport(new Location(Bukkit.getWorld(lobbyWorld), lobbyPosition.getX(),lobbyPosition.getY(),lobbyPosition.getZ())); player.setGameMode(GameMode.ADVENTURE); + Main.plugin.board.reloadLobbyBoards(); } else { Main.plugin.board.addSeeker(player); player.sendMessage(messagePrefix + "You have joined mid game and became a spectator"); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java index d79d019..908df5e 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java @@ -30,6 +30,12 @@ public class Leave implements ICommand { else Util.broadcastMessage(messagePrefix + sender.getName() + " has left the HideAndSeek lobby"); Main.plugin.board.remove(player); player.teleport(new Location(Bukkit.getWorld(exitWorld), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ())); + Main.plugin.board.removeBoard(player); + if(Main.plugin.status.equals("Standby")) { + Main.plugin.board.reloadLobbyBoards(); + } else { + Main.plugin.board.reloadGameBoards(); + } } public String getLabel() { diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java index e7ab942..55147d6 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java @@ -16,7 +16,6 @@ public class Reload implements ICommand { return; } Config.loadConfig(); - Main.plugin.board.reload(); sender.sendMessage(messagePrefix + "Reloaded the config"); } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java index 7d5242f..9d75401 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java @@ -63,7 +63,7 @@ public class Start implements ICommand { sender.sendMessage(errorPrefix + "Invalid player: " + seekerName); return; } - Main.plugin.board.init(); + Main.plugin.board.reload(); for(Player temp : Main.plugin.board.getPlayers()) { if(temp.getName().equals(seeker.getName())) continue; @@ -89,6 +89,7 @@ public class Start implements ICommand { player.sendTitle(ChatColor.GOLD + "" + ChatColor.BOLD + "HIDER", ChatColor.WHITE + "Hide away from the seekers", 10, 70, 20); } Worldborder.resetWorldborder("hideandseek_"+spawnWorld); + Main.plugin.board.reloadGameBoards(); Main.plugin.status = "Starting"; int temp = Main.plugin.gameId; Util.broadcastMessage(messagePrefix + "Hiders have 30 seconds to hide!"); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java index cacf7cd..416d673 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java @@ -57,6 +57,7 @@ public class Stop implements ICommand { } } Util.unloadMap("hideandseek_"+spawnWorld); + Main.plugin.board.reloadLobbyBoards(); } public String getUsage() { -- cgit v1.2.3-freya