Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Items: Use correct error message when swapping weapons in combat too quickly

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/4bc02e3744c67fc4ccd5447f3290a4710c6b1cb5)
This commit is contained in:
hondacrx
2022-06-01 15:56:13 -04:00
parent 7bc70c02ad
commit 0dfea5dcb2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Items.cs
+1 -1
View File
@@ -4940,7 +4940,7 @@ namespace Game.Entities
} }
if (IsInCombat() && (pProto.GetClass() == ItemClass.Weapon || pProto.GetInventoryType() == InventoryType.Relic) && m_weaponChangeTimer != 0) 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)) if (IsNonMeleeSpellCast(false))
return InventoryResult.ClientLockedOut; return InventoryResult.ClientLockedOut;