Start adding missing scripts Part3

Source/Game/AI/ScriptedAI/ScriptedAI.cs

@@ -585,9 +585,8 @@ namespace Game.AI
         void ForceCombatStopForCreatureEntry(uint entry, float maxSearchRange = 250.0f, bool reset = true)
         {
             Log.outDebug(LogFilter.ScriptsAi, $"BossAI::ForceStopCombatForCreature: called on {me.GetGUID()}. Debug info: {me.GetDebugInfo()}");
-            List<Creature> creatures = new();
-            me.GetCreatureListWithEntryInGrid(creatures, entry, maxSearchRange);
 
+            List<Creature> creatures = me.GetCreatureListWithEntryInGrid(entry, maxSearchRange);
             foreach (Creature creature in creatures)
             {
                 creature.CombatStop(true);

Source/Game/AI/SmartScripts/SmartScript.cs

@@ -3553,8 +3553,7 @@ namespace Game.AI
                     }
                     else if (e.Event.distance.entry != 0)
                     {
-                        List<Creature> list = new();
-                        _me.GetCreatureListWithEntryInGrid(list, e.Event.distance.entry, e.Event.distance.dist);
+                        List<Creature> list = _me.GetCreatureListWithEntryInGrid(e.Event.distance.entry, e.Event.distance.dist);
 
                         if (!list.Empty())
                             creature = list.FirstOrDefault();
@@ -3584,8 +3583,7 @@ namespace Game.AI
                     }
                     else if (e.Event.distance.entry != 0)
                     {
-                        List<GameObject> list = new();
-                        _me.GetGameObjectListWithEntryInGrid(list, e.Event.distance.entry, e.Event.distance.dist);
+                        List<GameObject> list = _me.GetGameObjectListWithEntryInGrid(e.Event.distance.entry, e.Event.distance.dist);
 
                         if (!list.Empty())
                             gameobject = list.FirstOrDefault();

Source/Game/Entities/Object/WorldObject.cs

@@ -2784,20 +2784,24 @@ namespace Game.Entities
             return spellInfo.GetSpellXSpellVisualId(this);
         }
 
-        public void GetGameObjectListWithEntryInGrid(List<GameObject> gameobjectList, uint entry = 0, float maxSearchRange = 250.0f)
+        public List<GameObject> GetGameObjectListWithEntryInGrid(uint entry = 0, float maxSearchRange = 250.0f)
         {
+            List<GameObject> gameobjectList = new();
             var check = new AllGameObjectsWithEntryInRange(this, entry, maxSearchRange);
             var searcher = new GameObjectListSearcher(this, gameobjectList, check);
 
             Cell.VisitGridObjects(this, searcher, maxSearchRange);
+            return gameobjectList;
         }
 
-        public void GetCreatureListWithEntryInGrid(List<Creature> creatureList, uint entry = 0, float maxSearchRange = 250.0f)
+        public List<Creature> GetCreatureListWithEntryInGrid(uint entry = 0, float maxSearchRange = 250.0f)
         {
+            List<Creature> creatureList = new();
             var check = new AllCreaturesOfEntryInRange(this, entry, maxSearchRange);
             var searcher = new CreatureListSearcher(this, creatureList, check);
 
             Cell.VisitGridObjects(this, searcher, maxSearchRange);
+            return creatureList;
         }
 
         public List<Unit> GetPlayerListInGrid(float maxSearchRange, bool alive = true)

Source/Game/Maps/Instances/InstanceScript.cs

@@ -447,11 +447,11 @@ namespace Game.Maps
         {
             if (string.IsNullOrEmpty(data))
             {
-                OUT_LOAD_INST_DATA_FAIL();
+                OutLoadInstDataFail();
                 return;
             }
 
-            OUT_LOAD_INST_DATA(data);
+            OutLoadInstData(data);
 
             var loadStream = new StringArguments(data);
 
@@ -461,9 +461,9 @@ namespace Game.Maps
                 ReadSaveDataMore(loadStream);
             }
             else
-                OUT_LOAD_INST_DATA_FAIL();
+                OutLoadInstDataFail();
 
-            OUT_LOAD_INST_DATA_COMPLETE();
+            OutLoadInstDataComplete();
         }
 
         bool ReadSaveDataHeaders(StringArguments data)
