From d5ed705f22411b0d908032a00e9ac672cdfc8db0 Mon Sep 17 00:00:00 2001
From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com>
Date: Mon, 21 Sep 2020 13:36:40 +0100
Subject: [PATCH] Defer loading of TileEntityImbuementAltar#lastUser until
 after the world is set

---
 .../wizardry/tileentity/TileEntityImbuementAltar.java      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/electroblob/wizardry/tileentity/TileEntityImbuementAltar.java b/src/main/java/electroblob/wizardry/tileentity/TileEntityImbuementAltar.java
index aefedb24..2bc96462 100644
--- a/src/main/java/electroblob/wizardry/tileentity/TileEntityImbuementAltar.java
+++ b/src/main/java/electroblob/wizardry/tileentity/TileEntityImbuementAltar.java
@@ -30,6 +30,7 @@ import org.apache.commons.lang3.ArrayUtils;
 import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 
 public class TileEntityImbuementAltar extends TileEntity implements ITickable {
 
@@ -39,6 +40,8 @@ public class TileEntityImbuementAltar extends TileEntity implements ITickable {
 	private int imbuementTimer;
 	private Element displayElement;
 	private EntityPlayer lastUser;
+	/** For loading purposes only. This does not get updated once loaded! */
+	private UUID lastUserUUID;
 
 	public TileEntityImbuementAltar(){
 		stack = ItemStack.EMPTY;
@@ -73,6 +76,8 @@ public class TileEntityImbuementAltar extends TileEntity implements ITickable {
 	@Override
 	public void update(){
 
+		if(lastUserUUID != null && lastUser == null) lastUser = world.getPlayerEntityByUUID(lastUserUUID);
+
 		if(imbuementTimer > 0){
 
 			if(imbuementTimer == 1){ // Has to be done here because of syncing
@@ -229,7 +234,7 @@ public class TileEntityImbuementAltar extends TileEntity implements ITickable {
 		NBTTagCompound itemTag = nbt.getCompoundTag("item");
 		this.stack = new ItemStack(itemTag);
 		this.imbuementTimer = nbt.getInteger("imbuementTimer");
-		this.lastUser = world.getPlayerEntityByUUID(nbt.getUniqueId("lastUser"));
+		this.lastUserUUID = nbt.getUniqueId("lastUser");
 	}
 
 	@Override