Core/Creatures: Fixed sparring
Port From (https://github.com/TrinityCore/TrinityCore/commit/e1e53ee06e4b88d2f3804cfa53812e2e14d709a3)
This commit is contained in:
@@ -402,7 +402,7 @@ namespace Game.Entities
|
||||
InitializeMovementCapabilities();
|
||||
|
||||
LoadCreaturesAddon();
|
||||
LoadCreaturesSparringHealth();
|
||||
LoadCreaturesSparringHealth(true);
|
||||
LoadTemplateImmunities(cInfo.CreatureImmunitiesId);
|
||||
GetThreatManager().EvaluateSuppressed();
|
||||
|
||||
@@ -866,7 +866,7 @@ namespace Game.Entities
|
||||
}
|
||||
|
||||
LoadCreaturesAddon();
|
||||
LoadCreaturesSparringHealth();
|
||||
LoadCreaturesSparringHealth(true);
|
||||
|
||||
//! Need to be called after LoadCreaturesAddon - MOVEMENTFLAG_HOVER is set there
|
||||
posZ += GetHoverOffset();
|
||||
@@ -2562,10 +2562,10 @@ namespace Game.Entities
|
||||
return true;
|
||||
}
|
||||
|
||||
public void LoadCreaturesSparringHealth()
|
||||
public void LoadCreaturesSparringHealth(bool force = false)
|
||||
{
|
||||
var templateValues = Global.ObjectMgr.GetCreatureTemplateSparringValues(GetCreatureTemplate().Entry);
|
||||
if (!templateValues.Empty())
|
||||
if (force || !templateValues.Empty())
|
||||
{
|
||||
if (templateValues.Contains(_sparringHealthPct)) // only re-randomize sparring value if it was loaded from template (not when set to custom value from script)
|
||||
_sparringHealthPct = templateValues.SelectRandom();
|
||||
|
||||
Reference in New Issue
Block a user