Added player quit messages during HidingCountdown

FadingFog · Oct 27, 2022 · 6438d9d · 6438d9d
1 parent 37e45fd
commit 6438d9d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/src/main/java/me/fadingfog/hideandseek/commands/LobbyExitCommand.java b/src/main/java/me/fadingfog/hideandseek/commands/LobbyExitCommand.java
@@ -32,14 +32,14 @@ public boolean onCommand(CommandSender sender, Command command, String s, String
                 if (lobby.removeMember(player)) {
                     resultMessage = I18n.tl("lobbyLeaved");
                     for (Player p : world.getPlayers()) {
-                        p.sendMessage(prefix + ChatColor.DARK_AQUA + I18n.tl("leftTheLobby", player.getDisplayName()));
+                        p.sendMessage(prefix + ChatColor.DARK_AQUA + I18n.tl("leftTheLobby", player.getName()));
                     }
 
                     TeleportUtil.teleportPlayerBack(player);
                 } else if (arena.removeGamePlayer(player)) {
                     resultMessage = I18n.tl("gameLeaved");
                     for (Player p : world.getPlayers()) {
-                        p.sendMessage(prefix + ChatColor.DARK_AQUA + I18n.tl("leftTheLobby", player.getDisplayName()));
+                        p.sendMessage(prefix + ChatColor.DARK_AQUA + I18n.tl("leftTheLobby", player.getName()));
                     }
 
                     TeleportUtil.teleportPlayerBack(player);

diff --git a/src/main/java/me/fadingfog/hideandseek/game/GamePlayer.java b/src/main/java/me/fadingfog/hideandseek/game/GamePlayer.java
@@ -6,17 +6,8 @@
 
 public class GamePlayer {
     public enum Role {
-//        HIDER(I18n.tl("hider"), ChatColor.DARK_GREEN + "[" + I18n.tl("hider") + "] " + ChatColor.WHITE),
-//        SEEKER(I18n.tl("seeker"), ChatColor.RED + "[" + I18n.tl("seeker") + "] " + ChatColor.WHITE);
-
-        HIDER(ChatColor.DARK_GREEN + I18n.tl("hider"),
-              ChatColor.DARK_GRAY + "[" +
-                    ChatColor.DARK_GREEN + I18n.tl("hider") +
-                    ChatColor.DARK_GRAY + "] " + ChatColor.WHITE),
-        SEEKER(ChatColor.RED + I18n.tl("seeker"),
-               ChatColor.DARK_GRAY + "[" +
-                     ChatColor.RED + I18n.tl("seeker") +
-                     ChatColor.DARK_GRAY + "] " + ChatColor.WHITE);
+        HIDER(ChatColor.DARK_GREEN + I18n.tl("hider"), ChatColor.DARK_GREEN + "[" + I18n.tl("hider") + "] " + ChatColor.WHITE),
+        SEEKER(ChatColor.RED + I18n.tl("seeker"), ChatColor.RED + "[" + I18n.tl("seeker") + "] " + ChatColor.WHITE);
 
         private final String name;
         private final String prefix;

diff --git a/src/main/java/me/fadingfog/hideandseek/listeners/PlayerQuitListener.java b/src/main/java/me/fadingfog/hideandseek/listeners/PlayerQuitListener.java
@@ -25,13 +25,13 @@ public void onUserQuit(PlayerQuitEvent ev) {
         if (world == lobby.getLocation().getWorld() || world == arena.getLocation().getWorld()) {
             if (lobby.removeMember(player)) {
                 for (Player p : world.getPlayers()) {
-                    p.sendMessage(prefix + ChatColor.DARK_AQUA + I18n.tl("leftTheLobby", player.getDisplayName()));
+                    p.sendMessage(prefix + ChatColor.DARK_AQUA + I18n.tl("leftTheLobby", player.getName()));
                 }
                 TeleportUtil.teleportPlayerBack(player);
             }
             if (arena.removeGamePlayer(player)) {
                 for (Player p : world.getPlayers()) {
-                    p.sendMessage(prefix + ChatColor.DARK_AQUA + I18n.tl("leftTheGame", player.getDisplayName()));
+                    p.sendMessage(prefix + ChatColor.DARK_AQUA + I18n.tl("leftTheGame", player.getName()));
                 }
                 TeleportUtil.teleportPlayerBack(player);
             }

diff --git a/src/main/java/me/fadingfog/hideandseek/tasks/HidingCountdown.java b/src/main/java/me/fadingfog/hideandseek/tasks/HidingCountdown.java
@@ -38,6 +38,17 @@ public void run() {
             cancel();
         }
 
+        if (arena.getHiders().size() == 0) {
+            arena.sendArenaMessage(I18n.tl("gameOverNoHiders"));
+            game.setGameState(Game.GameState.End);
+            cancel();
+        } else if (arena.getSeekers().size() == 0) {
+            arena.sendArenaMessage(I18n.tl("gameOverNoSeekers"));
+            game.setGameState(Game.GameState.End);
+            cancel();
+        }
+
+
         hnsExpansion.timer = timer;
         timer--;
     }

diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
@@ -47,7 +47,7 @@ timerSeekLeft={0} left in the game
 gameStoppedEarly=The game was stopped early
 gameOverTimeIsUp=Game over. Time''s up
 gameOverHidersFound=Game over. All hiders have been found
-gameOverNoSeekers=Game over. There are no seekers left
+gameOverNoSeekers=Game over. All seekers left the game
 topSeekers=Top seekers\:
 topHiders=Top hiders\:
 score=Score\: {0}
@@ -68,4 +68,5 @@ setupTimeToHide=New time to hide has been set
 setupTimeToStart=New time to start has been set
 durationErrorMessage=Duration should contains time format [H/M/S] (E.g. 5m or 20S or 3H20M)
 setupMinPlayers=New minimum number of players has been set
-setupSeekers=New number of seekers has been set
+setupSeekers=New number of seekers has been set
+gameOverNoHiders=Game over. All hiders left the game
diff --git a/src/main/resources/messages_ru.properties b/src/main/resources/messages_ru.properties
@@ -47,7 +47,7 @@ timerSeekLeft=До конца игры осталось {0}
 gameStoppedEarly=Игра была досрочно остановлена
 gameOverTimeIsUp=Игра окончена. Время вышло
 gameOverHidersFound=Игра окончена. Все жертвы пойманы
-gameOverNoSeekers=Игра окончена. Охотников не осталось
+gameOverNoSeekers=Игра окончена. Все охотники покинули игру
 topSeekers=Топ игроков по количеству пойманных жертв\:
 topHiders=Топ игроков по времени жизни\:
 score=Поймано\: {0}
@@ -68,4 +68,5 @@ setupTimeToHide=Установлено новое время для пряток
 setupTimeToStart=Установлено новое время до начала игры
 durationErrorMessage=Продолжительность должна соответствовать формату времени [H/M/S] (Например, 5m или 20S или 3H20M)
 setupMinPlayers=Установлено новое минимальное количество игроков
-setupSeekers=Установлено новое число охотников
+setupSeekers=Установлено новое число охотников
+gameOverNoHiders=Игра окончена. Все жертвы покинули игру