From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Thu, 4 Nov 2021 12:31:24 -0700 Subject: [PATCH] Improve scoreboard entries diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java index be3e1c4765ba891462e36ce5b6e35f16e3ec189a..d00e9ca05c36c2d1194024914bf935db0113d7fa 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java @@ -145,6 +145,14 @@ final class CraftObjective extends CraftScoreboardComponent implements Objective return new CraftScore(this, entry); } + // Paper start + @Override + public Score getScoreFor(org.bukkit.entity.Entity entity) throws IllegalArgumentException, IllegalStateException { + Preconditions.checkArgument(entity != null, "Entity cannot be null"); + return getScore(((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName()); + } + // Paper end + @Override public void unregister() { CraftScoreboard scoreboard = this.checkState(); diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java index 052389310826ee6b97cf27dfd952e0101fb2d097..a8c5bfc54ed2b8bd873f124c7080d73fe73a86ad 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java @@ -233,4 +233,23 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard { public Scoreboard getHandle() { return this.board; } + // Paper start + @Override + public ImmutableSet getScoresFor(org.bukkit.entity.Entity entity) throws IllegalArgumentException { + Preconditions.checkArgument(entity != null, "Entity cannot be null"); + return this.getScores(((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName()); + } + + @Override + public void resetScoresFor(org.bukkit.entity.Entity entity) throws IllegalArgumentException { + Preconditions.checkArgument(entity != null, "Entity cannot be null"); + this.resetScores(((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName()); + } + + @Override + public Team getEntityTeam(org.bukkit.entity.Entity entity) throws IllegalArgumentException { + Preconditions.checkArgument(entity != null, "Entity cannot be null"); + return this.getEntryTeam(((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName()); + } + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java index baff11728120fda1740d5e15163760f50fe1cd1d..4d65d1a0dd52aaeeeef8acf2b0023f27257f60a2 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java @@ -304,6 +304,26 @@ final class CraftTeam extends CraftScoreboardComponent implements Team { } } + // Paper start + @Override + public void addEntity(org.bukkit.entity.Entity entity) throws IllegalStateException, IllegalArgumentException { + Preconditions.checkArgument(entity != null, "Entity cannot be null"); + this.addEntry(((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName()); + } + + @Override + public boolean removeEntity(org.bukkit.entity.Entity entity) throws IllegalStateException, IllegalArgumentException { + Preconditions.checkArgument(entity != null, "Entity cannot be null"); + return this.removeEntry(((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName()); + } + + @Override + public boolean hasEntity(org.bukkit.entity.Entity entity) throws IllegalStateException, IllegalArgumentException { + Preconditions.checkArgument(entity != null, "Entity cannot be null"); + return this.hasEntry(((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName()); + } + // Paper end + public static Visibility bukkitToNotch(NameTagVisibility visibility) { switch (visibility) { case ALWAYS: