From 8c305261b3783a80a08c3449bcd386c853e1eaf8 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Sun, 29 Oct 2023 08:32:06 -0700
Subject: [PATCH] fix: Fixes enabling factions causing NPE (#1569)

---
 Projects/UOContent/Engines/Factions/Core/FactionSystem.cs | 1 +
 Projects/UOContent/Engines/Factions/Core/Generator.cs     | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Projects/UOContent/Engines/Factions/Core/FactionSystem.cs b/Projects/UOContent/Engines/Factions/Core/FactionSystem.cs
index 8bfb25353..04ea15734 100644
--- a/Projects/UOContent/Engines/Factions/Core/FactionSystem.cs
+++ b/Projects/UOContent/Engines/Factions/Core/FactionSystem.cs
@@ -42,6 +42,7 @@ public class FactionSystem : GenericPersistence
             return;
         }
 
+        _factionSystem ??= new FactionSystem();
         _factionSystem.Register();
         Enabled = true;
         ServerConfiguration.SetSetting("factions.enabled", true);
diff --git a/Projects/UOContent/Engines/Factions/Core/Generator.cs b/Projects/UOContent/Engines/Factions/Core/Generator.cs
index a94cc2d22..66e5efba2 100644
--- a/Projects/UOContent/Engines/Factions/Core/Generator.cs
+++ b/Projects/UOContent/Engines/Factions/Core/Generator.cs
@@ -11,6 +11,7 @@ namespace Server.Factions
 
         public static void GenerateFactions_OnCommand(CommandEventArgs e)
         {
+            var from = e.Mobile;
             FactionSystem.Enable();
 
             var factions = Faction.Factions;
@@ -18,6 +19,7 @@ namespace Server.Factions
             foreach (var faction in factions)
             {
                 Generate(faction);
+                from.SendMessage($"Generated {faction}");
             }
 
             var towns = Town.Towns;
@@ -25,7 +27,10 @@ namespace Server.Factions
             foreach (var town in towns)
             {
                 Generate(town);
+                from.SendMessage($"Generated {town}");
             }
+
+            from.SendMessage("Faction generation completed.");
         }
 
         public static void Generate(Town town)