diff options
| author | Nassim Jahnke <[email protected]> | 2023-12-06 22:59:39 +0100 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2023-12-06 23:01:51 +0100 |
| commit | 6bafacfb14a67bb6c10fe9dd5bcc76e6b74b47e0 (patch) | |
| tree | 7bfbaf2d10d897a771fb9cd17d6338ab5a197902 /patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch | |
| parent | b1f94a84e8cb73d0b814d8e63237dd81e79f1b4c (diff) | |
| download | Paper-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/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch')
| -rw-r--r-- | patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch index ce4fff308a..88a6fb43d4 100644 --- a/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch +++ b/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch @@ -25,10 +25,10 @@ index bd15131b7506e965bcf64be20330731256a1e1f0..0e3c89b9d75160d0e8947d042a1568da EntityType<?> entitytypes = entity.getType(); int i = entitytypes.clientTrackingRange() * 16; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index cfb28fbb860ac3d09589776d1b722cbb72d12de8..3ba431c4841a03018660f5137894b10298b417b9 100644 +index 321f90a0ad7cdd3b0e8b136682947a467f2388b9..86015c6b289ce6fb6b9d1b0ca3f637e53192eea3 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2502,7 +2502,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2500,7 +2500,7 @@ public class ServerLevel extends Level implements WorldGenLevel { public void onTrackingStart(Entity entity) { org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot @@ -37,9 +37,9 @@ index cfb28fbb860ac3d09589776d1b722cbb72d12de8..3ba431c4841a03018660f5137894b102 if (entity instanceof ServerPlayer) { ServerPlayer entityplayer = (ServerPlayer) entity; -@@ -2536,6 +2536,7 @@ public class ServerLevel extends Level implements WorldGenLevel { - +@@ -2535,6 +2535,7 @@ public class ServerLevel extends Level implements WorldGenLevel { entity.updateDynamicGameEventListener(DynamicGameEventListener::add); + entity.inWorld = true; // CraftBukkit - Mark entity as in world entity.valid = true; // CraftBukkit + ServerLevel.this.getChunkSource().addEntity(entity); // Paper start - Set origin location when the entity is being added to the world |