diff options
| -rw-r--r-- | src/game/Player.cpp | 7 | ||||
| -rw-r--r-- | src/game/Player.h | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index b1eb2ffb452..f2083737011 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -292,6 +292,7 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputa m_ExtraFlags = 0; m_spellModTakingSpell = NULL; + m_pad = 0; // players always accept if(GetSession()->GetSecurity() == SEC_PLAYER) @@ -1126,9 +1127,11 @@ void Player::Update( uint32 p_time ) // If this is set during update SetSpellModTakingSpell call is missing somewhere in the code // Having this would prevent more aura charges to be dropped, so let's crash //assert (!m_spellModTakingSpell); - if(m_spellModTakingSpell) + if(m_pad || m_spellModTakingSpell) { - sLog.outCrash("Player has m_spellModTakingSpell %u during update!", m_spellModTakingSpell->m_spellInfo->Id); + sLog.outCrash("Player has m_pad %u during update!", m_pad); + if(m_spellModTakingSpell) + sLog.outCrash("Player has m_spellModTakingSpell %u during update!", m_spellModTakingSpell->m_spellInfo->Id); assert(false); m_spellModTakingSpell = NULL; } diff --git a/src/game/Player.h b/src/game/Player.h index 657d4632b0d..3e87e735fb1 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -2347,6 +2347,7 @@ class MANGOS_DLL_SPEC Player : public Unit uint16 m_baseManaRegen; SpellModList m_spellMods[MAX_SPELLMOD]; + uint32 m_pad; Spell * m_spellModTakingSpell; // Spell for which charges are dropped in spell::finish EnchantDurationList m_enchantDuration; |