Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Creatures: Implemented sending different creature id for summoner

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/ebf1b6eb5cbfd1dc8f1b0d26c29ae1423784cabb)
This commit is contained in:
hondacrx
2022-07-04 00:49:18 -04:00
parent 5e2cc3795c
commit bae8363ca3
5 changed files with 140 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Globals/ObjectManager.cs
+67
View File
@@ -1705,6 +1705,8 @@ namespace Game
// We load the creature models after loading but before checking
LoadCreatureTemplateModels();
LoadCreatureSummonedData();
// Checking needs to be done after loading because of the difficulty self referencing
foreach (var template in creatureTemplateStorage.Values)
CheckCreatureTemplate(template);
@@ -1940,6 +1942,66 @@ namespace Game
Log.outInfo(LogFilter.ServerLoading, $"Loaded {count} creature template models in {Time.GetMSTimeDiffToNow(oldMSTime)} ms");
}
void LoadCreatureSummonedData()
{
uint oldMSTime = Time.GetMSTime();
// 0 1 2 3
SQLResult result = DB.World.Query("SELECT CreatureID, CreatureIDVisibleToSummoner, GroundMountDisplayID, FlyingMountDisplayID FROM creature_summoned_data");
if (result.IsEmpty())
{
Log.outInfo(LogFilter.ServerLoading, "Loaded 0 creature summoned data definitions. DB table `creature_summoned_data` is empty.");
return;
}
do
{
uint creatureId = result.Read<uint>(0);
if (GetCreatureTemplate(creatureId) == null)
{
Log.outError(LogFilter.Sql, $"Table `creature_summoned_data` references non-existing creature {creatureId}, skipped");
continue;
}
if (!creatureSummonedDataStorage.ContainsKey(creatureId))
creatureSummonedDataStorage[creatureId] = new();
CreatureSummonedData summonedData = creatureSummonedDataStorage[creatureId];
if (!result.IsNull(1))
{
summonedData.CreatureIDVisibleToSummoner = result.Read<uint>(1);
if (GetCreatureTemplate(summonedData.CreatureIDVisibleToSummoner.Value) == null)
{
Log.outError(LogFilter.Sql, $"Table `creature_summoned_data` references non-existing creature {summonedData.CreatureIDVisibleToSummoner.Value} in CreatureIDVisibleToSummoner for creature {creatureId}, set to 0");
summonedData.CreatureIDVisibleToSummoner = null;
}
}
if (!result.IsNull(2))
{
summonedData.GroundMountDisplayID = result.Read<uint>(2);
if (!CliDB.CreatureDisplayInfoStorage.ContainsKey(summonedData.GroundMountDisplayID.Value))
{
Log.outError(LogFilter.Sql, $"Table `creature_summoned_data` references non-existing display id {summonedData.GroundMountDisplayID.Value} in GroundMountDisplayID for creature {creatureId}, set to 0");
summonedData.CreatureIDVisibleToSummoner = null;
}
}
if (!result.IsNull(3))
{
summonedData.FlyingMountDisplayID = result.Read<uint>(3);
if (!CliDB.CreatureDisplayInfoStorage.ContainsKey(summonedData.FlyingMountDisplayID.Value))
{
Log.outError(LogFilter.Sql, $"Table `creature_summoned_data` references non-existing display id {summonedData.FlyingMountDisplayID.Value} in FlyingMountDisplayID for creature {creatureId}, set to 0");
summonedData.GroundMountDisplayID = null;
}
}
} while (result.NextRow());
Log.outInfo(LogFilter.ServerLoading, $"Loaded {creatureSummonedDataStorage.Count} creature summoned data definitions in {Time.GetMSTimeDiffToNow(oldMSTime)} ms");
}
public void LoadCreatureTemplateAddons()
{
var time = Time.GetMSTime();
@@ -3894,6 +3956,10 @@ namespace Game
{
return creatureModelStorage.LookupByKey(modelId);
}
public CreatureSummonedData GetCreatureSummonedData(uint entryId)
{
return creatureSummonedDataStorage.LookupByKey(entryId);
}
public NpcText GetNpcText(uint textId)
{
return npcTextStorage.LookupByKey(textId);
@@ -10818,6 +10884,7 @@ namespace Game
//Creature
Dictionary<uint, CreatureTemplate> creatureTemplateStorage = new();
Dictionary<uint, CreatureModelInfo> creatureModelStorage = new();
Dictionary<uint, CreatureSummonedData> creatureSummonedDataStorage = new();
Dictionary<ulong, CreatureData> creatureDataStorage = new();
Dictionary<ulong, CreatureAddon> creatureAddonStorage = new();
MultiMap<uint, uint> creatureQuestItemStorage = new();