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

[7202] Fix warlock armor buff stack

Browse source 
Signed-off-by: DiSlord <dislord@nomail.com>
This commit is contained in:
DiSlord 2009-01-30 23:00:26 +03:00
parent 339c7f05f1
commit 88419c968f
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/game/SpellMgr.cpp
View file

@ -157,8 +157,8 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
if (spellInfo->Dispel == DISPEL_CURSE) if (spellInfo->Dispel == DISPEL_CURSE)
return SPELL_CURSE; return SPELL_CURSE;
// family flag 37 (only part spells have family name) // Warlock (Demon Armor | Demon Skin | Fel Armor)
if (spellInfo->SpellFamilyFlags & 0x2000000000LL) if (spellInfo->SpellFamilyFlags & 0x2000002000000000LL || spellInfo->SpellFamilyFlags2 & 0x00000010)
return SPELL_WARLOCK_ARMOR; return SPELL_WARLOCK_ARMOR;
break; break;
@ -214,12 +214,6 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
break; break;
} }
// only warlock armor/skin have this (in additional to family cases)
if( spellInfo->SpellVisual[0] == 130 && spellInfo->SpellIconID == 89)
{
return SPELL_WARLOCK_ARMOR;
}
// elixirs can have different families, but potion most ofc. // elixirs can have different families, but potion most ofc.
if(SpellSpecific sp = spellmgr.GetSpellElixirSpecific(spellInfo->Id)) if(SpellSpecific sp = spellmgr.GetSpellElixirSpecific(spellInfo->Id))
return sp; return sp;

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 "7201" #define REVISION_NR "7202"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__