diff options
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Server/Protocol/Handlers/SpellHandler.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Spells/Spell.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 808a2da3a0d..a7d84a4187f 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -13877,7 +13877,7 @@ void CharmInfo::InitPossessCreateSpells() { uint32 spellId = m_unit->ToCreature()->m_spells[i]; SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); - if (spellInfo && spellInfo->Attributes & SPELL_ATTR0_CASTABLE_WHILE_DEAD) + if (spellInfo && !spellInfo->Attributes & SPELL_ATTR0_CASTABLE_WHILE_DEAD) { if (spellInfo->IsPassive()) m_unit->CastSpell(m_unit, spellInfo, true); diff --git a/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp b/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp index 0f309ea5fc2..247d2c5ceee 100755 --- a/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/SpellHandler.cpp @@ -141,7 +141,7 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket) { if (SpellInfo const *spellInfo = sSpellMgr->GetSpellInfo(proto->Spells[i].SpellId)) { - if (spellInfo->CanBeUsedInCombat()) + if (!spellInfo->CanBeUsedInCombat()) { pUser->SendEquipError(EQUIP_ERR_NOT_IN_COMBAT, pItem, NULL); return; diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 628ec1a0f16..a40ff40d935 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5693,7 +5693,7 @@ bool Spell::CanAutoCast(Unit* target) return false; } } - else if (m_spellInfo->Effects[j].IsArea()) + else if (m_spellInfo->Effects[j].IsAreaAuraEffect()) { if (target->HasAuraEffect(m_spellInfo->Id, j)) return false; |