freya/kenshinshideandseek
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
bobby29831 2022-05-24 14:03:02 -05:00
commit e39749be11
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/net/tylermurphy/hideAndSeek/game/Board.java
View file

@ -239,7 +239,6 @@ public class Board {
board.updateTeams(); board.updateTeams();
} }
int timeLeft = Main.getInstance().getGame().getTimeLeft(); int timeLeft = Main.getInstance().getGame().getTimeLeft();
Status status = Main.getInstance().getGame().getStatus(); Status status = Main.getInstance().getGame().getStatus();
@ -279,7 +278,7 @@ public class Board {
board.setLine(String.valueOf(i), line.replace("{TAUNT}", TAUNT_ACTIVE)); board.setLine(String.valueOf(i), line.replace("{TAUNT}", TAUNT_ACTIVE));
} }
} else if (line.contains("{GLOW}")) { } else if (line.contains("{GLOW}")) {
if (!glowEnabled) return; if (!glowEnabled) continue;
if (glow == null || status == Status.STARTING || !glow.isRunning()) { if (glow == null || status == Status.STARTING || !glow.isRunning()) {
board.setLine(String.valueOf(i), line.replace("{GLOW}", GLOW_INACTIVE)); board.setLine(String.valueOf(i), line.replace("{GLOW}", GLOW_INACTIVE));
} else { } else {

1
src/main/java/net/tylermurphy/hideAndSeek/game/PlayerLoader.java
View file

@ -70,6 +70,7 @@ public class PlayerLoader {
} }
public static void resetPlayer(Player player, Board board){ public static void resetPlayer(Player player, Board board){
if(board.isSeeker(player)) return;
loadPlayer(player); loadPlayer(player);
if (board.isSeeker(player)) { if (board.isSeeker(player)) {
if (pvpEnabled) if (pvpEnabled)

4
src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java
View file

@ -47,11 +47,11 @@ public class PAPIExpansion extends PlaceholderExpansion {
if (info.isPresent()) { if (info.isPresent()) {
switch (args[0]) { switch (args[0]) {
case "stats": case "stats":
return getValue(info.get(), args[1]);
case "rank-place": case "rank-place":
return getValue(info.get(), args[1]);
if (getRanking(args[1]) == null) return placeholderError; 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()); Integer count = database.getGameData().getRanking(getRanking(args[1]), player.getUniqueId());
if (getValue(info.get(), args[1]).equals("0")) return "-";
if (count == null) return placeholderNoData; if (count == null) return placeholderNoData;
return count.toString(); return count.toString();
} }