josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix (in theory) bug (already tapped error) for spells with banish mechanics (Banish, Cyclone).

Browse Source 
Closes issue #1945.
Closes issue #2402.

--HG--
branch : trunk
This commit is contained in:
azazel
2010-08-19 16:20:06 +06:00
parent 72e13547d0
commit d4605c5f7f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Spell.cpp
+6 -5
View File
@@ -4836,11 +4836,11 @@ SpellCastResult Spell::CheckCast(bool strict)
if (m_caster->GetTypeId() == TYPEID_PLAYER) if (m_caster->GetTypeId() == TYPEID_PLAYER)
{ {
// Not allow banish not self target // Do not allow to banish target tapped by someone not in caster's group
if (m_spellInfo->Mechanic == MECHANIC_BANISH) if (m_spellInfo->Mechanic == MECHANIC_BANISH)
if (target->GetTypeId() == TYPEID_UNIT && if (Creature *targetCreature = target->ToCreature())
!m_caster->ToPlayer()->isAllowedToLoot(target->ToCreature())) if (targetCreature->hasLootRecipient() && !targetCreature->isTappedBy(m_caster->ToPlayer()))
return SPELL_FAILED_CANT_CAST_ON_TAPPED; return SPELL_FAILED_CANT_CAST_ON_TAPPED;
if (m_customAttr & SPELL_ATTR_CU_PICKPOCKET) if (m_customAttr & SPELL_ATTR_CU_PICKPOCKET)
{ {
@@ -4855,7 +4855,8 @@ SpellCastResult Spell::CheckCast(bool strict)
{ {
if (target->GetTypeId() == TYPEID_PLAYER) if (target->GetTypeId() == TYPEID_PLAYER)
{ {
if (!target->ToPlayer()->GetWeaponForAttack(BASE_ATTACK) || !target->ToPlayer()->IsUseEquipedWeapon(true)) Player *player = target->ToPlayer();
if (!player->GetWeaponForAttack(BASE_ATTACK) || !player->IsUseEquipedWeapon(true))
return SPELL_FAILED_TARGET_NO_WEAPONS; return SPELL_FAILED_TARGET_NO_WEAPONS;
} }
else if (!target->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID)) else if (!target->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID))