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

Core/Objects: Preserve phaseUseFlags, terrainSwapMap, ScriptName and StringId columns when saving creature and gameobject spawns in database

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/203ad17560057b3bf70a1632f3d715e429512701)
This commit is contained in:
Hondacrx
2025-12-08 10:05:57 -05:00
parent e353cf5497
commit 464609d5eb
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Creature.cs
+12 -2
View File
@@ -1500,8 +1500,10 @@ namespace Game.Entities
stmt.AddValue(index++, GetEntry());
stmt.AddValue(index++, mapid);
stmt.AddValue(index++, data.SpawnDifficulties.Empty() ? "" : string.Join(',', data.SpawnDifficulties));
stmt.AddValue(index++, (byte)data.PhaseUseFlags);
stmt.AddValue(index++, data.PhaseId);
stmt.AddValue(index++, data.PhaseGroup);
stmt.AddValue(index++, data.terrainSwapMap);
stmt.AddValue(index++, displayId);
stmt.AddValue(index++, GetCurrentEquipmentId());
stmt.AddValue(index++, GetPositionX());
@@ -1532,6 +1534,14 @@ namespace Game.Entities
stmt.AddValue(index++, unitFlags3.Value);
else
stmt.AddNull(index++);
stmt.AddValue(index++, Global.ObjectMgr.GetScriptName(data.ScriptId));
var stringId = GetStringId(StringIdType.Spawn);
if (!stringId.IsEmpty())
stmt.AddValue(index++, stringId);
else
stmt.AddNull(index++);
trans.Append(stmt);
DB.World.CommitTransaction(trans);
@@ -2877,9 +2887,9 @@ namespace Game.Entities
{
CreatureTemplate cInfo = GetCreatureTemplate();
CreatureDifficulty creatureDifficulty = GetCreatureDifficulty();
float baseHealth = Global.DB2Mgr.EvaluateExpectedStat(ExpectedStatType.CreatureHealth, level, creatureDifficulty.GetHealthScalingExpansion(), creatureDifficulty.ContentTuningID, (Class)cInfo.UnitClass, 0);
double baseHealth = Global.DB2Mgr.EvaluateExpectedStat(ExpectedStatType.CreatureHealth, level, creatureDifficulty.GetHealthScalingExpansion(), creatureDifficulty.ContentTuningID, (Class)cInfo.UnitClass, 0);
return (ulong)Math.Max(baseHealth * creatureDifficulty.HealthModifier, 1.0f);
return (ulong)Math.Max(baseHealth * creatureDifficulty.HealthModifier, 1.0);
}
public override float GetHealthMultiplierForTarget(WorldObject target)
Source/Game/Entities/GameObject/GameObject.cs
+9
View File
@@ -1085,8 +1085,10 @@ namespace Game.Entities
stmt.AddValue(index++, GetEntry());
stmt.AddValue(index++, mapid);
stmt.AddValue(index++, data.SpawnDifficulties.Empty() ? "" : string.Join(",", data.SpawnDifficulties));
stmt.AddValue(index++, (byte)data.PhaseUseFlags);
stmt.AddValue(index++, data.PhaseId);
stmt.AddValue(index++, data.PhaseGroup);
stmt.AddValue(index++, data.terrainSwapMap);
stmt.AddValue(index++, GetPositionX());
stmt.AddValue(index++, GetPositionY());
stmt.AddValue(index++, GetPositionZ());
@@ -1098,6 +1100,13 @@ namespace Game.Entities
stmt.AddValue(index++, m_respawnDelayTime);
stmt.AddValue(index++, GetGoAnimProgress());
stmt.AddValue(index++, (byte)GetGoState());
stmt.AddValue(index++, Global.ObjectMgr.GetScriptName(data.ScriptId));
var stringId = GetStringId(StringIdType.Spawn);
if (!stringId.IsEmpty())
stmt.AddValue(index++, stringId);
else
stmt.AddNull(index++);
DB.World.Execute(stmt);
}