diff options
| author | bobby29831 <me@bobby29831.com> | 2022-05-24 14:03:02 -0500 |
|---|---|---|
| committer | bobby29831 <me@bobby29831.com> | 2022-05-24 14:03:02 -0500 |
| commit | e39749be1121dcc520b3d073251c1cd4bceaab64 (patch) | |
| tree | 620503299d86cab9c2b089a6063f7256f3820f95 /src/main/java/net/tylermurphy/hideAndSeek/game | |
| parent | clean up placeholder expansion (diff) | |
| parent | 1.5.0 Release Candidate 4 (diff) | |
| download | kenshinshideandseek-e39749be1121dcc520b3d073251c1cd4bceaab64.tar.gz kenshinshideandseek-e39749be1121dcc520b3d073251c1cd4bceaab64.tar.bz2 kenshinshideandseek-e39749be1121dcc520b3d073251c1cd4bceaab64.zip | |
Merge remote-tracking branch 'tylermurphy534/1.5.0' into 1.5.0
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/game')
| -rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/game/Board.java | 3 | ||||
| -rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/game/PlayerLoader.java | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java index bb1984e..c6aaaf5 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java @@ -239,7 +239,6 @@ public class Board { board.updateTeams(); } - int timeLeft = Main.getInstance().getGame().getTimeLeft(); Status status = Main.getInstance().getGame().getStatus(); @@ -279,7 +278,7 @@ public class Board { board.setLine(String.valueOf(i), line.replace("{TAUNT}", TAUNT_ACTIVE)); } } else if (line.contains("{GLOW}")) { - if (!glowEnabled) return; + if (!glowEnabled) continue; if (glow == null || status == Status.STARTING || !glow.isRunning()) { board.setLine(String.valueOf(i), line.replace("{GLOW}", GLOW_INACTIVE)); } else { diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/PlayerLoader.java b/src/main/java/net/tylermurphy/hideAndSeek/game/PlayerLoader.java index 19a48f4..211a425 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/game/PlayerLoader.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/game/PlayerLoader.java @@ -70,6 +70,7 @@ public class PlayerLoader { } public static void resetPlayer(Player player, Board board){ + if(board.isSeeker(player)) return; loadPlayer(player); if (board.isSeeker(player)) { if (pvpEnabled) |