OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 16:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity
PaperMC/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch

25 lines
1,015 B
Diff
Raw Normal View History

Update bStats implementation
2017-04-22 08:16:45 +02:00
From 978d5af9bceeb871be2b1cbfffb45f9de62b5636 Mon Sep 17 00:00:00 2001
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.
2016-03-22 05:56:09 +01: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
Update upstream B/CB/S 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.
2017-03-25 04:18:58 +01:00
index 42bd79b10..70a431a63 100644
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.
2016-03-22 05:56:09 +01:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
Update upstream B/CB/S 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.
2017-03-25 04:18:58 +01:00
@@ -2317,7 +2317,7 @@ public abstract class Entity implements ICommandListener {
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.
2016-03-22 05:56:09 +01: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;
--
Update bStats implementation
2017-04-22 08:16:45 +02:00
2.12.2
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.
2016-03-22 05:56:09 +01:00
Reference in a new issue Copy permalink