Try even harder to get an origin world and avoid NPEs (Fixes #5931)

2021-06-22 11:54:49 +01:00
parent 4a7d7decce
commit 1599ffc11d
4 changed files with 11 additions and 4 deletions
--- a/patches/server/Entity-getEntitySpawnReason.patch
+++ b/patches/server/Entity-getEntitySpawnReason.patch
@@ -56,7 +56,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 
     public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-                 nbt.putUUID("Paper.OriginWorld", originWorld);
+                 }
                 nbt.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ()));
             }
 +            if (spawnReason != null) {