2fa8efce9b
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 82af5dc6 SPIGOT-7396: Add PlayerSignOpenEvent 3f0281ca SPIGOT-7063, PR-763: Add DragonBattle#initiateRespawn with custom EnderCrystals f83c8df4 PR-873: Add PlayerRecipeBookClickEvent 14560d39 SPIGOT-7435: Add TeleportCause#EXIT_BED 2cc6db92 SPIGOT-7422, PR-887: Add API to set sherds on decorated pots 36022f02 PR-883: Add ItemFactory#getSpawnEgg 12eb5c46 PR-881: Update Scoreboard Javadocs, remove explicit exception throwing f6d8d44a PR-882: Add modern time API methods to ban API 21a7b710 Upgrade some Maven plugins to reduce warnings 11fd1225 PR-886: Deprecate the SmithingRecipe constructor as it now does nothing dbd1761d SPIGOT-7406: Improve documentation for getDragonBattle CraftBukkit Changes: d548daac2 SPIGOT-7446: BlockState#update not updating a spawner's type to null 70e0bc050 SPIGOT-7447: Fix --forceUpgrade 6752f1d63 SPIGOT-7396: Add PlayerSignOpenEvent 847b4cad5 SPIGOT-7063, PR-1071: Add DragonBattle#initiateRespawn with custom EnderCrystals c335a555f PR-1212: Add PlayerRecipeBookClickEvent 4be756ecb SPIGOT-7445: Fix opening smithing inventory db70bd6ed SPIGOT-7441: Fix issue placing certain items in creative/op f7fa6d993 SPIGOT-7435: Add TeleportCause#EXIT_BED b435e8e8d SPIGOT-7349: Player#setDisplayName not working when message/format unmodified a2fafdd1d PR-1232: Re-add fix for player rotation 7cf863de1 PR-1233: Remove some old MC bug fixes now fixed in vanilla 08ec344ad Fix ChunkGenerator#generateCaves never being called 5daeb502a SPIGOT-7422, PR-1228: Add API to set sherds on decorated pots 52faa6b32 PR-1224: Add ItemFactory#getSpawnEgg 01cae71b7 SPIGOT-7429: Fix LEFT_CLICK_AIR not working for passable entities and spectators a94277a18 PR-1223: Remove non-existent scoreboard display name/prefix/suffix limits 36b107660 PR-1225: Add modern time API methods to ban API 59ead25bc Upgrade some Maven plugins to reduce warnings 202fc5c4e Increase outdated build delay ce545de57 SPIGOT-7398: TextDisplay#setInterpolationDuration incorrectly updates the line width Spigot Changes: b41c46db Rebuild patches 3374045a SPIGOT-7431: Fix EntityMountEvent returning opposite entities 0ca4eb66 Rebuild patches
129 Zeilen
5.5 KiB
Diff
129 Zeilen
5.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cryptite <cryptite@gmail.com>
|
|
Date: Tue, 21 Sep 2021 18:17:34 -0500
|
|
Subject: [PATCH] Multiple Entries with Scoreboards
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
|
|
index 4a963cb67151287ff6645dcd1c9edddd162dff1a..2cf3e30eaec539092dc5cd864ec429eebe9d2be6 100644
|
|
--- a/src/main/java/org/bukkit/scoreboard/Team.java
|
|
+++ b/src/main/java/org/bukkit/scoreboard/Team.java
|
|
@@ -309,6 +309,60 @@ public interface Team {
|
|
*/
|
|
void addEntry(@NotNull String entry);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * This puts a collection of entities onto this team for the scoreboard which results in one
|
|
+ * packet for the updates rather than a packet-per-entity.
|
|
+ * <p>
|
|
+ * Entities on other teams will be removed from their respective teams.
|
|
+ *
|
|
+ * @param entities the entities to add
|
|
+ * @throws IllegalArgumentException if entities are null
|
|
+ * @throws IllegalStateException if this team has been unregistered
|
|
+ */
|
|
+ default void addEntities(@NotNull org.bukkit.entity.Entity @NotNull ...entities) {
|
|
+ this.addEntities(java.util.List.of(entities));
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * This puts a collection of entities onto this team for the scoreboard which results in one
|
|
+ * packet for the updates rather than a packet-per-entity.
|
|
+ * <p>
|
|
+ * Entities on other teams will be removed from their respective teams.
|
|
+ *
|
|
+ * @param entities the entities to add
|
|
+ * @throws IllegalArgumentException if entities are null
|
|
+ * @throws IllegalStateException if this team has been unregistered
|
|
+ */
|
|
+ void addEntities(@NotNull java.util.Collection<org.bukkit.entity.Entity> entities) throws IllegalStateException, IllegalArgumentException;
|
|
+
|
|
+ /**
|
|
+ * This puts a collection of entries onto this team for the scoreboard which results in one
|
|
+ * packet for the updates rather than a packet-per-entry.
|
|
+ * <p>
|
|
+ * Entries on other teams will be removed from their respective teams.
|
|
+ *
|
|
+ * @param entries the entries to add
|
|
+ * @throws IllegalArgumentException if entries are null
|
|
+ * @throws IllegalStateException if this team has been unregistered
|
|
+ */
|
|
+ default void addEntries(@NotNull String... entries) throws IllegalStateException, IllegalArgumentException {
|
|
+ this.addEntries(java.util.List.of(entries));
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * This puts a collection of entries onto this team for the scoreboard which results in one
|
|
+ * packet for the updates rather than a packet-per-entry.
|
|
+ * <p>
|
|
+ * Entries on other teams will be removed from their respective teams.
|
|
+ *
|
|
+ * @param entries the entries to add
|
|
+ * @throws IllegalArgumentException if entries are null
|
|
+ * @throws IllegalStateException if this team has been unregistered
|
|
+ */
|
|
+ void addEntries(@NotNull java.util.Collection<String> entries) throws IllegalStateException, IllegalArgumentException;
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Removes the player from this team.
|
|
*
|
|
@@ -329,6 +383,56 @@ public interface Team {
|
|
*/
|
|
boolean removeEntry(@NotNull String entry);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Removes a collection of entities from this team which results in one
|
|
+ * packet for the updates rather than a packet-per-entity.
|
|
+ *
|
|
+ * @param entities the entries to remove
|
|
+ * @return if any of the entities were a part of this team
|
|
+ * @throws IllegalArgumentException if entities is null
|
|
+ * @throws IllegalStateException if this team has been unregistered
|
|
+ */
|
|
+ default boolean removeEntities(@NotNull org.bukkit.entity.Entity @NotNull ... entities) throws IllegalStateException, IllegalArgumentException {
|
|
+ return this.removeEntities(java.util.List.of(entities));
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Removes a collection of entities from this team which results in one
|
|
+ * packet for the updates rather than a packet-per-entity.
|
|
+ *
|
|
+ * @param entities the entries to remove
|
|
+ * @return if any of the entities were a part of this team
|
|
+ * @throws IllegalArgumentException if entities is null
|
|
+ * @throws IllegalStateException if this team has been unregistered
|
|
+ */
|
|
+ boolean removeEntities(@NotNull java.util.Collection<org.bukkit.entity.Entity> entities) throws IllegalStateException, IllegalArgumentException;
|
|
+
|
|
+ /**
|
|
+ * Removes a collection of entries from this team which results in one
|
|
+ * packet for the updates rather than a packet-per-entry.
|
|
+ *
|
|
+ * @param entries the entries to remove
|
|
+ * @return if any of the entries were a part of this team
|
|
+ * @throws IllegalArgumentException if entries is null
|
|
+ * @throws IllegalStateException if this team has been unregistered
|
|
+ */
|
|
+ default boolean removeEntries(@NotNull String... entries) throws IllegalStateException, IllegalArgumentException {
|
|
+ return this.removeEntries(java.util.List.of(entries));
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Removes a collection of entries from this team which results in one
|
|
+ * packet for the updates rather than a packet-per-entry.
|
|
+ *
|
|
+ * @param entries the entries to remove
|
|
+ * @return if any of the entries were a part of this team
|
|
+ * @throws IllegalArgumentException if entries is null
|
|
+ * @throws IllegalStateException if this team has been unregistered
|
|
+ */
|
|
+ boolean removeEntries(@NotNull java.util.Collection<String> entries) throws IllegalStateException, IllegalArgumentException;
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Unregisters this team from the Scoreboard
|
|
*
|