From fc12e47cb8e3f4c1097b41e94a92151776818717 Mon Sep 17 00:00:00 2001 From: Treeston Date: Tue, 5 Sep 2017 15:33:44 +0200 Subject: Core/Player: Prevent changing equipment while charmed. Closes #20209. (cherry picked from commit a1a12ec755e4aa5e2e8475d6a6158bac94f0977a) --- src/server/game/Entities/Player/Player.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/server') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 4a441af47b1..29b48a31f37 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -11469,6 +11469,9 @@ InventoryResult Player::CanEquipItem(uint8 slot, uint16 &dest, Item* pItem, bool if (HasUnitState(UNIT_STATE_STUNNED)) return EQUIP_ERR_GENERIC_STUNNED; + if (IsCharmed()) + return EQUIP_ERR_CANT_DO_RIGHT_NOW; // @todo is this the correct error? + // do not allow equipping gear except weapons, offhands, projectiles, relics in // - combat // - in-progress arenas @@ -11670,6 +11673,9 @@ InventoryResult Player::CanUnequipItem(uint16 pos, bool swap) const if (pItem->m_lootGenerated) return EQUIP_ERR_LOOT_GONE; + if (IsCharmed()) + return EQUIP_ERR_CANT_DO_RIGHT_NOW; // @todo is this the correct error? + // do not allow unequipping gear except weapons, offhands, projectiles, relics in // - combat // - in-progress arenas -- cgit v1.2.3