diff options
author | Tyler Murphy <tylermurphy534@gmail.com> | 2022-05-11 22:27:50 -0400 |
---|---|---|
committer | Tyler Murphy <tylermurphy534@gmail.com> | 2022-05-11 22:27:50 -0400 |
commit | 7979185753a5f85f08dde7c5bb5c895233547a8e (patch) | |
tree | 82aec98da50d58e493377db45495236283b04365 /src/main/java | |
parent | remove unneeded checks when adding kills/deaths to database (diff) | |
download | kenshinshideandseek-7979185753a5f85f08dde7c5bb5c895233547a8e.tar.gz kenshinshideandseek-7979185753a5f85f08dde7c5bb5c895233547a8e.tar.bz2 kenshinshideandseek-7979185753a5f85f08dde7c5bb5c895233547a8e.zip |
make sure hider leaving doesnt create win condition
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/game/Game.java | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java index 55e78b5..9ebb471 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java @@ -342,6 +342,9 @@ public class Game { } if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + message("GAME_LEAVE").addPlayer(player)); else Game.broadcastMessage(messagePrefix + message("GAME_LEAVE").addPlayer(player)); + if(Board.isHider(player) && status != Status.ENDING && status != Status.STANDBY){ + checkWinConditions(true); + } Board.removeBoard(player); Board.remove(player); player.getInventory().clear(); @@ -394,7 +397,7 @@ public class Game { } private static void whileStarting(){ - checkWinConditions(); + checkWinConditions(false); } private static void whilePlaying() { @@ -436,14 +439,20 @@ public class Game { if(tauntEnabled) taunt.update(); if (glowEnabled) glow.update(); } - checkWinConditions(); + checkWinConditions(false); } - private static void checkWinConditions(){ + private static void checkWinConditions(boolean hiderLeave){ if(Board.sizeHider() < 1) { - if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_HIDERS_FOUND")); - else broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_HIDERS_FOUND")); - end(WinType.SEEKER_WIN); + if(hiderLeave){ + if (announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_HIDERS_QUIT")); + else broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_HIDERS_QUIT")); + end(WinType.NONE); + } else { + if (announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_HIDERS_FOUND")); + else broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_HIDERS_FOUND")); + end(WinType.SEEKER_WIN); + } } else if(Board.sizeSeeker() < 1) { if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(abortPrefix + message("GAME_GAMEOVER_SEEKERS_QUIT")); else broadcastMessage(abortPrefix + message("GAME_GAMEOVER_SEEKERS_QUIT")); |