Updated Upstream (Bukkit/CraftBukkit)

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:
01bb6ba7 PR-936: Add new PersistentDataContainer methods and clean up docs
bc145b90 PR-940: Create registry for banner pattern and cat type

CraftBukkit Changes:
cb2ea54de SPIGOT-7440, PR-1292: Fire EntityTeleportEvent for end gateways
4fea66e44 PR-1299: Add new PersistentDataContainer methods and clean up docs
b483a20db PR-1303: Create registry for banner pattern and cat type
4642dd526 SPIGOT-7535: Fix maps not having an ID and also call MapInitializeEvent in more places
This commit is contained in:
Jake Potrebic
2023-12-08 11:00:39 -08:00
parent 7c36ea0a5c
commit 40d0f2da71
13 changed files with 56 additions and 138 deletions

View File

@@ -10,10 +10,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/persistence/PersistentDataContainer.java
+++ b/src/main/java/org/bukkit/persistence/PersistentDataContainer.java
@@ -0,0 +0,0 @@ public interface PersistentDataContainer {
* @throws NullPointerException if the key to look up is null
*/
boolean has(@NotNull NamespacedKey key);
@NotNull
PersistentDataAdapterContext getAdapterContext();
+
+ // Paper start - byte array serialization
+ /**
+ * Serialize this {@link PersistentDataContainer} instance to a
+ * byte array.
@@ -43,8 +44,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * @param bytes the byte array to read from
+ * @throws java.io.IOException if the byte array has an invalid format
+ */
+ default void readFromBytes(byte @NotNull [] bytes) throws java.io.IOException {
+ default void readFromBytes(final byte @NotNull [] bytes) throws java.io.IOException {
+ this.readFromBytes(bytes, true);
+ }
// Paper end
+ // Paper end - byte array serialization
}