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

1.5.0 Release Candidate 4

Browse source
This commit is contained in:
Tyler Murphy 2022-05-24 09:03:44 -04:00
parent 6b4bef24c0
commit 2169712940
3 changed files with 6 additions and 6 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)

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

@ -40,9 +40,9 @@ public class PAPIExpansion extends PlaceholderExpansion {
String[] args = params.split("_"); String[] args = params.split("_");
if (args.length < 1) return null; if (args.length < 1) return null;
if (args[0].equals("stats") && (args.length == 2 || args.length == 3)) { if (args[0].equals("stats") && (args.length == 2 || args.length == 3)) {
PlayerInfo info = null; PlayerInfo info;
if(args.length == 2) { if(args.length == 2) {
database.getGameData().getInfo(player.getUniqueId()); info = database.getGameData().getInfo(player.getUniqueId());
} else { } else {
UUID uuid; UUID uuid;
try { uuid = Main.getInstance().getDatabase().getNameData().getUUID(args[2]); } catch (Exception e) { return placeholderError; } try { uuid = Main.getInstance().getDatabase().getNameData().getUUID(args[2]); } catch (Exception e) { return placeholderError; }
@ -64,9 +64,9 @@ public class PAPIExpansion extends PlaceholderExpansion {
} }
} else if (args[0].equals("rank-place") && (args.length == 2 || args.length == 3)) { } else if (args[0].equals("rank-place") && (args.length == 2 || args.length == 3)) {
if (getRanking(args[1]) == null) { return placeholderError; } if (getRanking(args[1]) == null) { return placeholderError; }
PlayerInfo info = null; PlayerInfo info;
if(args.length == 2){ if(args.length == 2){
database.getGameData().getInfo(player.getUniqueId()); info = database.getGameData().getInfo(player.getUniqueId());
} else { } else {
UUID uuid; UUID uuid;
try { uuid = Main.getInstance().getDatabase().getNameData().getUUID(args[2]); } catch (Exception e) { return placeholderError; } try { uuid = Main.getInstance().getDatabase().getNameData().getUUID(args[2]); } catch (Exception e) { return placeholderError; }