2016-03-29 09:01:42 +08:00
|
|
|
From ddf153243e16bbaf898972af89ee86633247c4d5 Mon Sep 17 00:00:00 2001
|
2016-03-22 12:56:09 +08:00
|
|
|
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
|
2016-03-29 09:01:42 +08:00
|
|
|
index cf89b20..da8b434 100644
|
2016-03-22 12:56:09 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2016-03-26 00:32:09 +08:00
|
|
|
@@ -2109,7 +2109,7 @@ public abstract class Entity implements ICommandListener {
|
2016-03-22 12:56:09 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
--
|
2016-03-29 09:01:42 +08:00
|
|
|
2.7.4
|
2016-03-22 12:56:09 +08:00
|
|
|
|
