mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-07 10:57:52 +02:00
07d0098a9e
Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
25 lines
1.0 KiB
Diff
25 lines
1.0 KiB
Diff
From a267b336205e376738ec0237266113100ab3a981 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.0.windows.1
|
|
|