nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-18 11:25:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Common): Container fixes use after free (#21460)

Browse Source
This commit is contained in:
Jelle Meeus
2025-02-15 22:22:30 +01:00
committed by GitHub
parent 75752880e2
commit a05833eeed
4 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/game/Entities/Object/Position.h
View File

@@ -64,6 +64,11 @@ struct Position
return !(operator==(a));
}
inline bool operator!=(Position const& a) const
{
return !(operator==(a));
}
operator G3D::Vector3() const
{
return { m_positionX, m_positionY, m_positionZ };

4
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
View File

@@ -205,10 +205,12 @@ public:
{
if (_availableRiftPositions.size() > 1)
{
spawnPos = Acore::Containers::SelectRandomContainerElementIf(_availableRiftPositions, [&](Position pos) -> bool
auto spawnPosItr = Acore::Containers::SelectRandomContainerElementIf(_availableRiftPositions, [&](Position const& pos) -> bool
{
return pos != lastPosition;
});
if (spawnPosItr != _availableRiftPositions.end())
spawnPos = *spawnPosItr;
}
else
{

5
src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
View File

@@ -93,10 +93,13 @@ struct boss_laj : public BossAI
ScheduleTimedEvent(30s, [&] {
me->RemoveAurasDueToSpell(_lastTransform.spellId);
_lastTransform = Acore::Containers::SelectRandomContainerElementIf(_transformContainer, [&](LajTransformData data) -> bool
auto lastTransformItr = Acore::Containers::SelectRandomContainerElementIf(_transformContainer, [&](LajTransformData const& data) -> bool
{
return data.spellId != _lastTransform.spellId;
});
if (lastTransformItr == _transformContainer.end())
return;
_lastTransform = *lastTransformItr;
me->SetDisplayId(_lastTransform.modelId);
DoCastSelf(_lastTransform.spellId, true);
}, 35s);