From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cryptite Date: Tue, 21 Sep 2021 18:17:33 -0500 Subject: [PATCH] Multiple Entries with Scoreboards diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java index e52644010dc2cf41bbf508b16b8ec2f0003e9d0b..b25f0e0a4ea12de2606d273e7c1ee534002c8d5a 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java @@ -42,6 +42,12 @@ public class ClientboundSetPlayerTeamPacket implements Packet players, ClientboundSetPlayerTeamPacket.Action operation) { + return new ClientboundSetPlayerTeamPacket(team.getName(), operation == ClientboundSetPlayerTeamPacket.Action.ADD ? 3 : 4, Optional.empty(), players); + } + // Paper end + public ClientboundSetPlayerTeamPacket(FriendlyByteBuf buf) { this.name = buf.readUtf(); this.method = buf.readByte(); diff --git a/src/main/java/net/minecraft/server/ServerScoreboard.java b/src/main/java/net/minecraft/server/ServerScoreboard.java index c4904b358fc2f493e6a9572a84b8110a927da208..5cc8173e845bf8d3414ac3347d25e1f6d0c65ce9 100644 --- a/src/main/java/net/minecraft/server/ServerScoreboard.java +++ b/src/main/java/net/minecraft/server/ServerScoreboard.java @@ -104,6 +104,25 @@ public class ServerScoreboard extends Scoreboard { } } + // Paper start + public boolean addPlayersToTeam(java.util.Collection players, PlayerTeam team) { + boolean anyAdded = false; + for (String playerName : players) { + if (super.addPlayerToTeam(playerName, team)) { + anyAdded = true; + } + } + + if (anyAdded) { + this.broadcastAll(ClientboundSetPlayerTeamPacket.createMultiplePlayerPacket(team, players, ClientboundSetPlayerTeamPacket.Action.ADD)); + this.setDirty(); + return true; + } else { + return false; + } + } + // Paper end + @Override public void removePlayerFromTeam(String scoreHolderName, PlayerTeam team) { super.removePlayerFromTeam(scoreHolderName, team); @@ -111,6 +130,17 @@ public class ServerScoreboard extends Scoreboard { this.setDirty(); } + // Paper start + public void removePlayersFromTeam(java.util.Collection players, PlayerTeam team) { + for (String playerName : players) { + super.removePlayerFromTeam(playerName, team); + } + + this.broadcastAll(ClientboundSetPlayerTeamPacket.createMultiplePlayerPacket(team, players, ClientboundSetPlayerTeamPacket.Action.REMOVE)); + this.setDirty(); + } + // Paper end + @Override public void onObjectiveAdded(Objective objective) { super.onObjectiveAdded(objective); diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java index 27219bf2f16aed64c78623d44c3cc84aa9f47065..fd86c1d43cccd036f60cb270b56fd33f95707720 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java @@ -229,6 +229,21 @@ final class CraftTeam extends CraftScoreboardComponent implements Team { scoreboard.board.addPlayerToTeam(entry, this.team); } + // Paper start + @Override + public void addEntities(java.util.Collection entities) throws IllegalStateException, IllegalArgumentException { + this.addEntries(entities.stream().map(entity -> ((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName()).toList()); + } + + @Override + public void addEntries(java.util.Collection entries) throws IllegalStateException, IllegalArgumentException { + Preconditions.checkArgument(entries != null, "Entries cannot be null"); + CraftScoreboard scoreboard = this.checkState(); + + ((net.minecraft.server.ServerScoreboard) scoreboard.board).addPlayersToTeam(entries, this.team); + } + // Paper end + @Override public boolean removePlayer(OfflinePlayer player) { Preconditions.checkArgument(player != null, "OfflinePlayer cannot be null"); @@ -248,6 +263,28 @@ final class CraftTeam extends CraftScoreboardComponent implements Team { return true; } + // Paper start + @Override + public boolean removeEntities(java.util.Collection entities) throws IllegalStateException, IllegalArgumentException { + return this.removeEntries(entities.stream().map(entity -> ((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName()).toList()); + } + + @Override + public boolean removeEntries(java.util.Collection entries) throws IllegalStateException, IllegalArgumentException { + Preconditions.checkArgument(entries != null, "Entry cannot be null"); + CraftScoreboard scoreboard = this.checkState(); + + for (String entry : entries) { + if (this.team.getPlayers().contains(entry)) { + ((net.minecraft.server.ServerScoreboard) scoreboard.board).removePlayersFromTeam(entries, this.team); + return true; + } + } + + return false; + } + // Paper end + @Override public boolean hasPlayer(OfflinePlayer player) throws IllegalArgumentException, IllegalStateException { Preconditions.checkArgument(player != null, "OfflinePlayer cannot be null");