@@ -495,7 +495,7 @@ namespace Game.Maps
 
         public virtual string GetSaveData()
         {
-            OUT_SAVE_INST_DATA();
+            OutSaveInstData();
 
             StringBuilder saveStream = new();
 
@@ -503,7 +503,7 @@ namespace Game.Maps
             WriteSaveDataBossStates(saveStream);
             WriteSaveDataMore(saveStream);
 
-            OUT_SAVE_INST_DATA_COMPLETE();
+            OutSaveInstDataComplete();
 
             return saveStream.ToString();
         }
@@ -928,11 +928,11 @@ namespace Game.Maps
                 bosses.Add(i, new BossInfo());
         }
 
-        public void OUT_SAVE_INST_DATA() { Log.outDebug(LogFilter.Scripts, "Saving Instance Data for Instance {0} (Map {1}, Instance Id {2})", instance.GetMapName(), instance.GetId(), instance.GetInstanceId()); }
-        public void OUT_SAVE_INST_DATA_COMPLETE() { Log.outDebug(LogFilter.Scripts, "Saving Instance Data for Instance {0} (Map {1}, Instance Id {2}) completed.", instance.GetMapName(), instance.GetId(), instance.GetInstanceId()); }
-        public void OUT_LOAD_INST_DATA(string input) { Log.outDebug(LogFilter.Scripts, "Loading Instance Data for Instance {0} (Map {1}, Instance Id {2}). Input is '{3}'", instance.GetMapName(), instance.GetId(), instance.GetInstanceId(), input); }
-        public void OUT_LOAD_INST_DATA_COMPLETE() { Log.outDebug(LogFilter.Scripts, "Instance Data Load for Instance {0} (Map {1}, Instance Id: {2}) is complete.", instance.GetMapName(), instance.GetId(), instance.GetInstanceId()); }
-        public void OUT_LOAD_INST_DATA_FAIL() { Log.outDebug(LogFilter.Scripts, "Unable to load Instance Data for Instance {0} (Map {1}, Instance Id: {2}).", instance.GetMapName(), instance.GetId(), instance.GetInstanceId()); }
+        public void OutSaveInstData() { Log.outDebug(LogFilter.Scripts, "Saving Instance Data for Instance {0} (Map {1}, Instance Id {2})", instance.GetMapName(), instance.GetId(), instance.GetInstanceId()); }
+        public void OutSaveInstDataComplete() { Log.outDebug(LogFilter.Scripts, "Saving Instance Data for Instance {0} (Map {1}, Instance Id {2}) completed.", instance.GetMapName(), instance.GetId(), instance.GetInstanceId()); }
+        public void OutLoadInstData(string input) { Log.outDebug(LogFilter.Scripts, "Loading Instance Data for Instance {0} (Map {1}, Instance Id {2}). Input is '{3}'", instance.GetMapName(), instance.GetId(), instance.GetInstanceId(), input); }
+        public void OutLoadInstDataComplete() { Log.outDebug(LogFilter.Scripts, "Instance Data Load for Instance {0} (Map {1}, Instance Id: {2}) is complete.", instance.GetMapName(), instance.GetId(), instance.GetInstanceId()); }
+        public void OutLoadInstDataFail() { Log.outDebug(LogFilter.Scripts, "Unable to load Instance Data for Instance {0} (Map {1}, Instance Id: {2}).", instance.GetMapName(), instance.GetId(), instance.GetInstanceId()); }
 
         public virtual void ReadSaveDataMore(StringArguments data) { }
 

Source/Game/Spells/Auras/AuraEffect.cs

@@ -5725,8 +5725,7 @@ namespace Game.Spells
                 // most of the spells have multiple effects with the same summon spell id for multiple spawns, so right now it's safe to assume there's only 1 spawn per effect
                 foreach (uint summonEntry in summonedEntries)
                 {
-                    List<Creature> nearbyEntries = new();
-                    target.GetCreatureListWithEntryInGrid(nearbyEntries, summonEntry);
+                    List<Creature> nearbyEntries = target.GetCreatureListWithEntryInGrid(summonEntry);
                     foreach (var creature in nearbyEntries)
                     {
                         if (creature.GetOwner() == target)