2021-10-25 09:38:43 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: sulu5890 <sulu@sulu.me>
|
|
|
|
|
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
|
2021-11-25 08:54:06 +00:00
|
|
|
index cefb5a3fc5778870c8992c65c22e387d147ab5e9..7ab0e73fa156c83c940079c0955a3947f5b93562 100644
|
2021-10-25 09:38:43 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
2021-11-25 08:10:26 +00:00
|
|
|
@@ -673,7 +673,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
|
2021-10-25 09:38:43 +00:00
|
|
|
// 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();
|
|
|
|
|
}
|
|
|
|
|
}
|
