mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
22 lines
1 KiB
Diff
22 lines
1 KiB
Diff
|
From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
@@ -0,0 +0,0 @@ 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;
|
||
|
|
--
|