Compare commits

...

3 Commits

Author SHA1 Message Date
Paul
2761c15bd1
Merge d0c1832f34c4fa27387a836cd974751018c0c329 into f6c4164765afe447476114e632ee3d70b04a1777 2025-02-20 19:38:16 +00:00
Andrew
f6c4164765
chore(CI): Add mod-costumes (#21548) 2025-02-20 06:29:46 +01:00
pavel_k
d0c1832f34 fix(Core/Spells): Fixed explosive shot ammo consumption with and without LnL
explosive shot ticks were consuming ammo which is probably bug by itself but was also ignoring LnL procs

closes https://github.com/azerothcore/azerothcore-wotlk/issues/21319
2025-02-18 18:34:55 +03:00
2 changed files with 13 additions and 1 deletions

View File

@ -28,3 +28,4 @@ git clone --depth=1 --branch=master https://github.com/azerothcore/mod-server-au
git clone --depth=1 --branch=master https://github.com/azerothcore/mod-transmog.git modules/mod-transmog
git clone --depth=1 --branch=main https://github.com/azerothcore/mod-progression-system.git modules/mod-progression-system
git clone --depth=1 --branch=master https://github.com/azerothcore/mod-arena-3v3-solo-queue.git modules/mod-arena-3v3-solo-queue
git clone --depth=1 --branch=master https://github.com/azerothcore/mod-costumes.git modules/mod-costumes

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;