mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9946] Prevent remove unexpected for remove spell at cast 35729.

Browse source 
Also drop removed spell call for spells 19574/34471.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
j4r0d 2010-05-21 07:53:54 +04:00 • committed by VladimirMangos
parent 33c9af577c
commit c2fc89c86c
3 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/game/SpellAuras.cpp
View file

@ -6374,16 +6374,8 @@ void Aura::HandleSpellSpecificBoosts(bool apply)
break; break;
case SPELLFAMILY_HUNTER: case SPELLFAMILY_HUNTER:
{ {
// The Beast Within and Bestial Wrath - immunity
if (GetId() == 19574 || GetId() == 34471)
{
spellId1 = 24395;
spellId2 = 24396;
spellId3 = 24397;
spellId4 = 26592;
}
// Freezing Trap Effect // Freezing Trap Effect
else if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000008)) if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000008))
{ {
if(!apply) if(!apply)
{ {

10
src/game/SpellEffects.cpp
View file

@ -2622,11 +2622,11 @@ void Spell::EffectTriggerSpell(SpellEffectIndex effIndex)
Unit::AuraMap& Auras = unitTarget->GetAuras(); Unit::AuraMap& Auras = unitTarget->GetAuras();
for(Unit::AuraMap::iterator iter = Auras.begin(); iter != Auras.end(); ++iter) for(Unit::AuraMap::iterator iter = Auras.begin(); iter != Auras.end(); ++iter)
{ {
// remove all harmful spells on you... // Remove all harmful spells on you except positive/passive/physical auras
if( // ignore positive and passive auras if( !iter->second->IsPositive()
!iter->second->IsPositive() && !iter->second->IsPassive() && && !iter->second->IsPassive()
// ignore physical auras && !iter->second->IsDeathPersistent()
(GetSpellSchoolMask(iter->second->GetSpellProto()) & SPELL_SCHOOL_MASK_NORMAL)==0 ) && (GetSpellSchoolMask(iter->second->GetSpellProto()) & SPELL_SCHOOL_MASK_NORMAL) == 0 )
{ {
m_caster->RemoveAurasDueToSpell(iter->second->GetSpellProto()->Id); m_caster->RemoveAurasDueToSpell(iter->second->GetSpellProto()->Id);
iter = Auras.begin(); iter = Auras.begin();

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9945" #define REVISION_NR "9946"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__