public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Unit): use casttime for ppm calculation of spells (#22019)

Browse Source
This commit is contained in:
Tereneckla
2025-06-09 15:07:42 +00:00
committed by GitHub
parent 745f757551
commit 3a7705409c
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -13503,7 +13503,7 @@ float Unit::GetPPMProcChance(uint32 WeaponSpeed, float PPM, SpellInfo const* spe
if (Player* modOwner = GetSpellModOwner()) if (Player* modOwner = GetSpellModOwner())
modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_PROC_PER_MINUTE, PPM); modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_PROC_PER_MINUTE, PPM);
return std::floor((WeaponSpeed * PPM) / 600.0f); // result is chance in percents (probability = Speed_in_sec * (PPM / 60)) return (WeaponSpeed * PPM) / 600.0f; // result is chance in percents (probability = Speed_in_sec * (PPM / 60))
} }
void Unit::Mount(uint32 mount, uint32 VehicleId, uint32 creatureEntry) void Unit::Mount(uint32 mount, uint32 VehicleId, uint32 creatureEntry)
@@ -17555,16 +17555,30 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit* victim, Aura* aura, WeaponAttackTyp
// If PPM exist calculate chance from PPM // If PPM exist calculate chance from PPM
if (spellProcEvent && spellProcEvent->ppmRate != 0) if (spellProcEvent && spellProcEvent->ppmRate != 0)
{ {
uint32 attackSpeed = 0;
Unit* attacker = nullptr;
if (!isVictim) if (!isVictim)
{ attacker = this;
uint32 WeaponSpeed = GetAttackTime(attType);
chance = GetPPMProcChance(WeaponSpeed, spellProcEvent->ppmRate, spellProto);
}
else if (victim) else if (victim)
attacker = victim;
if (attacker)
{ {
uint32 WeaponSpeed = victim->GetAttackTime(attType); if (!procSpell || procSpell->DmgClass == SPELL_DAMAGE_CLASS_MELEE || procSpell->IsRangedWeaponSpell())
chance = victim->GetPPMProcChance(WeaponSpeed, spellProcEvent->ppmRate, spellProto); {
attackSpeed = attacker->GetAttackTime(attType);
}
else //spells user their casttime for ppm calculations
{
if (procSpell->CastTimeEntry)
attackSpeed = procSpell->CastTimeEntry->CastTime;
//instants and fast spells use 1.5s castspeed
if (attackSpeed < 1500)
attackSpeed = 1500;
}
} }
chance = GetPPMProcChance(attackSpeed, spellProcEvent->ppmRate, spellProto);
} }
// Custom chances // Custom chances