diff options
| author | Shauren <shauren.trinity@gmail.com> | 2012-08-09 18:07:12 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2012-08-09 18:07:12 +0200 |
| commit | 34ae09f3a81e5504723a72704fac081b390318c4 (patch) | |
| tree | 26a5b8439a699b8842e32348da30ee305e7cd225 /src/server/game/Handlers/SpellHandler.cpp | |
| parent | 512f850e40215c4ce9cbd0e00ea6a95c57c573b6 (diff) | |
Core/Spells: Implemented SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS
Diffstat (limited to 'src/server/game/Handlers/SpellHandler.cpp')
| -rwxr-xr-x | src/server/game/Handlers/SpellHandler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index 31cce5b7239..b772db626f0 100755 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -350,8 +350,10 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket) return; } - SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); + if (Player* plrMover = mover->ToPlayer()) + spellId = plrMover->GetSpellForCast(spellId); + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); if (!spellInfo) { sLog->outError(LOG_FILTER_NETWORKIO, "WORLD: unknown spell id %u", spellId); @@ -362,7 +364,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket) if (mover->GetTypeId() == TYPEID_PLAYER) { // not have spell in spellbook or spell passive and not casted by client - if (!mover->ToPlayer()->HasActiveSpell (spellId) || spellInfo->IsPassive()) + if (!mover->ToPlayer()->HasActiveSpell(spellId) || spellInfo->IsPassive()) { //cheater? kick? ban? recvPacket.rfinish(); // prevent spam at ignore packet |