testserver/Spigot-Server-Patches/0084-Don-t-teleport-dead-en...

25 lines
1023 B
Diff
Raw Normal View History

2017-06-19 01:36:55 +00:00
From 2dfb489e7082a288341115f352fa8f1ceaac2390 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
2017-06-19 01:36:55 +00:00
index 8aba80c0..9bd55e6a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2017-05-14 18:05:01 +00:00
@@ -2344,7 +2344,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;
--
2017-06-19 01:36:55 +00:00
2.13.1.windows.2