aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGhaster <theghaster1@gmail.com>2024-12-03 13:05:04 +0100
committerOvahlord <dreadkiller@gmx.de>2024-12-06 21:15:25 +0100
commit6e336607a1ef15a10b113bcfd2152ac7c9ae9449 (patch)
tree595c9d9e5742f4ff641c847a3240ed0282579c93
parent6f034235abd9d38de2bff59c5fad9d6682a38932 (diff)
Core/Scenarios: Send Scenario GUID in scenario progress packet (#30465)
(cherry picked from commit 49b3ea96f5450a9649983267d34622e5f5cec876)
-rw-r--r--src/server/game/Scenarios/Scenario.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Scenarios/Scenario.cpp b/src/server/game/Scenarios/Scenario.cpp
index 6a45a657d8b..bc7e14cfb20 100644
--- a/src/server/game/Scenarios/Scenario.cpp
+++ b/src/server/game/Scenarios/Scenario.cpp
@@ -157,12 +157,12 @@ ScenarioStepState Scenario::GetStepState(ScenarioStepEntry const* step) const
void Scenario::SendCriteriaUpdate(Criteria const* criteria, CriteriaProgress const* progress, Seconds timeElapsed, bool timedCompleted) const
{
- DoForAllPlayers([=](Player const* receiver)
+ DoForAllPlayers([=, this](Player const* receiver)
{
WorldPackets::Scenario::ScenarioProgressUpdate progressUpdate;
progressUpdate.CriteriaProgress.Id = criteria->ID;
progressUpdate.CriteriaProgress.Quantity = progress->Counter;
- progressUpdate.CriteriaProgress.Player = progress->PlayerGUID;
+ progressUpdate.CriteriaProgress.Player = _guid;
progressUpdate.CriteriaProgress.Date.SetUtcTimeFromUnixTime(progress->Date);
progressUpdate.CriteriaProgress.Date += receiver->GetSession()->GetTimezoneOffset();
if (criteria->Entry->StartTimer)
@@ -348,7 +348,7 @@ std::vector<WorldPackets::Achievement::CriteriaProgress> Scenario::GetCriteriasP
criteriaProgress.Quantity = progress.Counter;
criteriaProgress.Date.SetUtcTimeFromUnixTime(progress.Date);
criteriaProgress.Date += player->GetSession()->GetTimezoneOffset();
- criteriaProgress.Player = progress.PlayerGUID;
+ criteriaProgress.Player = _guid;
}
return criteriasProgress;