diff options
| author | Tyler Murphy <tylermurphy534@gmail.com> | 2022-05-17 19:26:00 -0400 |
|---|---|---|
| committer | Tyler Murphy <tylermurphy534@gmail.com> | 2022-05-17 19:26:00 -0400 |
| commit | 13e6b38aa97f59e5a432f2d88ea15738358df019 (patch) | |
| tree | d34388703f1256142eed9f45c9bf2588794f4af0 /src/main/java/net/tylermurphy/hideAndSeek/game/Game.java | |
| parent | working on expanding database (diff) | |
| download | kenshinshideandseek-13e6b38aa97f59e5a432f2d88ea15738358df019.tar.gz kenshinshideandseek-13e6b38aa97f59e5a432f2d88ea15738358df019.tar.bz2 kenshinshideandseek-13e6b38aa97f59e5a432f2d88ea15738358df019.zip | |
mysql support, always glow, countdown_last, kill stat change, game board null fix
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/game/Game.java')
| -rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/game/Game.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java index c261b52..cb3ad1f 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java @@ -242,12 +242,14 @@ public class Game { private void whileStarting() { if(gameTick % 20 == 0) { - if (startingTimer % 5 == 0 || startingTimer < 4) { + if (startingTimer % 5 == 0 || startingTimer < 5) { String message; if (startingTimer == 0) { message = message("START").toString(); status = Status.PLAYING; board.getPlayers().forEach(player -> PlayerLoader.resetPlayer(player, board)); + } else if (startingTimer == 1){ + message = message("START_COUNTDOWN_LAST").addAmount(startingTimer).toString(); } else { message = message("START_COUNTDOWN").addAmount(startingTimer).toString(); } @@ -305,7 +307,7 @@ public class Game { } if (worldBorderEnabled) worldBorder.update(); if (tauntEnabled) taunt.update(); - if (glowEnabled) glow.update(); + if (glowEnabled || alwaysGlow) glow.update(); } board.getSpectators().forEach(spectator -> spectator.setFlying(spectator.getAllowFlight())); checkWinConditions(); |