Prevent duplicate game end announcements and update RoundService initialization to include PlayerTeleporterService.
This commit is contained in:
parent
29c46ba485
commit
a3085ad4b4
|
|
@ -38,8 +38,8 @@ public final class Main extends JavaPlugin {
|
|||
round = Round.createSingletonInstance();
|
||||
lootService = new LootService();
|
||||
statService = new StatService(this, round);
|
||||
roundService = RoundService.createSingletonInstance(round, this, lootService, statService);
|
||||
playerTeleporterService = PlayerTeleporterService.createSingletonInstance();
|
||||
roundService = RoundService.createSingletonInstance(round, this, lootService, statService, playerTeleporterService);
|
||||
playerService = PlayerService.createSingletonInstance(round, roundService, playerTeleporterService);
|
||||
|
||||
bossBarService = BossBarService.createSingletonInstance(round, roundService);
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package com.alttd.hunger_games.services;
|
|||
import com.alttd.hunger_games.Main;
|
||||
import com.alttd.hunger_games.config.Messages;
|
||||
import com.alttd.hunger_games.data_objects.DESTINATION;
|
||||
import com.alttd.hunger_games.data_objects.GameStage;
|
||||
import com.alttd.hunger_games.data_objects.PLAYER_STATE;
|
||||
import com.alttd.hunger_games.data_objects.ROUND_STATE;
|
||||
import com.alttd.hunger_games.event_listeners.PlayerMovementListener;
|
||||
|
|
@ -127,6 +128,10 @@ public class RoundService implements RoundListener {
|
|||
});
|
||||
startFreeze();
|
||||
}
|
||||
if (roundState.equals(ROUND_STATE.ENDED)) {
|
||||
//Don't announce the game ended since we already declare a winner
|
||||
return;
|
||||
}
|
||||
Bukkit.broadcast(MiniMessage.miniMessage().deserialize(Messages.GAME.NEXT_STATE, Placeholder.parsed("round", roundState.getHumanReadableName())));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user