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

Null guard when sold item locale key not found

Browse Source
This commit is contained in:
Dev 2023-05-29 16:20:41 +01:00
parent 88a854c5ca
commit 0cd28865eb
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
project/src/helpers/RagfairOfferHelper.ts
View File

@ -290,6 +290,13 @@ export class RagfairOfferHelper
this.ragfairOfferService.removeOfferById(offerId); this.ragfairOfferService.removeOfferById(offerId);
} }
/**
* Complete the selling of players' offer
* @param sessionID Session id
* @param offer Sold offer details
* @param boughtAmount Amount item was purchased for
* @returns Client response
*/
protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse
{ {
const itemTpl = offer.items[0]._tpl; const itemTpl = offer.items[0]._tpl;
@ -326,7 +333,6 @@ export class RagfairOfferHelper
} }
let foundNewItems = true; let foundNewItems = true;
while (foundNewItems) while (foundNewItems)
{ {
foundNewItems = false; foundNewItems = false;
@ -335,7 +341,6 @@ export class RagfairOfferHelper
for (const id of idsToRemove) for (const id of idsToRemove)
{ {
const newIds = offer.items.filter(i => !idsToRemove.includes(i._id) && idsToRemove.includes(i.parentId)).map(i => i._id); const newIds = offer.items.filter(i => !idsToRemove.includes(i._id) && idsToRemove.includes(i.parentId)).map(i => i._id);
if (newIds.length > 0) if (newIds.length > 0)
{ {
foundNewItems = true; foundNewItems = true;
@ -350,7 +355,7 @@ export class RagfairOfferHelper
} }
} }
// assemble the payment items // Assemble the payment item(s)
for (const requirement of offer.requirements) for (const requirement of offer.requirements)
{ {
// Create an item template item // Create an item template item
@ -382,13 +387,19 @@ export class RagfairOfferHelper
// Generate a message to inform that item was sold // Generate a message to inform that item was sold
const globalLocales = this.localeService.getLocaleDb(); const globalLocales = this.localeService.getLocaleDb();
const messageTpl = globalLocales[RagfairOfferHelper.goodSoldTemplate]; const soldMessageLocaleGuid = globalLocales[RagfairOfferHelper.goodSoldTemplate];
if (!soldMessageLocaleGuid)
{
this.logger.error(`Unable to find locale with key of ${RagfairOfferHelper.goodSoldTemplate}`);
}
// Used to replace tokens in sold message sent to player
const tplVars: ISystemData = { const tplVars: ISystemData = {
soldItem: globalLocales[`${itemTpl} Name`] || itemTpl, soldItem: globalLocales[`${itemTpl} Name`] || itemTpl,
buyerNickname: this.ragfairServerHelper.getNickname(this.hashUtil.generate()), buyerNickname: this.ragfairServerHelper.getNickname(this.hashUtil.generate()),
itemCount: boughtAmount itemCount: boughtAmount
}; };
const messageText = messageTpl.replace(/{\w+}/g, (matched) => const messageText = soldMessageLocaleGuid.replace(/{\w+}/g, (matched) =>
{ {
return tplVars[matched.replace(/{|}/g, "")]; return tplVars[matched.replace(/{|}/g, "")];
}); });
@ -401,8 +412,8 @@ export class RagfairOfferHelper
handbookId: itemTpl handbookId: itemTpl
}; };
this.dialogueHelper.addDialogueMessage(Traders.RAGMAN, messageContent, sessionID, itemsToSend); this.dialogueHelper.addDialogueMessage(Traders.RAGMAN, messageContent, sessionID, itemsToSend);
return this.eventOutputHolder.getOutput(sessionID); return this.eventOutputHolder.getOutput(sessionID);
} }