d8e07590e3
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: 5dbedae1 PR-864: Fix Registry#match() failing namespaced inputs 49256865 PR-863: Fix boolean PersistentDataType 9f15450b SPIGOT-7195, SPIGOT-7197: Add DataPack API ebef5b6a Disable InterfaceIsType Checkstyle check 01d577f5 Slight tweak to boolean PersistentDataType javadoc d2b99e56 PR-857: Add boolean PersistentDataType CraftBukkit Changes: 2270366cd PR-1196: Test Registry instances more thoroughly 863dacb7a PR-1191: Do not start on pre-release Java 17 1f2dd8e12 SPIGOT-7362: Properly handle null in CraftBlock#blockFaceToNotch() dbc70bed5 SPIGOT-7195, SPIGOT-7197: Add DataPack API
62 lines
2.7 KiB
Diff
62 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Mariell Hoversholm <proximyst@proximyst.com>
|
|
Date: Sun, 24 Oct 2021 16:19:26 -0400
|
|
Subject: [PATCH] Add Raw Byte Entity Serialization
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
|
|
index 820c7e8f28d7276e4d4b31a81746720a1cc10f09..fed8f959f87f82a7f8fb8afe770f5cb73fcf27b2 100644
|
|
--- a/src/main/java/org/bukkit/UnsafeValues.java
|
|
+++ b/src/main/java/org/bukkit/UnsafeValues.java
|
|
@@ -131,6 +131,14 @@ public interface UnsafeValues {
|
|
|
|
ItemStack deserializeItem(byte[] data);
|
|
|
|
+ byte[] serializeEntity(org.bukkit.entity.Entity entity);
|
|
+
|
|
+ default org.bukkit.entity.Entity deserializeEntity(byte[] data, World world) {
|
|
+ return deserializeEntity(data, world, false);
|
|
+ }
|
|
+
|
|
+ org.bukkit.entity.Entity deserializeEntity(byte[] data, World world, boolean preserveUUID);
|
|
+
|
|
/**
|
|
* Creates and returns the next EntityId available.
|
|
* <p>
|
|
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
|
|
index a6f9fb065a9e3e56b86ce5f606f86e681a90d7e6..962989e74a66dadab2a8951ccc85ef0c49f8da6b 100644
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
|
@@ -834,5 +834,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
|
* @return players in tracking range
|
|
*/
|
|
@NotNull Set<Player> getTrackedPlayers();
|
|
+
|
|
+ /**
|
|
+ * Spawns the entity in the world at the given {@link Location} with the default spawn reason.
|
|
+ * <p>
|
|
+ * This will not spawn the entity if the entity is already spawned or has previously been despawned.
|
|
+ * <p>
|
|
+ * Also, this method will fire the same events as a normal entity spawn.
|
|
+ *
|
|
+ * @param location The location to spawn the entity at.
|
|
+ * @return Whether the entity was successfully spawned.
|
|
+ */
|
|
+ public default boolean spawnAt(@NotNull Location location) {
|
|
+ return spawnAt(location, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Spawns the entity in the world at the given {@link Location} with the reason given.
|
|
+ * <p>
|
|
+ * This will not spawn the entity if the entity is already spawned or has previously been despawned.
|
|
+ * <p>
|
|
+ * Also, this method will fire the same events as a normal entity spawn.
|
|
+ *
|
|
+ * @param location The location to spawn the entity at.
|
|
+ * @param reason The reason for the entity being spawned.
|
|
+ * @return Whether the entity was successfully spawned.
|
|
+ */
|
|
+ public boolean spawnAt(@NotNull Location location, @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason);
|
|
// Paper end
|
|
}
|