Allow weapon procs in druid shapeshifts.

Signed-off-by: hunuza <hunuza@gmail.com>
This commit is contained in:
hunuza 2009-09-27 12:24:34 +02:00
parent 1e0b93abdb
commit 302afbc40f
2 changed files with 1 additions and 4 deletions

View file

@ -6990,7 +6990,7 @@ void Player::UpdateEquipSpellsAtFormChange()
void Player::CastItemCombatSpell(Unit* Target, WeaponAttackType attType) void Player::CastItemCombatSpell(Unit* Target, WeaponAttackType attType)
{ {
Item *item = GetWeaponForAttack(attType, true); Item *item = GetWeaponForAttack(attType, false);
if(!item || item->IsBroken()) if(!item || item->IsBroken())
return; return;

View file

@ -12092,9 +12092,6 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura* aura, SpellEntry con
else else
item = ((Player*)this)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_RANGED); item = ((Player*)this)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_RANGED);
if (!((Player*)this)->IsUseEquipedWeapon(attType==BASE_ATTACK))
return false;
if(!item || item->IsBroken() || item->GetProto()->Class != ITEM_CLASS_WEAPON || !((1<<item->GetProto()->SubClass) & spellProto->EquippedItemSubClassMask)) if(!item || item->IsBroken() || item->GetProto()->Class != ITEM_CLASS_WEAPON || !((1<<item->GetProto()->SubClass) & spellProto->EquippedItemSubClassMask))
return false; return false;
} }