diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/match/Match.java b/Plugin/src/main/java/dev/lrxh/neptune/game/match/Match.java index b61eb67d..a41e98af 100644 --- a/Plugin/src/main/java/dev/lrxh/neptune/game/match/Match.java +++ b/Plugin/src/main/java/dev/lrxh/neptune/game/match/Match.java @@ -62,6 +62,7 @@ public abstract class Match implements IMatch { private Kit kit; private List participants; private int rounds; + private int currentRound; private boolean duel; private boolean ended; diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/ffa/FfaFightMatch.java b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/ffa/FfaFightMatch.java index 5b5f9b40..67996a16 100644 --- a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/ffa/FfaFightMatch.java +++ b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/ffa/FfaFightMatch.java @@ -30,7 +30,7 @@ public class FfaFightMatch extends Match implements IFffaFightMatch { private Participant winner; public FfaFightMatch(VirtualArena arena, Kit kit, List participants) { - super(MatchState.STARTING, arena, kit, participants, 1, true, false); + super(MatchState.STARTING, arena, kit, participants, 1, 1, true, false); this.winner = null; this.deadParticipants = new ArrayList<>(); this.participants = participants; diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/solo/SoloFightMatch.java b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/solo/SoloFightMatch.java index 97b6923a..2be8ee8a 100644 --- a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/solo/SoloFightMatch.java +++ b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/solo/SoloFightMatch.java @@ -50,7 +50,7 @@ public class SoloFightMatch extends Match implements ISoloFightMatch { public SoloFightMatch(VirtualArena arena, Kit kit, boolean duel, List participants, Participant participantA, Participant participantB, int rounds) { - super(MatchState.STARTING, arena, kit, participants, rounds, duel, false); + super(MatchState.STARTING, arena, kit, participants, rounds, 1, duel, false); this.participantA = participantA; this.participantB = participantB; } diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/team/TeamFightMatch.java b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/team/TeamFightMatch.java index 793d8e2e..a1bb0504 100644 --- a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/team/TeamFightMatch.java +++ b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/team/TeamFightMatch.java @@ -38,7 +38,7 @@ public class TeamFightMatch extends Match implements ITeamFightMatch { public TeamFightMatch(VirtualArena arena, Kit kit, List participants, MatchTeam teamA, MatchTeam teamB) { - super(MatchState.STARTING, arena, kit, participants, 1, true, false); + super(MatchState.STARTING, arena, kit, participants, 1, 1, true, false); this.teamA = teamA; this.teamB = teamB; } diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchSecondRoundRunnable.java b/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchSecondRoundRunnable.java index f864bacb..8c384712 100644 --- a/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchSecondRoundRunnable.java +++ b/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchSecondRoundRunnable.java @@ -32,7 +32,6 @@ public MatchSecondRoundRunnable(Match match, Participant participant) { public void run() { if (!MatchService.get().matches.contains(match) || participant.isLeft()) { stop(); - return; } @@ -60,6 +59,7 @@ public void run() { } if (respawnTimer == 3) { + match.setCurrentRound(match.getCurrentRound() + 1); match.setupParticipants(); match.teleportToPositions(); diff --git a/Plugin/src/main/java/dev/lrxh/neptune/providers/placeholder/PlaceholderUtil.java b/Plugin/src/main/java/dev/lrxh/neptune/providers/placeholder/PlaceholderUtil.java index ce04f84e..c8e3d12c 100644 --- a/Plugin/src/main/java/dev/lrxh/neptune/providers/placeholder/PlaceholderUtil.java +++ b/Plugin/src/main/java/dev/lrxh/neptune/providers/placeholder/PlaceholderUtil.java @@ -112,6 +112,7 @@ public String format(String line, Player player) { line = line.replaceAll("", String.valueOf(match.getRounds())); // to be removed line = line.replaceAll("", String.valueOf(match.getRounds())); + line = line.replaceAll("", String.valueOf(match.getCurrentRound())); Division kitDivision = profile.getGameData().get(match.getKit()).getDivision(); line = line.replaceAll("", kitDivision == null ? "None" : kitDivision.getDisplayName());