470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve handling of profileChanges, dont overwrite existing data when adding new objects

Browse Source
This commit is contained in:
Dev 2023-11-30 10:02:00 +00:00
parent 288b7cf654
commit 67f7eb59c5
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
project/src/controllers/HideoutController.ts
View File

@ -329,7 +329,7 @@ export class HideoutController
} }
/** /**
* @param output Objet to send to client * @param output Object to send to client
* @param sessionID Session/player id * @param sessionID Session/player id
* @param areaType Hideout area that had stash added * @param areaType Hideout area that had stash added
* @param hideoutDbData Hideout area that caused addition of stash * @param hideoutDbData Hideout area that caused addition of stash
@ -1137,13 +1137,14 @@ export class HideoutController
// Add all improvemets to output object // Add all improvemets to output object
const improvements = hideoutDbData.stages[profileHideoutArea.level].improvements; const improvements = hideoutDbData.stages[profileHideoutArea.level].improvements;
const timestamp = this.timeUtil.getTimestamp(); const timestamp = this.timeUtil.getTimestamp();
if (!output.profileChanges[sessionId].improvements)
{
output.profileChanges[sessionId].improvements = {};
}
for (const improvement of improvements) for (const improvement of improvements)
{ {
if (!output.profileChanges[sessionId].improvements)
{
output.profileChanges[sessionId].improvements = {};
}
const improvementDetails = { const improvementDetails = {
completed: false, completed: false,
improveCompleteTimestamp: timestamp + improvement.improvementTime, improveCompleteTimestamp: timestamp + improvement.improvementTime,

9
project/src/controllers/QuestController.ts
View File

@ -419,7 +419,12 @@ export class QuestController
activeQuests: [repeatableQuestProfile], activeQuests: [repeatableQuestProfile],
inactiveQuests: [], inactiveQuests: [],
}; };
acceptQuestResponse.profileChanges[sessionID].repeatableQuests = [responseData];
if (!acceptQuestResponse.profileChanges[sessionID].repeatableQuests)
{
acceptQuestResponse.profileChanges[sessionID].repeatableQuests = []
}
acceptQuestResponse.profileChanges[sessionID].repeatableQuests.push(responseData);
return acceptQuestResponse; return acceptQuestResponse;
} }
@ -498,7 +503,7 @@ export class QuestController
this.addTimeLockedQuestsToProfile(pmcData, [...questDelta, ...questsToFail], body.qid); this.addTimeLockedQuestsToProfile(pmcData, [...questDelta, ...questsToFail], body.qid);
// Inform client of quest changes // Inform client of quest changes
completeQuestResponse.profileChanges[sessionID].quests = questDelta; completeQuestResponse.profileChanges[sessionID].quests.push(...questDelta);
// Check if it's a repeatable quest. If so, remove from Quests and repeatable.activeQuests list + move to repeatable.inactiveQuests // Check if it's a repeatable quest. If so, remove from Quests and repeatable.activeQuests list + move to repeatable.inactiveQuests
for (const currentRepeatable of pmcData.RepeatableQuests) for (const currentRepeatable of pmcData.RepeatableQuests)

6
project/src/controllers/RepeatableQuestController.ts
View File

@ -457,7 +457,11 @@ export class RepeatableQuestController
droppedQuestTrader.standing -= changeRequirement.changeStandingCost; droppedQuestTrader.standing -= changeRequirement.changeStandingCost;
// Update client output with new repeatable // Update client output with new repeatable
output.profileChanges[sessionID].repeatableQuests = [repeatableToChange]; if (!output.profileChanges[sessionID].repeatableQuests)
{
output.profileChanges[sessionID].repeatableQuests = [];
}
output.profileChanges[sessionID].repeatableQuests.push(repeatableToChange);
return output; return output;
} }