SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Multiple Entries with Scoreboards

Browse Source
This commit is contained in:
Cryptite
2021-09-21 18:17:33 -05:00
parent 4ab8912b68
commit 0fd1e5c650
3 changed files with 92 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
View File

@@ -229,6 +229,21 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
scoreboard.board.addPlayerToTeam(entry, this.team);
}
// Paper start - Multiple Entries with Scoreboards
@Override
public void addEntities(java.util.Collection<org.bukkit.entity.Entity> 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<String> 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 - Multiple Entries with Scoreboards
@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 - Multiple Entries with Scoreboards
@Override
public boolean removeEntities(java.util.Collection<org.bukkit.entity.Entity> 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<String> 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 - Multiple Entries with Scoreboards
@Override
public boolean hasPlayer(OfflinePlayer player) throws IllegalArgumentException, IllegalStateException {
Preconditions.checkArgument(player != null, "OfflinePlayer cannot be null");