Merge branch 'patch' into dev

# Conflicts:
#	src/main/java/noppes/npcs/client/fx/CustomFX.java
This commit is contained in:
Luis C.M committed 2023-06-01 18:15:54 -05:00
commit b191ede19c
3 files changed
+13 -8

No files matched your search

@@ -439,7 +439,7 @@ public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IS
public void loadItemData() {
NBTTagCompound c = this.item.getTagCompound();
if (c != null){
if (c != null && !c.getCompoundTag("ItemData").hasNoTags()){
this.setItemNBT(c.getCompoundTag("ItemData"));
}
}