geforkt von Mirrors/Paper
26734e83b0
* Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 8085edde SPIGOT-6918: Add SpawnCategory API and configurations for Axolotls 04c7e13c PR-719: Add Player Profile API 71564210 SPIGOT-6910: Add BlockDamageAbortEvent CraftBukkit Changes: febaa1c6 SPIGOT-6918: Add SpawnCategory API and configurations for Axolotls 9dafd109 Don't send updates over large distances bdac46b0 SPIGOT-6782: EntityPortalEvent should not destroy entity when setTo() uses same world as getFrom() 8f361ece PR-1002: Add Player Profile API 911875d4 Increase outdated build delay e5f8a767 SPIGOT-6917: Use main scoreboard for /trigger a672a531 Clean up callBlockDamageEvent 8e1bdeef SPIGOT-6910: Add BlockDamageAbortEvent Spigot Changes: 6edb62f3 Rebuild patches 7fbc6a1e Rebuild patches * Updated Upstream (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 CraftBukkit Changes: de951355 SPIGOT-6927: Fix default value of spawn-limits in Worlds
63 Zeilen
2.8 KiB
Diff
63 Zeilen
2.8 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 7406c413f2988f2aadac95a85801df30deb6ae43..f59030893eba2bf653207b040a5f54fdf7b7b50f 100644
|
|
--- a/src/main/java/org/bukkit/UnsafeValues.java
|
|
+++ b/src/main/java/org/bukkit/UnsafeValues.java
|
|
@@ -109,6 +109,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);
|
|
+
|
|
/**
|
|
* Return the translation key for the Material, so the client can translate it into the active
|
|
* locale when using a {@link net.kyori.adventure.text.TranslatableComponent}.
|
|
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
|
|
index 898c005cb715235df8d7ed6a98faa8191af2fd91..9b46e42fcd803c2f0fb46b220ed79d69b1d16fc4 100644
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
|
@@ -775,5 +775,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
|
|
}
|