TakeV/Paper
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix a duplicate alive entity on second world

Browse source
This commit is contained in:
Shane Freeder 2017-03-16 22:31:53 -05:00
parent 7f3aa1ed29
commit 45ad47717e
1 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Spigot-Server-Patches/0213-Fix-a-duplicate-alive-entity-on-second-world.patch Normal file
View file

@ -0,0 +1,30 @@
From f2f4e3a3406b40e13a7dc05cc5dbaeda8038043a Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 17 Mar 2017 01:45:15 +0000
Subject: [PATCH] Fix a duplicate alive entity on second world
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0e1d9817..4cabdd7a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2359,6 +2359,7 @@ public abstract class Entity implements ICommandListener {
// CraftBukkit end */
// CraftBukkit start - Ensure chunks are loaded in case TravelAgent is not used which would initially cause chunks to load during find/create
// minecraftserver.getPlayerList().changeWorld(this, j, worldserver, worldserver1);
+ this.dead = true; // Paper - Mark entity as dead before we actually move it to the new world
worldserver1.getMinecraftServer().getPlayerList().repositionEntity(this, exit, portal);
// worldserver.entityJoinedWorld(this, false); // Handled in repositionEntity
// CraftBukkit end
@@ -2393,7 +2394,7 @@ public abstract class Entity implements ICommandListener {
// CraftBukkit end
}
- this.dead = true;
+ //this.dead = true; // Paper - Moved this up to ensure that the entity is dead when it's placed on the new world
this.world.methodProfiler.b();
worldserver.m();
worldserver1.m();
--
2.12.0.windows.1