Core/Creatures: Fixed some creatures having 0 max health (and being unkillable)
Port From (https://github.com/TrinityCore/TrinityCore/commit/7f98b71698eca5b136676991026de1d0d212f9fb)
This commit is contained in:
@@ -2738,7 +2738,7 @@ namespace Game.Entities
|
|||||||
CreatureLevelScaling scaling = cInfo.GetLevelScaling(GetMap().GetDifficultyID());
|
CreatureLevelScaling scaling = cInfo.GetLevelScaling(GetMap().GetDifficultyID());
|
||||||
float baseHealth = Global.DB2Mgr.EvaluateExpectedStat(ExpectedStatType.CreatureHealth, level, cInfo.GetHealthScalingExpansion(), scaling.ContentTuningID, (Class)cInfo.UnitClass);
|
float baseHealth = Global.DB2Mgr.EvaluateExpectedStat(ExpectedStatType.CreatureHealth, level, cInfo.GetHealthScalingExpansion(), scaling.ContentTuningID, (Class)cInfo.UnitClass);
|
||||||
|
|
||||||
return (ulong)(baseHealth * cInfo.ModHealth * cInfo.ModHealthExtra);
|
return (ulong)Math.Max(baseHealth * cInfo.ModHealth * cInfo.ModHealthExtra, 1.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override float GetHealthMultiplierForTarget(WorldObject target)
|
public override float GetHealthMultiplierForTarget(WorldObject target)
|
||||||
|
|||||||
@@ -586,7 +586,7 @@ namespace Game.Entities
|
|||||||
CreatureBaseStats stats = Global.ObjectMgr.GetCreatureBaseStats(petlevel, cinfo.UnitClass);
|
CreatureBaseStats stats = Global.ObjectMgr.GetCreatureBaseStats(petlevel, cinfo.UnitClass);
|
||||||
ApplyLevelScaling();
|
ApplyLevelScaling();
|
||||||
|
|
||||||
SetCreateHealth((uint)(Global.DB2Mgr.EvaluateExpectedStat(ExpectedStatType.CreatureHealth, petlevel, cinfo.GetHealthScalingExpansion(), m_unitData.ContentTuningID, (Class)cinfo.UnitClass) * cinfo.ModHealth * cinfo.ModHealthExtra * GetHealthMod(cinfo.Rank)));
|
SetCreateHealth((uint)Math.Max(Global.DB2Mgr.EvaluateExpectedStat(ExpectedStatType.CreatureHealth, petlevel, cinfo.GetHealthScalingExpansion(), m_unitData.ContentTuningID, (Class)cinfo.UnitClass) * cinfo.ModHealth * cinfo.ModHealthExtra * GetHealthMod(cinfo.Rank), 1.0f));
|
||||||
SetCreateMana(stats.BaseMana);
|
SetCreateMana(stats.BaseMana);
|
||||||
|
|
||||||
SetCreateStat(Stats.Strength, 22);
|
SetCreateStat(Stats.Strength, 22);
|
||||||
|
|||||||
Reference in New Issue
Block a user