sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Unit): properly reset displayIds when having a shapeshift au… (#14134)

Browse Source 
Co-authored-by: Ariel Silva <ariel-@users.noreply.github.com>
This commit is contained in:
Skjalf
2022-12-11 20:13:12 -03:00
committed by GitHub
parent fc90cb3f2e
commit 790f444ffa
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+11 -2
View File
@@ -16905,18 +16905,27 @@ void Unit::RestoreDisplayId()
// first forced transform auras, then shapeshifts, then normal transform // first forced transform auras, then shapeshifts, then normal transform
// transform aura was found // transform aura was found
if (handledAuraForced) if (handledAuraForced)
{
handledAuraForced->HandleEffect(this, AURA_EFFECT_HANDLE_SEND_FOR_CLIENT, true); handledAuraForced->HandleEffect(this, AURA_EFFECT_HANDLE_SEND_FOR_CLIENT, true);
return;
}
else if (!shapeshiftAura.empty()) // we've found shapeshift else if (!shapeshiftAura.empty()) // we've found shapeshift
{ {
// only one such aura possible at a time // only one such aura possible at a time
if (uint32 modelId = GetModelForForm(GetShapeshiftForm(), shapeshiftAura.front()->GetId())) if (uint32 modelId = GetModelForForm(GetShapeshiftForm(), shapeshiftAura.front()->GetId()))
{
SetDisplayId(modelId); SetDisplayId(modelId);
return;
}
} }
else if (handledAura) else if (handledAura)
{
handledAura->HandleEffect(this, AURA_EFFECT_HANDLE_SEND_FOR_CLIENT, true); handledAura->HandleEffect(this, AURA_EFFECT_HANDLE_SEND_FOR_CLIENT, true);
return;
}
// no auras found - set modelid to default // no auras found - set modelid to default
else SetDisplayId(GetNativeDisplayId());
SetDisplayId(GetNativeDisplayId());
} }
void Unit::AddComboPoints(Unit* target, int8 count) void Unit::AddComboPoints(Unit* target, int8 count)