Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 11:00:06 +01:00
b62dfa0bf9
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes:1cf8b5dcSPIGOT-4400: Populators running on existing chunks116cb9a1SPIGOT-4399: Add attribute modifier equality test5ee1c18aSPIGOT-4398: Set ASM7_EXPERIMENTAL flag
25 Zeilen
1.0 KiB
Diff
25 Zeilen
1.0 KiB
Diff
From 6af064d807377a45c74cb75e73e28d775d252e27 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 e31c97fb72..7275c4d21a 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -2562,7 +2562,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
|
}
|
|
|
|
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();
|
|
DimensionManager dimensionmanager = worldserver1.dimension;
|
|
--
|
|
2.19.0
|
|
|