diff options
| author | Jake Potrebic <[email protected]> | 2023-10-22 12:12:00 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-10-22 20:12:00 +0100 |
| commit | 90fe0d58a5945c31f2c1b138799f64f2fe3475d8 (patch) | |
| tree | 57e2a8b12dbe8245ce5694dd15af35dc33c3c4c2 /patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch | |
| parent | 489bff9bbdc4215bd2cbc54d837463c608e7747e (diff) | |
| download | Paper-90fe0d58a5945c31f2c1b138799f64f2fe3475d8.tar.gz Paper-90fe0d58a5945c31f2c1b138799f64f2fe3475d8.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9825)
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:
897a0a23 SPIGOT-5753: Back PotionType by a minecraft registry
255b2aa1 SPIGOT-7080: Add World#locateNearestBiome
ff984826 Remove javadoc.io doc links
CraftBukkit Changes:
71b0135cc SPIGOT-5753: Back PotionType by a minecraft registry
a6bcb8489 SPIGOT-7080: Add World#locateNearestBiome
ad0e57434 SPIGOT-7502: CraftMetaItem - cannot deserialize BlockStateTag
b3efca57a SPIGOT-6400: Use Mockito instead of InvocationHandler
38c599f9d PR-1272: Only allow one entity in CraftItem instead of two
f065271ac SPIGOT-7498: ChunkSnapshot.getBlockEmittedLight() gets 64 blocks upper in Overworld
Spigot Changes:
e0e223fe Remove javadoc.io doc links
Diffstat (limited to 'patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch')
| -rw-r--r-- | patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch new file mode 100644 index 0000000000..24d15f8607 --- /dev/null +++ b/patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: sulu5890 <[email protected]> +Date: Sun, 24 Oct 2021 22:48:14 -0500 +Subject: [PATCH] don't attempt to teleport dead entities + + +diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java +index 51d4870a563ab978b46c07a8e51e2b6849992269..4b135772f8346103c2e6e1473af95f0bfa9754ef 100644 +--- a/src/main/java/net/minecraft/world/entity/Entity.java ++++ b/src/main/java/net/minecraft/world/entity/Entity.java +@@ -754,7 +754,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { + // CraftBukkit start + public void postTick() { + // No clean way to break out of ticking once the entity has been copied to a new world, so instead we move the portalling later in the tick cycle +- if (!(this instanceof ServerPlayer)) { ++ if (!(this instanceof ServerPlayer) && this.isAlive()) { // Paper - don't attempt to teleport dead entities + this.handleNetherPortal(); + } + } |