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

Core/Custom: Fixed SPELLMOD_COOLDOWN exploit on Duel Reset system

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/251c1811aeb8636fb9dd422b3ee4a5db38d1fe59)
This commit is contained in:
hondacrx
2020-08-22 13:11:03 -04:00
parent 2a65d345a9
commit 98de3e2a02
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/World/DuelReset.cs
+18 -6
View File
@@ -92,17 +92,29 @@ namespace Scripts.World
void ResetSpellCooldowns(Player player, bool onStartDuel) void ResetSpellCooldowns(Player player, bool onStartDuel)
{ {
// remove cooldowns on spells that have < 10 min CD, has no onHold and Aura // remove cooldowns on spells that have < 10 min CD > 30 sec and has no onHold
player.GetSpellHistory().ResetCooldowns(itr => player.GetSpellHistory().ResetCooldowns(itr =>
{ {
SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(itr.Key, Difficulty.None); SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(itr.Key, Difficulty.None);
uint remainingCooldown = player.GetSpellHistory().GetRemainingCooldown(spellInfo); uint remainingCooldown = player.GetSpellHistory().GetRemainingCooldown(spellInfo);
uint totalCooldown = spellInfo.RecoveryTime;
uint categoryCooldown = spellInfo.CategoryRecoveryTime;
player.ApplySpellMod(spellInfo.Id, SpellModOp.Cooldown, ref totalCooldown, null);
int cooldownMod = player.GetTotalAuraModifier(AuraType.ModCooldown);
if (cooldownMod != 0)
totalCooldown += (uint)(cooldownMod * Time.InMilliseconds);
if (!spellInfo.HasAttribute(SpellAttr6.IgnoreCategoryCooldownMods))
player.ApplySpellMod(spellInfo.Id, SpellModOp.Cooldown, ref categoryCooldown, null);
return remainingCooldown > 0 return remainingCooldown > 0
&& !itr.Value.OnHold && !itr.Value.OnHold
&& TimeSpan.FromMilliseconds(spellInfo.RecoveryTime) < TimeSpan.FromMinutes(10) && TimeSpan.FromMilliseconds(totalCooldown) < TimeSpan.FromMinutes(10)
&& TimeSpan.FromMilliseconds(spellInfo.CategoryRecoveryTime) < TimeSpan.FromMinutes(10) && TimeSpan.FromMilliseconds(categoryCooldown) < TimeSpan.FromMinutes(10)
&& TimeSpan.FromMilliseconds(remainingCooldown) < TimeSpan.FromMinutes(10) && TimeSpan.FromMilliseconds(remainingCooldown) < TimeSpan.FromMinutes(10)
&& (onStartDuel ? !player.HasAura(spellInfo.Id) : true); && (onStartDuel ? TimeSpan.FromMilliseconds(totalCooldown - remainingCooldown) > TimeSpan.FromSeconds(30) : true)
&& (onStartDuel ? TimeSpan.FromMilliseconds(categoryCooldown - remainingCooldown) > TimeSpan.FromSeconds(30) : true);
}, true); }, true);
// pet cooldowns // pet cooldowns