fang139842/azerothcore-wotlk2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge d0c1832f34c4fa27387a836cd974751018c0c329 into f6c4164765afe447476114e632ee3d70b04a1777

Browse Source
This commit is contained in:
Paul 2025-02-20 19:38:16 +00:00 committed by GitHub
commit 2761c15bd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/game/Spells/Spell.cpp
View File

@ -5408,7 +5408,11 @@ void Spell::TakeAmmo()
}
}
else if (uint32 ammo = m_caster->ToPlayer()->GetUInt32Value(PLAYER_AMMO_ID))
m_caster->ToPlayer()->DestroyItemCount(ammo, 1, true);
// Handling of explosive shot ticks
if (!(m_spellInfo->Id == 53352))
{
m_caster->ToPlayer()->DestroyItemCount(ammo, 1, true);
}
}
}
@ -8277,6 +8281,13 @@ void Spell::HandleLaunchPhase()
PrepareTargetProcessing();
// Handling of explosive shot initial cast without LnL proc
if ((m_spellInfo->SpellFamilyFlags[1] & 0x80000000) != 0 && !m_caster->HasAura(56453))
{
TakeAmmo();
usesAmmo = false;
}
for (std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
{
TargetInfo& target = *ihit;