From 863b4b5460f55a7d8fb793d11267b5f77a96c40a Mon Sep 17 00:00:00 2001
From: Nathan Oines <75092691+Senion31@users.noreply.github.com>
Date: Mon, 13 Jan 2025 15:22:56 -0600
Subject: [PATCH] fix: Ensure ShouldSerializeCrafter serializes when _crafter
 is not null or empty (#2062)

---
 Projects/UOContent/Items/Armor/BaseArmor.cs       | 2 +-
 Projects/UOContent/Items/Clothing/BaseClothing.cs | 2 +-
 Projects/UOContent/Items/Quivers/BaseQuiver.cs    | 2 +-
 Projects/UOContent/Items/Weapons/BaseWeapon.cs    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Projects/UOContent/Items/Armor/BaseArmor.cs b/Projects/UOContent/Items/Armor/BaseArmor.cs
index 7c5e45446..069ed22a8 100644
--- a/Projects/UOContent/Items/Armor/BaseArmor.cs
+++ b/Projects/UOContent/Items/Armor/BaseArmor.cs
@@ -101,7 +101,7 @@ namespace Server.Items
         private string _crafter;
 
         [SerializableFieldSaveFlag(10)]
-        private bool ShouldSerializeCrafter() => _crafter != null;
+        private bool ShouldSerializeCrafter() => !string.IsNullOrEmpty(_crafter);
 
         [SerializableFieldSaveFlag(14)]
         private bool ShouldSerializeResource() => _resource != DefaultResource;
diff --git a/Projects/UOContent/Items/Clothing/BaseClothing.cs b/Projects/UOContent/Items/Clothing/BaseClothing.cs
index d975ab95f..499a6ecad 100644
--- a/Projects/UOContent/Items/Clothing/BaseClothing.cs
+++ b/Projects/UOContent/Items/Clothing/BaseClothing.cs
@@ -95,7 +95,7 @@ namespace Server.Items
         private string _crafter;
 
         [SerializableFieldSaveFlag(8)]
-        private bool ShouldSerializeCrafter() => _crafter != null;
+        private bool ShouldSerializeCrafter() => !string.IsNullOrEmpty(_crafter);
 
         [InvalidateProperties]
         [SerializableField(9)]
diff --git a/Projects/UOContent/Items/Quivers/BaseQuiver.cs b/Projects/UOContent/Items/Quivers/BaseQuiver.cs
index cd29b6079..dfdc6c5f8 100644
--- a/Projects/UOContent/Items/Quivers/BaseQuiver.cs
+++ b/Projects/UOContent/Items/Quivers/BaseQuiver.cs
@@ -50,7 +50,7 @@ public partial class BaseQuiver : Container, ICraftable, IAosItem
     private string _crafter;
 
     [SerializableFieldSaveFlag(4)]
-    private bool ShouldSerializeCrafter() => _crafter != null;
+    private bool ShouldSerializeCrafter() => !string.IsNullOrEmpty(_crafter);
 
     [InvalidateProperties]
     [SerializableField(5)]
diff --git a/Projects/UOContent/Items/Weapons/BaseWeapon.cs b/Projects/UOContent/Items/Weapons/BaseWeapon.cs
index ccec00c08..bf718aacf 100644
--- a/Projects/UOContent/Items/Weapons/BaseWeapon.cs
+++ b/Projects/UOContent/Items/Weapons/BaseWeapon.cs
@@ -104,7 +104,7 @@ public abstract partial class BaseWeapon : Item, IWeapon, IFactionItem, ICraftab
 
     [SerializableFieldSaveFlag(9)]
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private bool ShouldSerializeCrafter() => string.IsNullOrEmpty(_crafter);
+    private bool ShouldSerializeCrafter() => !string.IsNullOrEmpty(_crafter);
 
     [InvalidateProperties]
     [SerializableField(10)]