2021-10-25 11:38:43 +02: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
|
2024-08-24 11:07:12 +02:00
|
|
|
index 0034e06a3caa89dfbb24a75d377d799ca0e8aed0..7966d45adcbc239a506ab4aa2923a6df0dc36c03 100644
|
2021-10-25 11:38:43 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
2024-05-26 21:51:15 +02:00
|
|
|
@@ -730,7 +730,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
2021-10-25 11:38:43 +02: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();
|
|
|
|
}
|
|
|
|
}
|