From d0ba94aa83f418ddeb5cf61424ad4a1ed47765e4 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Wed, 2 Nov 2022 19:26:51 -0700
Subject: [PATCH] fix: Fixes addons that do not give deeds (#1224)

---
 .../UOContent/Items/Addons/AddonComponent.cs  |  6 ++---
 .../Items/Addons/ArcaneCircleAddon.cs         | 22 +------------------
 Projects/UOContent/Items/Addons/BallotBox.cs  |  2 ++
 .../UOContent/Items/Addons/JackOLantern.cs    | 14 ------------
 .../UOContent/Items/Addons/PickpocketDips.cs  |  2 ++
 ...=> Server.Items.ArcaneCircleAddon.v0.json} |  4 ++--
 6 files changed, 10 insertions(+), 40 deletions(-)
 rename Projects/UOContent/Migrations/{Server.Items.ArcaneCircleAddon.v1.json => Server.Items.ArcaneCircleAddon.v0.json} (71%)

diff --git a/Projects/UOContent/Items/Addons/AddonComponent.cs b/Projects/UOContent/Items/Addons/AddonComponent.cs
index f07f3da2e..5ab1f1ac6 100644
--- a/Projects/UOContent/Items/Addons/AddonComponent.cs
+++ b/Projects/UOContent/Items/Addons/AddonComponent.cs
@@ -40,7 +40,7 @@ namespace Server.Items
     [SerializationGenerator(1, false)]
     public partial class AddonComponent : Item, IChoppable
     {
-        private static readonly LightEntry[] m_Entries =
+        private static LightEntry[] _entries =
         {
             new(
                 LightType.WestSmall,
@@ -196,9 +196,9 @@ namespace Server.Items
 
             var itemID = item.ItemID;
 
-            for (var i = 0; i < m_Entries.Length; ++i)
+            for (var i = 0; i < _entries.Length; ++i)
             {
-                var entry = m_Entries[i];
+                var entry = _entries[i];
                 var toMatch = entry.m_ItemIDs;
                 var contains = false;
 
diff --git a/Projects/UOContent/Items/Addons/ArcaneCircleAddon.cs b/Projects/UOContent/Items/Addons/ArcaneCircleAddon.cs
index 931b506ae..f28d38e8d 100644
--- a/Projects/UOContent/Items/Addons/ArcaneCircleAddon.cs
+++ b/Projects/UOContent/Items/Addons/ArcaneCircleAddon.cs
@@ -2,7 +2,7 @@ using ModernUO.Serialization;
 
 namespace Server.Items
 {
-    [SerializationGenerator(1)]
+    [SerializationGenerator(0)]
     public partial class ArcaneCircleAddon : BaseAddon
     {
         [Constructible]
@@ -20,26 +20,6 @@ namespace Server.Items
         }
 
         public override BaseAddonDeed Deed => new ArcaneCircleDeed();
-
-        private void Deserialize(IGenericReader reader, int version)
-        {
-            if (version == 0)
-            {
-                ValidationQueue<ArcaneCircleAddon>.Add(this);
-            }
-        }
-
-        public void Validate()
-        {
-            foreach (var c in Components)
-            {
-                if (c.ItemID == 0x3083)
-                {
-                    c.Offset = new Point3D(-1, -1, 0);
-                    c.MoveToWorld(new Point3D(X + c.Offset.X, Y + c.Offset.Y, Z + c.Offset.Z), Map);
-                }
-            }
-        }
     }
 
     [SerializationGenerator(0)]
diff --git a/Projects/UOContent/Items/Addons/BallotBox.cs b/Projects/UOContent/Items/Addons/BallotBox.cs
index cc9a6b99d..0e9f4cddd 100644
--- a/Projects/UOContent/Items/Addons/BallotBox.cs
+++ b/Projects/UOContent/Items/Addons/BallotBox.cs
@@ -320,6 +320,8 @@ namespace Server.Items
         {
             AddComponent(new BallotBox(), 0, 0, 0);
         }
+
+        public override BaseAddonDeed Deed => new BallotBoxDeed();
     }
 
     [SerializationGenerator(0)]
diff --git a/Projects/UOContent/Items/Addons/JackOLantern.cs b/Projects/UOContent/Items/Addons/JackOLantern.cs
index c2f13b753..5dd8c31b3 100644
--- a/Projects/UOContent/Items/Addons/JackOLantern.cs
+++ b/Projects/UOContent/Items/Addons/JackOLantern.cs
@@ -39,19 +39,5 @@ namespace Server.Items
                 Hue = hue,
                 Name = "jack-o-lantern"
             };
-
-        private void Deserialize(IGenericReader reader, int version)
-        {
-            for (var i = 0; i < Components.Count; ++i)
-            {
-                var ac = Components[i];
-                ac.Name = "jack-o-lantern";
-
-                if (ac.Hue == 2118)
-                {
-                    ac.Hue = 1161;
-                }
-            }
-        }
     }
 }
diff --git a/Projects/UOContent/Items/Addons/PickpocketDips.cs b/Projects/UOContent/Items/Addons/PickpocketDips.cs
index c990ff7d4..4a103a273 100644
--- a/Projects/UOContent/Items/Addons/PickpocketDips.cs
+++ b/Projects/UOContent/Items/Addons/PickpocketDips.cs
@@ -127,6 +127,8 @@ namespace Server.Items
         {
             AddComponent(new PickpocketDip(0x1EC3), 0, 0, 0);
         }
+
+        public override BaseAddonDeed Deed => new PickpocketDipEastDeed();
     }
 
     [SerializationGenerator(0, false)]
diff --git a/Projects/UOContent/Migrations/Server.Items.ArcaneCircleAddon.v1.json b/Projects/UOContent/Migrations/Server.Items.ArcaneCircleAddon.v0.json
similarity index 71%
rename from Projects/UOContent/Migrations/Server.Items.ArcaneCircleAddon.v1.json
rename to Projects/UOContent/Migrations/Server.Items.ArcaneCircleAddon.v0.json
index b645f5c8b..6fc1b3ddd 100644
--- a/Projects/UOContent/Migrations/Server.Items.ArcaneCircleAddon.v1.json
+++ b/Projects/UOContent/Migrations/Server.Items.ArcaneCircleAddon.v0.json
@@ -1,4 +1,4 @@
 {
-  "version": 1,
+  "version": 0,
   "type": "Server.Items.ArcaneCircleAddon"
-}
\ No newline at end of file
+}