25 lines
1010 B
Diff
25 lines
1010 B
Diff
|
From c1462e2b3643606950a1a9b417a83312fbd0aac7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Tue, 22 Mar 2016 00:55:23 -0400
|
||
|
|
Subject: [PATCH] Don't teleport dead entities
|
||
|
|
|
||
|
|
Had some issue with this in past, and this is the vanilla logic.
|
||
|
|
Potentially an old CB change that's no longer needed.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
index 0f66b39..e57195c 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
@@ -2096,7 +2096,7 @@ public abstract class Entity implements ICommandListener {
|
||
|
|
}
|
||
|
|
|
||
|
|
public Entity teleportTo(Location exit, boolean portal) {
|
||
|
|
- if (true) {
|
||
|
|
+ if (!this.dead) { // Paper
|
||
|
|
WorldServer worldserver = ((CraftWorld) getBukkitEntity().getLocation().getWorld()).getHandle();
|
||
|
|
WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
|
||
|
|
int i = worldserver1.dimension;
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|