Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Criteria: Use std::chrono type for CriteriaHandler::SendCriteriaUpdate

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/33bce9e28b28f018dc43a31ed37790fa1fc81f88)
This commit is contained in:
hondacrx
2021-04-12 12:30:51 -04:00
parent b35aa78c2e
commit d62ca82d30
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Achievements/AchievementManager.cs
+4 -4
View File
@@ -602,7 +602,7 @@ namespace Game.Achievements
return false;
}
public override void SendCriteriaUpdate(Criteria criteria, CriteriaProgress progress, uint timeElapsed, bool timedCompleted)
public override void SendCriteriaUpdate(Criteria criteria, CriteriaProgress progress, TimeSpan timeElapsed, bool timedCompleted)
{
if (criteria.FlagsCu.HasAnyFlag(CriteriaFlagsCu.Account))
{
@@ -615,7 +615,7 @@ namespace Game.Achievements
criteriaUpdate.Progress.Flags = timedCompleted ? 1 : 0u; // 1 is for keeping the counter at 0 in client
criteriaUpdate.Progress.Date = progress.Date;
criteriaUpdate.Progress.TimeFromStart = timeElapsed;
criteriaUpdate.Progress.TimeFromStart = (uint)timeElapsed.TotalSeconds;
criteriaUpdate.Progress.TimeFromCreate = 0;
SendPacket(criteriaUpdate);
}
@@ -631,7 +631,7 @@ namespace Game.Achievements
criteriaUpdate.Flags = timedCompleted ? 1 : 0u; // 1 is for keeping the counter at 0 in client
criteriaUpdate.CurrentTime = progress.Date;
criteriaUpdate.ElapsedTime = timeElapsed;
criteriaUpdate.ElapsedTime = (uint)timeElapsed.TotalSeconds;
criteriaUpdate.CreationTime = 0;
SendPacket(criteriaUpdate);
@@ -1013,7 +1013,7 @@ namespace Game.Achievements
UpdateCriteria(CriteriaTypes.EarnAchievementPoints, achievement.Points, 0, 0, null, referencePlayer);
}
public override void SendCriteriaUpdate(Criteria entry, CriteriaProgress progress, uint timeElapsed, bool timedCompleted)
public override void SendCriteriaUpdate(Criteria entry, CriteriaProgress progress, TimeSpan timeElapsed, bool timedCompleted)
{
GuildCriteriaUpdate guildCriteriaUpdate = new();
Source/Game/Achievements/CriteriaHandler.cs
+5 -5
View File
@@ -609,18 +609,18 @@ namespace Game.Achievements
progress.PlayerGUID = referencePlayer ? referencePlayer.GetGUID() : ObjectGuid.Empty;
_criteriaProgress[criteria.Id] = progress;
uint timeElapsed = 0;
TimeSpan timeElapsed = TimeSpan.Zero;
if (criteria.Entry.StartTimer != 0)
{
Cypher.Assert(trees != null);
foreach (CriteriaTree tree in trees)
{
var timedIter = _timeCriteriaTrees.LookupByKey(tree.Id);
if (timedIter != 0)
var timed = _timeCriteriaTrees.LookupByKey(tree.Id);
if (timed != 0)
{
// Client expects this in packet
timeElapsed = criteria.Entry.StartTimer - (timedIter / Time.InMilliseconds);
timeElapsed = TimeSpan.FromSeconds(criteria.Entry.StartTimer - (timed / Time.InMilliseconds));
// Remove the timer, we wont need it anymore
if (IsCompletedCriteriaTree(tree))
@@ -2590,7 +2590,7 @@ namespace Game.Achievements
}
public virtual void SendAllData(Player receiver) { }
public virtual void SendCriteriaUpdate(Criteria criteria, CriteriaProgress progress, uint timeElapsed, bool timedCompleted) { }
public virtual void SendCriteriaUpdate(Criteria criteria, CriteriaProgress progress, TimeSpan timeElapsed, bool timedCompleted) { }
public virtual void SendCriteriaProgressRemoved(uint criteriaId) { }
public virtual void CompletedCriteriaTree(CriteriaTree tree, Player referencePlayer) { }
Source/Game/Quest/QuestObjectiveCriteriaManager.cs
+3 -2
View File
@@ -21,6 +21,7 @@ using Game.Achievements;
using Game.Entities;
using Game.Networking;
using Game.Networking.Packets;
using System;
using System.Collections.Generic;
namespace Game
@@ -240,7 +241,7 @@ namespace Game
return _completedObjectives.Contains(questObjective.Id);
}
public override void SendCriteriaUpdate(Criteria criteria, CriteriaProgress progress, uint timeElapsed, bool timedCompleted)
public override void SendCriteriaUpdate(Criteria criteria, CriteriaProgress progress, TimeSpan timeElapsed, bool timedCompleted)
{
CriteriaUpdate criteriaUpdate = new();
@@ -252,7 +253,7 @@ namespace Game
criteriaUpdate.Flags = timedCompleted ? 1 : 0u; // 1 is for keeping the counter at 0 in client
criteriaUpdate.CurrentTime = progress.Date;
criteriaUpdate.ElapsedTime = timeElapsed;
criteriaUpdate.ElapsedTime = (uint)timeElapsed.TotalSeconds;
criteriaUpdate.CreationTime = 0;
SendPacket(criteriaUpdate);
Source/Game/Scenarios/Scenario.cs
+3 -2
View File
@@ -21,6 +21,7 @@ using Game.DataStorage;
using Game.Entities;
using Game.Networking;
using Game.Networking.Packets;
using System;
using System.Collections.Generic;
namespace Game.Scenarios
@@ -153,7 +154,7 @@ namespace Game.Scenarios
return _stepStates[step];
}
public override void SendCriteriaUpdate(Criteria criteria, CriteriaProgress progress, uint timeElapsed, bool timedCompleted)
public override void SendCriteriaUpdate(Criteria criteria, CriteriaProgress progress, TimeSpan timeElapsed, bool timedCompleted)
{
ScenarioProgressUpdate progressUpdate = new();
progressUpdate.CriteriaProgress.Id = criteria.Id;
@@ -163,7 +164,7 @@ namespace Game.Scenarios
if (criteria.Entry.StartTimer != 0)
progressUpdate.CriteriaProgress.Flags = timedCompleted ? 1 : 0u;
progressUpdate.CriteriaProgress.TimeFromStart = timeElapsed;
progressUpdate.CriteriaProgress.TimeFromStart = (uint)timeElapsed.TotalSeconds;
progressUpdate.CriteriaProgress.TimeFromCreate = 0;
SendPacket(progressUpdate);