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

Core/Auras: tidy up one little hack

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/9d16dce63365502b45561ce972178a780272b146)
This commit is contained in:
hondacrx
2019-09-03 15:44:48 -04:00
parent 43a94b4897
commit 028db75c67
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.cs
+25 -7
View File
@@ -1155,8 +1155,19 @@ namespace Game.Entities
}
}
public uint GetModelForForm(ShapeShiftForm form)
public uint GetModelForForm(ShapeShiftForm form, uint spellId)
{
// Hardcoded cases
switch (spellId)
{
case 7090: // Bear Form
return 29414;
case 35200: // Roc Form
return 4877;
default:
break;
}
Player thisPlayer = ToPlayer();
if (thisPlayer != null)
{
@@ -2134,17 +2145,24 @@ namespace Game.Entities
}
}
}
uint modelId;
var shapeshiftAura = GetAuraEffectsByType(AuraType.ModShapeshift);
// transform aura was found
if (handledAura != null)
handledAura.HandleEffect(this, AuraEffectHandleModes.SendForClient, true);
// we've found shapeshift
else if ((modelId = GetModelForForm(GetShapeshiftForm())) != 0)
else if (!shapeshiftAura.Empty()) // we've found shapeshift
{
if (!ignorePositiveAurasPreventingMounting || !IsDisallowedMountForm(0, GetShapeshiftForm(), modelId))
SetDisplayId(modelId);
else
SetDisplayId(GetNativeDisplayId());
// only one such aura possible at a time
uint modelId = GetModelForForm(GetShapeshiftForm(), shapeshiftAura[0].GetId());
if (modelId != 0)
{
if (!ignorePositiveAurasPreventingMounting || !IsDisallowedMountForm(0, GetShapeshiftForm(), modelId))
SetDisplayId(modelId);
else
SetDisplayId(GetNativeDisplayId());
}
}
// no auras found - set modelid to default
else