Fix exploit that Titan's Grip allow to use with it staff/polearm
--HG-- branch : trunk
This commit is contained in:
+1
-1
@@ -8781,7 +8781,7 @@ uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap
|
|||||||
break;
|
break;
|
||||||
case INVTYPE_2HWEAPON:
|
case INVTYPE_2HWEAPON:
|
||||||
slots[0] = EQUIPMENT_SLOT_MAINHAND;
|
slots[0] = EQUIPMENT_SLOT_MAINHAND;
|
||||||
if (CanDualWield() && CanTitanGrip())
|
if (CanDualWield() && CanTitanGrip() && proto && proto->SubClass != ITEM_SUBCLASS_WEAPON_POLEARM && proto->SubClass != ITEM_SUBCLASS_WEAPON_STAFF)
|
||||||
slots[1] = EQUIPMENT_SLOT_OFFHAND;
|
slots[1] = EQUIPMENT_SLOT_OFFHAND;
|
||||||
break;
|
break;
|
||||||
case INVTYPE_TABARD:
|
case INVTYPE_TABARD:
|
||||||
|
|||||||
+9
-1
@@ -1854,7 +1854,15 @@ class MANGOS_DLL_SPEC Player : public Unit
|
|||||||
void SetCanParry(bool value);
|
void SetCanParry(bool value);
|
||||||
bool CanBlock() const { return m_canBlock; }
|
bool CanBlock() const { return m_canBlock; }
|
||||||
void SetCanBlock(bool value);
|
void SetCanBlock(bool value);
|
||||||
bool CanTitanGrip() const { return m_canTitanGrip ; }
|
bool CanTitanGrip() const
|
||||||
|
{
|
||||||
|
Item *mainItem = GetItemByPos( INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND );
|
||||||
|
|
||||||
|
if (mainItem && ( mainItem->GetProto()->SubClass == ITEM_SUBCLASS_WEAPON_POLEARM || mainItem->GetProto()->SubClass == ITEM_SUBCLASS_WEAPON_STAFF ))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return m_canTitanGrip ;
|
||||||
|
}
|
||||||
void SetCanTitanGrip(bool value) { m_canTitanGrip = value; }
|
void SetCanTitanGrip(bool value) { m_canTitanGrip = value; }
|
||||||
bool CanTameExoticPets() const { return isGameMaster() || HasAuraType(SPELL_AURA_ALLOW_TAME_PET_TYPE); }
|
bool CanTameExoticPets() const { return isGameMaster() || HasAuraType(SPELL_AURA_ALLOW_TAME_PET_TYPE); }
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user