From 07d2c970d08afb0a6d901a5a09fe842fd1c9a4a3 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Tue, 11 Apr 2023 18:16:56 +0800
Subject: [PATCH] Null checks

---
 .../net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java  | 4 ++--
 .../net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java  | 4 ++--
 .../net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java  | 4 ++--
 .../net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java  | 4 ++--
 .../net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java
index 9b022b68a..521be2e39 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java
@@ -419,11 +419,11 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             if (!(cache == null && equipment == null)
                     && (cache == null ^ equipment == null || !ItemStack.equals(cache, equipment))) {
                 itemChanged = true;
-                if (!cache.isEmpty()) {
+                if (cache != null && !cache.isEmpty()) {
                     this.getAttributeMap().a(cache.a(slot));
                 }
 
-                if (!equipment.isEmpty()) {
+                if (equipment != null && !equipment.isEmpty()) {
                     this.getAttributeMap().b(equipment.a(slot));
                 }
             }
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java
index 21a441e1f..3e9a96aa1 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java
@@ -445,11 +445,11 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             if (!(cache == null && equipment == null)
                     && (cache == null ^ equipment == null || !ItemStack.equals(cache, equipment))) {
                 itemChanged = true;
-                if (!cache.isEmpty()) {
+                if (cache != null && !cache.isEmpty()) {
                     this.getAttributeMap().a(cache.a(slot));
                 }
 
-                if (!equipment.isEmpty()) {
+                if (equipment != null && !equipment.isEmpty()) {
                     this.getAttributeMap().b(equipment.a(slot));
                 }
             }
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java
index 0f5653eba..2a928054a 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java
@@ -436,11 +436,11 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             if (!(cache == null && equipment == null)
                     && (cache == null ^ equipment == null || !ItemStack.equals(cache, equipment))) {
                 itemChanged = true;
-                if (!cache.isEmpty()) {
+                if (cache != null && !cache.isEmpty()) {
                     this.getAttributeMap().a(cache.a(slot));
                 }
 
-                if (!equipment.isEmpty()) {
+                if (equipment != null && !equipment.isEmpty()) {
                     this.getAttributeMap().b(equipment.a(slot));
                 }
             }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java
index 6ccdaf08a..934a1286d 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java
@@ -441,11 +441,11 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             if (!(cache == null && equipment == null)
                     && (cache == null ^ equipment == null || !ItemStack.equals(cache, equipment))) {
                 itemChanged = true;
-                if (!cache.isEmpty()) {
+                if (cache != null && !cache.isEmpty()) {
                     this.getAttributeMap().a(cache.a(slot));
                 }
 
-                if (!equipment.isEmpty()) {
+                if (equipment != null && !equipment.isEmpty()) {
                     this.getAttributeMap().b(equipment.a(slot));
                 }
             }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java
index 4077fb81e..278ce738e 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java
@@ -439,11 +439,11 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             ItemStack cache = equipmentCache.get(slot);
             if (!(cache == null && equipment == null)
                     && (cache == null ^ equipment == null || !ItemStack.equals(cache, equipment))) {
-                if (!cache.isEmpty()) {
+                if (cache != null && !cache.isEmpty()) {
                     this.getAttributeMap().a(cache.a(slot));
                 }
 
-                if (!equipment.isEmpty()) {
+                if (equipment != null && !equipment.isEmpty()) {
                     this.getAttributeMap().b(equipment.a(slot));
                 }