From c34bcbc5159484a60d9f3f95956b569229024e2f Mon Sep 17 00:00:00 2001
From: Mink80 <46659983+Mink80@users.noreply.github.com>
Date: Thu, 1 Sep 2022 21:55:23 +0200
Subject: [PATCH] fix: Fix spawners missing parameters/properties (#1155)

---
 .../UOContent/Engines/Spawners/BaseSpawner.cs   | 17 +++++++++++++----
 .../UOContent/Engines/Spawners/SpawnerEntry.cs  | 10 +++++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Projects/UOContent/Engines/Spawners/BaseSpawner.cs b/Projects/UOContent/Engines/Spawners/BaseSpawner.cs
index e4faa6332..fcaf2f95e 100644
--- a/Projects/UOContent/Engines/Spawners/BaseSpawner.cs
+++ b/Projects/UOContent/Engines/Spawners/BaseSpawner.cs
@@ -98,7 +98,7 @@ public abstract class BaseSpawner : Item, ISpawner
 
         foreach (var entry in entries)
         {
-            AddEntry(entry.SpawnedName, entry.SpawnedProbability, entry.SpawnedMaxCount, false);
+            AddEntry(entry.SpawnedName, entry.SpawnedProbability, entry.SpawnedMaxCount, false, entry.Properties, entry.Parameters);
         }
     }
 
@@ -320,15 +320,24 @@ public abstract class BaseSpawner : Item, ISpawner
                     Entries[i].SpawnedName,
                     Entries[i].SpawnedProbability,
                     Entries[i].SpawnedMaxCount,
-                    false
+                    false,
+                    Entries[i].Properties,
+                    Entries[i].Parameters
                 );
             }
         }
     }
 
-    public SpawnerEntry AddEntry(string creaturename, int probability = 100, int amount = 1, bool dotimer = true)
+    public SpawnerEntry AddEntry(
+        string creaturename,
+        int probability = 100,
+        int amount = 1,
+        bool dotimer = true,
+        string properties = null,
+        string parameters = null
+    )
     {
-        var entry = new SpawnerEntry(creaturename, probability, amount);
+        var entry = new SpawnerEntry(creaturename, probability, amount, properties, parameters);
         Entries.Add(entry);
         if (dotimer)
         {
diff --git a/Projects/UOContent/Engines/Spawners/SpawnerEntry.cs b/Projects/UOContent/Engines/Spawners/SpawnerEntry.cs
index 8fa6113fd..fb681fd44 100644
--- a/Projects/UOContent/Engines/Spawners/SpawnerEntry.cs
+++ b/Projects/UOContent/Engines/Spawners/SpawnerEntry.cs
@@ -8,11 +8,19 @@ namespace Server.Engines.Spawners
     {
         public SpawnerEntry() => Spawned = new List<ISpawnable>();
 
-        public SpawnerEntry(string name, int probability, int maxcount) : this()
+        public SpawnerEntry(
+            string name,
+            int probability,
+            int maxcount,
+            string properties = null,
+            string parameters = null
+        ) : this()
         {
             SpawnedName = name;
             SpawnedProbability = probability;
             SpawnedMaxCount = maxcount;
+            Properties = properties;
+            Parameters = parameters;
         }
 
         public SpawnerEntry(BaseSpawner parent, IGenericReader reader)