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

[c12640] Fix sending player cooldowns after map change/login and Correct logic in SpellMgr::IsSpellProcEventCanTriggeredBy

Browse source
This commit is contained in:
Dramacydal 2013-06-17 10:45:17 +01:00 • committed by Antz
parent 622cd2edd2
commit 5bb01c478e
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/Player.cpp
View file

@ -2914,7 +2914,7 @@ void Player::SendInitialSpells()
data << uint32(itr->first); data << uint32(itr->first);
data << uint16(itr->second.itemid); // cast item id data << uint32(itr->second.itemid); // cast item id
data << uint16(sEntry->GetCategory()); // spell category data << uint16(sEntry->GetCategory()); // spell category
// send infinity cooldown in special format // send infinity cooldown in special format

2
src/game/SpellMgr.cpp
View file

@ -1773,7 +1773,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr
SpellClassOptionsEntry const* spellClassOptions = procSpell->GetSpellClassOptions(); SpellClassOptionsEntry const* spellClassOptions = procSpell->GetSpellClassOptions();
// Check (if set) for spellFamilyName // Check (if set) for spellFamilyName
if (spellProcEvent->spellFamilyName && (!spellClassOptions || spellProcEvent->spellFamilyName != spellClassOptions->SpellFamilyName)) if (spellProcEvent->spellFamilyName && (!spellClassOptions && spellProcEvent->spellFamilyName != SPELLFAMILY_GENERIC || spellProcEvent->spellFamilyName != spellClassOptions->SpellFamilyName))
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 "12639" #define REVISION_NR "12640"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__