Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-17 20:10:10 +01:00
974b0afca9
CraftBukkit removed their implementation that caused this issue, switching to Mojang's implementation which doesn't appear to share it. I already removed the important bit in the last upstream merge, this is just unused and unnecessary now. So we remove it.
25 Zeilen
1.0 KiB
Diff
25 Zeilen
1.0 KiB
Diff
From 3a9555ca894972a6e5c4e7bb7bf5d1e616235334 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 42bd79b10..70a431a63 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -2317,7 +2317,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.12.2.windows.2
|
|
|