fix(arena): keep vigilante victory private
This commit is contained in:
@@ -416,6 +416,13 @@ public final class RoleArenaController implements Listener, Runnable {
|
||||
barrier.clear();
|
||||
Player winner = server.getPlayer(playerId);
|
||||
moveWinnerOutside(winner);
|
||||
if (role == ArenaRole.VIGILANTE) {
|
||||
if (winner != null) {
|
||||
winner.sendMessage(ChatColor.YELLOW
|
||||
+ "You defeated the arena boss and became the Vigilante!");
|
||||
}
|
||||
return;
|
||||
}
|
||||
String name = Optional.ofNullable(winner)
|
||||
.map(Player::getName).orElse(playerId.toString());
|
||||
String message = ChatColor.YELLOW + name + " defeated the arena boss and is the "
|
||||
|
||||
@@ -30,6 +30,7 @@ import org.junit.jupiter.api.Test;
|
||||
final class RoleArenaControllerTest {
|
||||
private static final UUID TYRANT = UUID.fromString("11111111-1111-1111-1111-111111111111");
|
||||
private static final UUID PLAYER = UUID.fromString("22222222-2222-2222-2222-222222222222");
|
||||
private static final UUID OTHER = UUID.fromString("33333333-3333-3333-3333-333333333333");
|
||||
|
||||
@Test
|
||||
void boundaryColorsIdentifyTheOpenRole() {
|
||||
@@ -133,13 +134,15 @@ final class RoleArenaControllerTest {
|
||||
when(player.getUniqueId()).thenReturn(PLAYER);
|
||||
when(player.getName()).thenReturn("Player");
|
||||
when(player.getLocation()).thenReturn(new Location(world, arena.x(), arena.y(), arena.z()));
|
||||
Player other = mock(Player.class);
|
||||
when(other.getUniqueId()).thenReturn(OTHER);
|
||||
PlayerState playerState = PlayerState.newPlayer(PLAYER, "Player");
|
||||
TyrantStateManager manager = mock(TyrantStateManager.class);
|
||||
when(manager.snapshot()).thenReturn(new PersistentState(game, Map.of(PLAYER, playerState)));
|
||||
Server server = mock(Server.class);
|
||||
when(server.getPlayer(PLAYER)).thenReturn(player);
|
||||
when(server.getWorld("world")).thenReturn(world);
|
||||
doReturn(Set.of(player)).when(server).getOnlinePlayers();
|
||||
doReturn(Set.of(player, other)).when(server).getOnlinePlayers();
|
||||
ArenaLocationStore locations = mock(ArenaLocationStore.class);
|
||||
when(locations.location()).thenReturn(Optional.of(arena));
|
||||
RoleArenaController controller = new RoleArenaController(
|
||||
@@ -153,6 +156,14 @@ final class RoleArenaControllerTest {
|
||||
!ArenaGeometry.contains(arena, 10.0, "world",
|
||||
destination.getX(), destination.getY(), destination.getZ())
|
||||
), eq(org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.PLUGIN));
|
||||
if (role == ArenaRole.VIGILANTE) {
|
||||
verify(player).sendMessage(contains(
|
||||
"You defeated the arena boss and became the Vigilante"
|
||||
));
|
||||
verify(other, never()).sendMessage(contains("Vigilante"));
|
||||
} else {
|
||||
verify(other).sendMessage(contains("Player defeated the arena boss"));
|
||||
}
|
||||
}
|
||||
|
||||
private static PlayerJoinEvent mockJoin(Player player) {
|
||||
|
||||
Reference in New Issue
Block a user