From 0dfea5dcb2ea33232eb548b5c22298543a8ba1d0 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 1 Jun 2022 15:56:13 -0400 Subject: [PATCH] Core/Items: Use correct error message when swapping weapons in combat too quickly Port From (https://github.com/TrinityCore/TrinityCore/commit/4bc02e3744c67fc4ccd5447f3290a4710c6b1cb5) --- Source/Game/Entities/Player/Player.Items.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Game/Entities/Player/Player.Items.cs b/Source/Game/Entities/Player/Player.Items.cs index 33bc12121..25b732af1 100644 --- a/Source/Game/Entities/Player/Player.Items.cs +++ b/Source/Game/Entities/Player/Player.Items.cs @@ -4940,7 +4940,7 @@ namespace Game.Entities } if (IsInCombat() && (pProto.GetClass() == ItemClass.Weapon || pProto.GetInventoryType() == InventoryType.Relic) && m_weaponChangeTimer != 0) - return InventoryResult.ClientLockedOut; // maybe exist better err + return InventoryResult.ItemCooldown; if (IsNonMeleeSpellCast(false)) return InventoryResult.ClientLockedOut;