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

[10130] Proper stacking 30108/348 anr ranks from 3.2.x

Browse source 
(based on zergtmn's repo commit 7588ca9)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
zerg 2010-06-30 22:28:35 +04:00 • committed by VladimirMangos
parent 3215c80cce
commit 3dbb8385b5
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/SpellMgr.cpp
View file

@ -398,6 +398,9 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
if (spellInfo->SpellFamilyFlags & UI64LIT(0x2000002000000000) || spellInfo->SpellFamilyFlags2 & 0x00000010) if (spellInfo->SpellFamilyFlags & UI64LIT(0x2000002000000000) || spellInfo->SpellFamilyFlags2 & 0x00000010)
return SPELL_WARLOCK_ARMOR; return SPELL_WARLOCK_ARMOR;
// Unstable Affliction | Immolate
if (spellInfo->SpellFamilyFlags & UI64LIT(0x10000000004))
return SPELL_UA_IMMOLATE;
break; break;
} }
case SPELLFAMILY_PRIEST: case SPELLFAMILY_PRIEST:
@ -484,6 +487,7 @@ bool IsSingleFromSpellSpecificPerTargetPerCaster(SpellSpecific spellSpec1,SpellS
case SPELL_POSITIVE_SHOUT: case SPELL_POSITIVE_SHOUT:
case SPELL_JUDGEMENT: case SPELL_JUDGEMENT:
case SPELL_HAND: case SPELL_HAND:
case SPELL_UA_IMMOLATE:
return spellSpec1==spellSpec2; return spellSpec1==spellSpec2;
default: default:
return false; return false;

1
src/game/SpellMgr.h
View file

@ -103,6 +103,7 @@ enum SpellSpecific
SPELL_FOOD = 20, SPELL_FOOD = 20,
SPELL_DRINK = 21, SPELL_DRINK = 21,
SPELL_FOOD_AND_DRINK = 22, SPELL_FOOD_AND_DRINK = 22,
SPELL_UA_IMMOLATE = 23, // Unstable Affliction and Immolate
}; };
SpellSpecific GetSpellSpecific(uint32 spellId); SpellSpecific GetSpellSpecific(uint32 spellId);

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 "10129" #define REVISION_NR "10130"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__