From a0d4a4f52214a30c1289bdb605ae2f274fcd6005 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Fri, 24 Jun 2022 21:50:46 -0400 Subject: [PATCH] Core/SpawnGroups: Renamed GetSpawnGroupsForInstance and its argument to not cause confusion with instance ids (equivalent to instance save id, not map id) Port From (https://github.com/TrinityCore/TrinityCore/commit/e2cf6d68fc5d6b3316f69873ee3ab917b2c9d4c0) --- Source/Game/Globals/ObjectManager.cs | 2 +- Source/Game/Maps/Instances/InstanceScript.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Game/Globals/ObjectManager.cs b/Source/Game/Globals/ObjectManager.cs index fa80bbcdd..5a8428815 100644 --- a/Source/Game/Globals/ObjectManager.cs +++ b/Source/Game/Globals/ObjectManager.cs @@ -5833,7 +5833,7 @@ namespace Game return null; } } - public List GetSpawnGroupsForInstance(uint instanceId) { return _instanceSpawnGroupStorage.LookupByKey(instanceId); } + public List GetInstanceSpawnGroupsForMap(uint mapId) { return _instanceSpawnGroupStorage.LookupByKey(mapId); } //Player public void LoadPlayerInfo() diff --git a/Source/Game/Maps/Instances/InstanceScript.cs b/Source/Game/Maps/Instances/InstanceScript.cs index ea8fde901..f1646e287 100644 --- a/Source/Game/Maps/Instances/InstanceScript.cs +++ b/Source/Game/Maps/Instances/InstanceScript.cs @@ -34,7 +34,7 @@ namespace Game.Maps public InstanceScript(InstanceMap map) { instance = map; - _instanceSpawnGroups = Global.ObjectMgr.GetSpawnGroupsForInstance(map.GetId()); + _instanceSpawnGroups = Global.ObjectMgr.GetInstanceSpawnGroupsForMap(map.GetId()); } public void SaveToDB()