diff options
author | Tyler Murphy <tylermurphy534@gmail.com> | 2022-05-19 17:14:01 -0400 |
---|---|---|
committer | Tyler Murphy <tylermurphy534@gmail.com> | 2022-05-19 17:14:01 -0400 |
commit | 6b4bef24c05747280c60f48063ce57b5f654ce04 (patch) | |
tree | a45539b153d85bf1a1ddfd8d84a577405093f2e2 /src/main/java/net/tylermurphy/hideAndSeek/game/Game.java | |
parent | 1.5.0 Release Canidate 2.1 (diff) | |
download | kenshinshideandseek-6b4bef24c05747280c60f48063ce57b5f654ce04.tar.gz kenshinshideandseek-6b4bef24c05747280c60f48063ce57b5f654ce04.tar.bz2 kenshinshideandseek-6b4bef24c05747280c60f48063ce57b5f654ce04.zip |
1.5.0 Release Canidate 3
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/game/Game.java')
-rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/game/Game.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java index 34f3a46..78c5e01 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java @@ -223,7 +223,7 @@ public class Game { private void whileWaiting() { if (!lobbyCountdownEnabled) return; if (lobbyMin <= board.size()) { - if (gameTimer == -1) + if (lobbyTimer < 0) lobbyTimer = countdown; if (board.size() >= changeCountdown) lobbyTimer = Math.min(lobbyTimer, 10); @@ -240,7 +240,6 @@ public class Game { } private void whileStarting() { - if(gameTick % 20 == 0) { if (startingTimer % 5 == 0 || startingTimer < 5) { String message; @@ -259,7 +258,7 @@ public class Game { } else if (countdownDisplay == CountdownDisplay.ACTIONBAR) { ActionBar.clearActionBar(player); ActionBar.sendActionBar(player, messagePrefix + message); - } else if (countdownDisplay == CountdownDisplay.TITLE) { + } else if (countdownDisplay == CountdownDisplay.TITLE && startingTimer != 30) { Titles.clearTitle(player); Titles.sendTitle(player, 10, 40, 10, " ", message); } |