diff options
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/Player.cpp | 5 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index e9634722fab..2d49a7559e9 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -22104,8 +22104,9 @@ void Player::ActivateSpec(uint8 spec) uint32 glyph = m_Glyphs[m_activeSpec][slot]; // apply primary glyph - if (glyph && GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(glyph)) - CastSpell(this, gp->SpellId, true); + if (glyph) + if (GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(glyph)) + CastSpell(this, gp->SpellId, true); SetGlyph(slot, glyph); } diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index b349182ecfc..ec132ee3e7b 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4138,7 +4138,7 @@ void Unit::RemoveAllAuras(uint64 casterGUID, Aura * except /*=NULL*/, bool negat AuraMap::iterator iter = m_Auras.begin(); while (!m_Auras.empty()) { - Aura * aur = (*iter)->GetParentAura(); + Aura * aur = (*iter).second; if (aur != except && (!casterGUID || aur->GetCasterGUID()==casterGUID) && ((negative && !aur->IsPositive()) || (positive && aur->IsPositive()))) RemoveAura(aur); |