Merge remote-tracking branch 'tylermurphy534/1.5.0' into 1.5.0

3 files changed, 4 insertions, 4 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)
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java b/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java
index bc92ef9..92fed1e 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java
@@ -47,11 +47,11 @@ public class PAPIExpansion extends PlaceholderExpansion  {
             if (info.isPresent()) {
                 switch (args[0]) {
                     case "stats":
-                        return getValue(info.get(), args[1]);
                     case "rank-place":
+                        return getValue(info.get(), args[1]);
                         if (getRanking(args[1]) == null) return placeholderError;
-                        if (getValue(info.get(), args[1]).equals("0")) return "-";
                         Integer count = database.getGameData().getRanking(getRanking(args[1]), player.getUniqueId());
+                        if (getValue(info.get(), args[1]).equals("0")) return "-";
                         if (count == null) return placeholderNoData;
                         return count.toString();
                 }