Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/scripts/Commands/cs_misc.cpp
This commit is contained in:
commit
e26dcbe2f5
4 files changed
+26
-25
No files matched your search
@@ -1697,9 +1697,6 @@ void WorldSession::HandleEquipmentSetDelete(WorldPacket &recvData)
|
||||
|
||||
void WorldSession::HandleEquipmentSetUse(WorldPacket& recvData)
|
||||
{
|
||||
if (_player->IsInCombat())
|
||||
return;
|
||||
|
||||
TC_LOG_DEBUG("network", "CMSG_EQUIPMENT_SET_USE");
|
||||
|
||||
for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
|
||||
@@ -1716,6 +1713,10 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket& recvData)
|
||||
if (itemGuid == 1)
|
||||
continue;
|
||||
|
||||
// Only equip weapons in combat
|
||||
if (_player->IsInCombat() && i != EQUIPMENT_SLOT_MAINHAND && i != EQUIPMENT_SLOT_OFFHAND && i != EQUIPMENT_SLOT_RANGED)
|
||||
continue;
|
||||
|
||||
Item* item = _player->GetItemByGuid(itemGuid);
|
||||
|
||||
uint16 dstpos = i | (INVENTORY_SLOT_BAG_0 << 8);
|
||||
|
||||
Reference in new issue
Block a user