mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-01 12:42:05 -07:00
don't attempt to teleport dead entities (#6832)
This commit is contained in:
19
patches/server/don-t-attempt-to-teleport-dead-entities.patch
Normal file
19
patches/server/don-t-attempt-to-teleport-dead-entities.patch
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
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
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||||
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||||
|
@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
||||||
|
// 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();
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user