Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-06-21 20:14:56 +02:00
Code Issues Projects Releases Wiki Activity

Null checks

Browse Source
This commit is contained in:
fullwall 2023-04-11 18:16:56 +08:00
parent f895169e92
commit 07d2c970d0
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java
View File

@ -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));
}
}

4
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java
View File

@ -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));
}
}

4
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java
View File

@ -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));
}
}

4
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java
View File

@ -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));
}
}

4
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java
View File

@ -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));
}