From 32792e7d6fbe6a492443cb7c2ca325a13dbfc1c2 Mon Sep 17 00:00:00 2001
From: luisc <lc0508383@gmail.com>
Date: Mon, 3 Jan 2022 21:30:38 -0600
Subject: [PATCH] Added updateClient() function to ScriptNpc.

---
 .../java/noppes/npcs/entity/EntityNPCInterface.java | 13 +++++++++----
 src/main/java/noppes/npcs/scripted/ScriptBlock.java |  2 +-
 .../java/noppes/npcs/scripted/entity/ScriptNpc.java |  2 ++
 .../noppes/npcs/scripted/interfaces/ICustomNpc.java |  2 ++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
index 0165c51ce..e027c7ff2 100644
--- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
+++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
@@ -313,10 +313,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 	    			LinkedNpcController.Instance.loadNpcData(this);
 	    		}
 				if(updateClient){
-	    			NBTTagCompound compound = writeSpawnData();
-	    			compound.setInteger("EntityId", getEntityId());
-	    			Server.sendAssociatedData(this, EnumPacketClient.UPDATE_NPC, compound);
-	    			updateClient = false;
+	    			this.updateClient();
 	    		}
 	    		if(updateAI){
 	    			updateTasks();
@@ -365,6 +362,14 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 				((JobBard)jobInterface).onLivingUpdate();
         }
     }
+
+	public void updateClient() {
+		NBTTagCompound compound = writeSpawnData();
+		compound.setInteger("EntityId", getEntityId());
+		Server.sendAssociatedData(this, EnumPacketClient.UPDATE_NPC, compound);
+		updateClient = false;
+	}
+
     
 	@Override
 	public boolean interact(EntityPlayer player) {
diff --git a/src/main/java/noppes/npcs/scripted/ScriptBlock.java b/src/main/java/noppes/npcs/scripted/ScriptBlock.java
index 40fae198d..9cf52a980 100644
--- a/src/main/java/noppes/npcs/scripted/ScriptBlock.java
+++ b/src/main/java/noppes/npcs/scripted/ScriptBlock.java
@@ -77,7 +77,7 @@ public class ScriptBlock implements IBlock {
     }
 
     public boolean isContainer() {
-        return this.tile != null && this.tile instanceof IInventory?((IInventory)this.tile).getSizeInventory() > 0:false;
+        return this.tile != null && this.tile instanceof IInventory && ((IInventory) this.tile).getSizeInventory() > 0;
     }
 
     public IContainer getContainer() {
diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
index aaac4248d..204562ff0 100644
--- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
+++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
@@ -1087,4 +1087,6 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 	public String getOverlayTexture() {
 		return npc.display.glowTexture;
 	}
+
+	public void updateClient() { this.npc.updateClient(); };
 }
diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ICustomNpc.java b/src/main/java/noppes/npcs/scripted/interfaces/ICustomNpc.java
index ed2d3ff0f..9618104fa 100644
--- a/src/main/java/noppes/npcs/scripted/interfaces/ICustomNpc.java
+++ b/src/main/java/noppes/npcs/scripted/interfaces/ICustomNpc.java
@@ -728,4 +728,6 @@ public interface ICustomNpc<T extends EntityCreature> extends IEntityLiving<T> {
     public void setOverlayTexture(String overlayTexture);
 
     public String getOverlayTexture();
+
+    public void updateClient();
 }