diff options
| author | QAston <none@none> | 2009-06-24 15:58:44 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-06-24 15:58:44 +0200 |
| commit | 33b2917bb7cbf4512c5bd58d99ceb795ef7a1a10 (patch) | |
| tree | df055da250120e767ab7512eaa2e2e9f55738cd8 /src/game/Unit.cpp | |
| parent | 329b020af442240131f9d08d577f694e50bc9064 (diff) | |
*Fix Ferocious Bite energy to dmg conversion
*Remove duplicated AP coefficients for Hammer of Wrath and Avengers Shield
*Correctly do effectaddcombopoints for spells which take them.
*Do not proc spelleffects on player login.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index d310880f3b2..99db7dc3108 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -12501,6 +12501,9 @@ uint32 createProcExtendMask(SpellNonMeleeDamage *damageInfo, SpellMissInfo missC void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellEntry const * procSpell, uint32 damage , SpellEntry const * procAura) { + // Player is loaded now - do not allow passive spell casts to proc + if (GetTypeId() == TYPEID_PLAYER && ((Player*)this)->GetSession()->PlayerLoading()) + return; // For melee/ranged based attack need update skills and set some Aura states if (procFlag & MELEE_BASED_TRIGGER_MASK) { |