From 58c3edcb08f8893070965cadd6dbff0585eb5381 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 21 Jun 2021 10:04:18 +0100
Subject: [PATCH] Try to prevent an NPE from origin data (Fixes #5905)

---
 patches/server/Entity-Origin-API.patch | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/patches/server/Entity-Origin-API.patch b/patches/server/Entity-Origin-API.patch
index 4a8317e2a4..b5e28c84a4 100644
--- a/patches/server/Entity-Origin-API.patch
+++ b/patches/server/Entity-Origin-API.patch
@@ -72,9 +72,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            // Paper start - Restore the entity's origin location
 +            ListTag originTag = nbt.getList("Paper.Origin", 6);
 +            if (!originTag.isEmpty()) {
-+                UUID originWorld = level.getWorld().getUID();
++                UUID originWorld = null;
 +                if (nbt.contains("Paper.OriginWorld")) {
 +                    originWorld = nbt.getUUID("Paper.OriginWorld");
++                } else if (this.level != null) {
++                    originWorld = this.level.getWorld().getUID();
 +                }
 +                this.originWorld = originWorld;
 +                origin = new org.bukkit.util.Vector(originTag.getDouble(0), originTag.getDouble(1), originTag.getDouble(2));