diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 88298680f..62ac6b5ea 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
     public boolean fromMobSpawner;
     public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
     protected int numCollisions = 0; // Paper
+    public boolean joinedWorld; // Akarin
     public void inactiveTick() { }
     // Spigot end
 
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index d134d0fae..5b1a357b0 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1210,7 +1210,7 @@ public abstract class EntityLiving extends Entity {
     }
 
     public void die(DamageSource damagesource) {
-        if (!this.killed) {
+        if (!this.killed && !this.joinedWorld) { // Akarin
             Entity entity = damagesource.getEntity();
             EntityLiving entityliving = this.cv();
 
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9fc226b84..1132bcc8a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1550,6 +1550,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
             return;
         }
         // CraftBukkit end
+        entity.joinedWorld = true; // Akarin
 
         entity.N = entity.locX;
         entity.O = entity.locY;
@@ -1622,6 +1623,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
                 }
             }
         }
+        entity.joinedWorld = false; // Akarin
     }
 
     // Paper start - Based on method below
diff --git a/work/Paper b/work/Paper
index ffd51cbe2..825d17c32 160000
--- a/work/Paper
+++ b/work/Paper
@@ -1 +1 @@
-Subproject commit ffd51cbe2d1853c98a69597c2411bb8714dded88
+Subproject commit 825d17c326f83fd229e6846b05b94aa75af4359f