From 6547239fa62eae04dfffb7dbd61029e59e9d98cc Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Fri, 28 Jul 2023 00:39:10 -0700
Subject: [PATCH] fix: Fixes NPE in champ titles (#1434)

---
 Distribution/Data/categorization.json                      | 2 --
 .../UOContent/Engines/CannedEvil/ChampionTitleContext.cs   | 2 +-
 Projects/UOContent/Engines/ML Quests/MLQuestPersistence.cs | 4 +---
 .../Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs        | 7 ++++---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Distribution/Data/categorization.json b/Distribution/Data/categorization.json
index 4ddec6a0a..f94002717 100644
--- a/Distribution/Data/categorization.json
+++ b/Distribution/Data/categorization.json
@@ -1598,7 +1598,6 @@
       { "type": "ABauble" },
       { "type": "AbscessTail" },
       { "type": "AcidProofRope" },
-      { "type": "AcidSlime" },
       { "type": "AlbinoCourtesanFish" },
       { "type": "AlbinoFrog" },
       { "type": "AlchemistsBandage" },
@@ -2078,7 +2077,6 @@
       { "type": "PlayerBBSouth" },
       { "type": "PlayingCards" },
       { "type": "PlayingCards2" },
-      { "type": "PoolOfAcid" },
       { "type": "PortraitOfTheBride" },
       { "type": "PotionKeg" },
       { "type": "PottedCactusDeed" },
diff --git a/Projects/UOContent/Engines/CannedEvil/ChampionTitleContext.cs b/Projects/UOContent/Engines/CannedEvil/ChampionTitleContext.cs
index 27dd32213..bfd00c0bf 100644
--- a/Projects/UOContent/Engines/CannedEvil/ChampionTitleContext.cs
+++ b/Projects/UOContent/Engines/CannedEvil/ChampionTitleContext.cs
@@ -352,7 +352,7 @@ public partial class ChampionTitleContext
         for (var i = 0; i < ChampionSpawnInfo.Table.Length; i++)
         {
             ref var title = ref GetTitleValueRef(ChampionSpawnInfo.Table[i].Type);
-            if (Unsafe.IsNullRef(ref title))
+            if (Unsafe.IsNullRef(ref title) || title == null)
             {
                 continue;
             }
diff --git a/Projects/UOContent/Engines/ML Quests/MLQuestPersistence.cs b/Projects/UOContent/Engines/ML Quests/MLQuestPersistence.cs
index 57f792935..5d846d595 100644
--- a/Projects/UOContent/Engines/ML Quests/MLQuestPersistence.cs	
+++ b/Projects/UOContent/Engines/ML Quests/MLQuestPersistence.cs	
@@ -4,9 +4,7 @@ namespace Server.Engines.MLQuests
     {
         private static MLQuestPersistence m_Instance;
 
-        private MLQuestPersistence()
-            : base(1) =>
-            Movable = false;
+        private MLQuestPersistence() : base(1) => Movable = false;
 
         public MLQuestPersistence(Serial serial) : base(serial) => m_Instance = this;
 
diff --git a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs
index 14169921b..5ac69904d 100644
--- a/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs
+++ b/Projects/UOContent/Mobiles/Monsters/Humanoid/Magic/EvilMageLord.cs
@@ -13,9 +13,6 @@ namespace Server.Mobiles
             Body = Core.UOR ? Utility.Random(125, 2) : 0x190;
             Hue = Core.UOR ? 0 : Race.Human.RandomSkinHue();
 
-            EquipItem(new Robe(Utility.RandomMetalHue()));
-            EquipItem(new WizardsHat(Utility.RandomMetalHue()));
-
             SetStr(81, 105);
             SetDex(191, 215);
             SetInt(126, 150);
@@ -44,6 +41,10 @@ namespace Server.Mobiles
 
             VirtualArmor = 16;
             PackReg(23);
+
+            EquipItem(new Robe(Utility.RandomMetalHue()));
+            EquipItem(new WizardsHat(Utility.RandomMetalHue()));
+
             if (Utility.RandomBool())
             {
                 EquipItem(new Shoes());