From fc3f55ddc8c26de61e985a6bcf2f9483762658d2 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Fri, 25 Mar 2016 09:32:09 -0700
Subject: [PATCH] Always try to load entity origin location from new NBT tag

---
 Spigot-Server-Patches/Entity-Origin-API.patch | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/Entity-Origin-API.patch b/Spigot-Server-Patches/Entity-Origin-API.patch
index 8ca460bb1..964b2b102 100644
--- a/Spigot-Server-Patches/Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/Entity-Origin-API.patch
@@ -33,11 +33,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              // CraftBukkit end
  
 +            // Paper start - Restore the entity's origin location
-+            if (origin == null) {
-+                NBTTagList originTag = nbttagcompound.getList("Paper.Origin", 6);
-+                if (!originTag.isEmpty()) {
-+                    origin = new Location(world.getWorld(), originTag.e(0), originTag.e(1), originTag.e(2));
-+                }
++            NBTTagList originTag = nbttagcompound.getList("Paper.Origin", 6);
++            if (!originTag.isEmpty()) {
++                origin = new Location(world.getWorld(), originTag.e(0), originTag.e(1), originTag.e(2));
 +            }
 +            // Paper end
 +