aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0033-Entity-Origin-API.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2023-12-06 22:59:39 +0100
committerNassim Jahnke <[email protected]>2023-12-06 23:01:51 +0100
commit6bafacfb14a67bb6c10fe9dd5bcc76e6b74b47e0 (patch)
tree7bfbaf2d10d897a771fb9cd17d6338ab5a197902 /patches/server/0033-Entity-Origin-API.patch
parentb1f94a84e8cb73d0b814d8e63237dd81e79f1b4c (diff)
downloadPaper-6bafacfb14a67bb6c10fe9dd5bcc76e6b74b47e0.tar.gz
Paper-6bafacfb14a67bb6c10fe9dd5bcc76e6b74b47e0.zip
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: 9a294519 SPIGOT-7533, 943: Add missing Poses for 1.20.3 be2884c4 Add unique ID to PlayerResourcePackStatusEvent d9c1eb83 Add additional @MinecraftExperimental annotations 68f5bb6a SPIGOT-7526: Add missing PlayerResourcePackStatusEvent statuses CraftBukkit Changes: 368c48be1 Fix formatting issue in previous commit da8f91f31 SPIGOT-7534: Error when chunk with decorated pot trying to save d20c9291a SPIGOT-7532: Entity#isValid() returns false after server restart ec1fa2ead PR-1309: Add tests for Bukkit Pose 5a7080b58 Add unique ID to PlayerResourcePackStatusEvent 0fd734950 SPIGOT-7528: Fix certain custom shaped recipes
Diffstat (limited to 'patches/server/0033-Entity-Origin-API.patch')
-rw-r--r--patches/server/0033-Entity-Origin-API.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0033-Entity-Origin-API.patch b/patches/server/0033-Entity-Origin-API.patch
index bb4294c590..ab8af63f25 100644
--- a/patches/server/0033-Entity-Origin-API.patch
+++ b/patches/server/0033-Entity-Origin-API.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 51f0705499003ea71274e1d5c8a77306fa868485..0c8042a515daeeb95b14147214e0a3151ef6f5a1 100644
+index 9969b66e39fb6ce8a9ba24ccbd7ef5d3e363197f..363f94a2fb54b7a55f392cc65a6e4d68f313fb07 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2390,6 +2390,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
-
+@@ -2389,6 +2389,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
+ entity.inWorld = true; // CraftBukkit - Mark entity as in world
entity.valid = true; // CraftBukkit
+ // Paper start - Set origin location when the entity is being added to the world
+ if (entity.getOriginVector() == null) {