Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-29 23:17:59 +02:00
Code Issues Projects Releases Wiki Activity

Make Team implement ForwardingAudience

Browse Source
This commit is contained in:
Kieran Wallbanks 2021-03-01 17:37:51 +00:00
parent f9ab109eb0
commit d4873e5e02
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/net/minestom/server/scoreboard/Team.java
View File

@ -1,5 +1,8 @@
package net.minestom.server.scoreboard;
import com.google.common.collect.MapMaker;
import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.audience.ForwardingAudience;
import net.minestom.server.MinecraftServer;
import net.minestom.server.chat.ChatColor;
import net.minestom.server.chat.ColoredText;
@ -11,16 +14,19 @@ import net.minestom.server.network.packet.server.play.TeamsPacket;
import net.minestom.server.network.packet.server.play.TeamsPacket.CollisionRule;
import net.minestom.server.network.packet.server.play.TeamsPacket.NameTagVisibility;
import net.minestom.server.utils.PacketUtils;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.jetbrains.annotations.NotNull;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CopyOnWriteArraySet;
/**
* This object represents a team on a scoreboard that has a common display theme and other properties.
*/
public class Team {
public class Team implements ForwardingAudience {
private static final ConnectionManager CONNECTION_MANAGER = MinecraftServer.getConnectionManager();
@ -65,6 +71,9 @@ public class Team {
*/
private JsonMessage suffix;
private final Set<Player> playerMembers = Collections.newSetFromMap(new MapMaker().weakKeys().makeMap());
private boolean isPlayerMembersUpToDate;
/**
* Default constructor to creates a team.
*
@ -104,6 +113,9 @@ public class Team {
// Sends to all online players the add player packet
PacketUtils.sendGroupedPacket(CONNECTION_MANAGER.getOnlinePlayers(), addPlayerPacket);
// invalidate player members
this.isPlayerMembersUpToDate = false;
}
/**
@ -123,6 +135,9 @@ public class Team {
// Removes the member from the team
this.members.remove(member);
// invalidate player members
this.isPlayerMembersUpToDate = false;
}
/**
@ -412,4 +427,23 @@ public class Team {
PacketUtils.sendGroupedPacket(MinecraftServer.getConnectionManager().getOnlinePlayers(), updatePacket);
}
@Override
public @NonNull Iterable<? extends Audience> audiences() {
if (!this.isPlayerMembersUpToDate) {
this.playerMembers.clear();
for (String member : this.members) {
Player player = MinecraftServer.getConnectionManager().getPlayer(member);
if (player != null) {
this.playerMembers.add(player);
}
}
this.isPlayerMembersUpToDate = true;
}
return this.playerMembers;
}
}