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

[11257] Fix overwrite spells 33649 and 20572, other cases with same icon.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Hundekuchen 2011-03-16 03:35:52 +03:00 • committed by VladimirMangos
parent 06d319e5f8
commit f1a880a4ed
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/SpellMgr.cpp
View file

@ -1871,6 +1871,10 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
(spellInfo_2->Id == 8326 && spellInfo_1->Id == 20584)) (spellInfo_2->Id == 8326 && spellInfo_1->Id == 20584))
return false; return false;
// Blood Fury and Rage of the Unraveller
if (spellInfo_1->SpellIconID == 1662 && spellInfo_2->SpellIconID == 1662)
return false;
// Kindred Spirits // Kindred Spirits
if (spellInfo_1->SpellIconID == 3559 && spellInfo_2->SpellIconID == 3559) if (spellInfo_1->SpellIconID == 3559 && spellInfo_2->SpellIconID == 3559)
return false; return false;

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 "11256" #define REVISION_NR "11257"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__