public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Spells): Fix item use macro breaking melee auto-attack (#24926)

Browse Source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
Co-authored-by: QAston <QAston@users.noreply.github.com>
This commit is contained in:
blinkysc
2026-02-28 08:15:51 -06:00
committed by GitHub
parent 0912c11fc7
commit 6d93f67cdf
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Entities/Player/Player.cpp
View File

@@ -7459,6 +7459,10 @@ void Player::CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8
if (HasSpellCooldown(spellInfo->Id)) if (HasSpellCooldown(spellInfo->Id))
{ {
// Notify client so it can clean up the pending spell cast.
// Without this the client orphans the cast and blocks auto-attack.
Spell::SendCastResult(ToPlayer(), spellInfo, cast_count,
SPELL_FAILED_NOT_READY);
continue; continue;
} }
@@ -7505,7 +7509,11 @@ void Player::CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8
} }
if (HasSpellCooldown(spellInfo->Id)) if (HasSpellCooldown(spellInfo->Id))
{
Spell::SendCastResult(ToPlayer(), spellInfo, cast_count,
SPELL_FAILED_NOT_READY);
continue; continue;
}
Spell* spell = new Spell(this, spellInfo, (count > 0) ? TRIGGERED_FULL_MASK : TRIGGERED_NONE); Spell* spell = new Spell(this, spellInfo, (count > 0) ? TRIGGERED_FULL_MASK : TRIGGERED_NONE);
spell->m_CastItem = item; spell->m_CastItem = item;

1
src/server/game/Spells/Spell.h
View File

@@ -509,6 +509,7 @@ public:
void SendPetCastResult(SpellCastResult result); void SendPetCastResult(SpellCastResult result);
void SendSpellStart(); void SendSpellStart();
void SendSpellGo(); void SendSpellGo();
void SendSpellCooldown(); void SendSpellCooldown();
void SendLogExecute(); void SendLogExecute();
void ExecuteLogEffectTakeTargetPower(uint8 effIndex, Unit* target, uint32 PowerType, uint32 powerTaken, float gainMultiplier); void ExecuteLogEffectTakeTargetPower(uint8 effIndex, Unit* target, uint32 PowerType, uint32 powerTaken, float gainMultiplier);