Core/Spell: Correct the hit and miss counters in WriteSpellGoTargets
Fixes a client crash when spells hit (or miss) more than 255 targets (it was capped at 256 in 80b61fa584)
Thanks to @joschiwald for finding the mistake
Closes #12733
This commit is contained in:
1 parent
a99bf38d81
commit
02a3b3d949
1 file changed
+3
-3
@@ -3999,7 +3999,7 @@ void Spell::WriteSpellGoTargets(WorldPacket* data)
|
||||
uint32 hit = 0;
|
||||
size_t hitPos = data->wpos();
|
||||
*data << (uint8)0; // placeholder
|
||||
for (std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end() && hit <= 255; ++ihit)
|
||||
for (std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end() && hit < 255; ++ihit)
|
||||
{
|
||||
if ((*ihit).missCondition == SPELL_MISS_NONE) // Add only hits
|
||||
{
|
||||
@@ -4009,7 +4009,7 @@ void Spell::WriteSpellGoTargets(WorldPacket* data)
|
||||
}
|
||||
}
|
||||
|
||||
for (std::list<GOTargetInfo>::const_iterator ighit = m_UniqueGOTargetInfo.begin(); ighit != m_UniqueGOTargetInfo.end() && hit <= 255; ++ighit)
|
||||
for (std::list<GOTargetInfo>::const_iterator ighit = m_UniqueGOTargetInfo.begin(); ighit != m_UniqueGOTargetInfo.end() && hit < 255; ++ighit)
|
||||
{
|
||||
*data << uint64(ighit->targetGUID); // Always hits
|
||||
++hit;
|
||||
@@ -4018,7 +4018,7 @@ void Spell::WriteSpellGoTargets(WorldPacket* data)
|
||||
uint32 miss = 0;
|
||||
size_t missPos = data->wpos();
|
||||
*data << (uint8)0; // placeholder
|
||||
for (std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end() && miss <= 255; ++ihit)
|
||||
for (std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end() && miss < 255; ++ihit)
|
||||
{
|
||||
if (ihit->missCondition != SPELL_MISS_NONE) // Add only miss
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user