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

Core: Combat/threat system rewrite

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/34c7810fe507eca1b8b9389630db5d5d26d92e77)
This commit is contained in:
hondacrx
2021-05-18 12:25:40 -04:00
parent 891c3b6478
commit 9851142796
37 changed files with 3454 additions and 3345 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/Spells/Generic.cs
+1 -1
View File
@@ -2179,7 +2179,7 @@ namespace Scripts.Spells.Generic
if (mana != 0)
{
mana /= 10;
caster.EnergizeBySpell(caster, GetId(), mana, PowerType.Mana);
caster.EnergizeBySpell(caster, GetSpellInfo(), mana, PowerType.Mana);
}
}
Source/Scripts/Spells/Hunter.cs
+3 -8
View File
@@ -33,6 +33,7 @@ namespace Scripts.Spells.Hunter
public const uint ExhilarationR2 = 231546;
public const uint Lonewolf = 155228;
public const uint MastersCallTriggered = 62305;
public const uint Misdirection = 34477;
public const uint MisdirectionProc = 35079;
public const uint PetLastStandTriggered = 53479;
public const uint PetHeartOfThePhoenixTriggered = 54114;
@@ -205,12 +206,7 @@ namespace Scripts.Spells.Hunter
return;
if (!GetTarget().HasAura(SpellIds.MisdirectionProc))
GetTarget().ResetRedirectThreat();
}
bool CheckProc(ProcEventInfo eventInfo)
{
return GetTarget().GetRedirectThreatTarget();
GetTarget().GetThreatManager().UnregisterRedirectThreat(SpellIds.Misdirection);
}
void HandleProc(AuraEffect aurEff, ProcEventInfo eventInfo)
@@ -222,7 +218,6 @@ namespace Scripts.Spells.Hunter
public override void Register()
{
AfterEffectRemove.Add(new EffectApplyHandler(OnRemove, 1, AuraType.Dummy, AuraEffectHandleModes.Real));
DoCheckProc.Add(new CheckProcHandler(CheckProc));
OnEffectProc.Add(new EffectProcHandler(HandleProc, 1, AuraType.Dummy));
}
}
@@ -233,7 +228,7 @@ namespace Scripts.Spells.Hunter
{
void OnRemove(AuraEffect aurEff, AuraEffectHandleModes mode)
{
GetTarget().ResetRedirectThreat();
GetTarget().GetThreatManager().UnregisterRedirectThreat(SpellIds.Misdirection);
}
public override void Register()