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

fix(Scripts/BlackMorass): Don't pick the same rift spot in succession (#15359)

Browse Source
This commit is contained in:
Skjalf
2023-03-12 13:27:39 -03:00
committed by GitHub
parent cbaa63eb64
commit e2eb9fb82b
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,7 +150,7 @@ public:
_canSpawnPortal = true;
});
ScheduleNextPortal(2min + 30s);
ScheduleNextPortal(2min + 30s, Position(0.0f, 0.0f, 0.0f, 0.0f));
break;
}
default:
@@ -173,11 +173,11 @@ public:
player->SendUpdateWorldState(WORLD_STATE_BM_RIFT, _currentRift);
}
void ScheduleNextPortal(Milliseconds time)
void ScheduleNextPortal(Milliseconds time, Position lastPosition)
{
_scheduler.CancelGroup(CONTEXT_GROUP_RIFTS);
_scheduler.Schedule(time, [this](TaskContext context)
_scheduler.Schedule(time, [this, lastPosition](TaskContext context)
{
if (GetCreature(DATA_MEDIVH))
{
@@ -190,7 +190,18 @@ public:
Position spawnPos;
if (!_availableRiftPositions.empty())
{
spawnPos = Acore::Containers::SelectRandomContainerElement(_availableRiftPositions);
if (_availableRiftPositions.size() > 1)
{
spawnPos = Acore::Containers::SelectRandomContainerElementIf(_availableRiftPositions, [&](Position pos) -> bool
{
return pos != lastPosition;
});
}
else
{
spawnPos = Acore::Containers::SelectRandomContainerElement(_availableRiftPositions);
}
_availableRiftPositions.remove(spawnPos);
DoUpdateWorldState(WORLD_STATE_BM_RIFT, ++_currentRift);
@@ -254,13 +265,13 @@ public:
case NPC_TIME_RIFT:
if (_currentRift < 18)
{
if (!_availableRiftPositions.empty() && _availableRiftPositions.size() < 3)
if (_availableRiftPositions.size() < 3)
{
ScheduleNextPortal((_currentRift >= 13 ? 2min : 90s));
ScheduleNextPortal((_currentRift >= 13 ? 2min : 90s), creature->GetHomePosition());
}
else
{
ScheduleNextPortal(4s);
ScheduleNextPortal(1s, creature->GetHomePosition());
}
}
@@ -301,7 +312,7 @@ public:
DoUpdateWorldState(WORLD_STATE_BM_SHIELD, _shieldPercent);
DoUpdateWorldState(WORLD_STATE_BM_RIFT, _currentRift);
ScheduleNextPortal(3s);
ScheduleNextPortal(3s, Position(0.0f, 0.0f, 0.0f, 0.0f));
for (ObjectGuid const& guid : _encounterNPCs)
{