IAmChrisAMA
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash related to null text

pull/57/head
Flashfyre 2024-04-07 19:11:34 -04:00
parent 07aac12a2b
commit 9ef13e5f67
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/ui/message-ui-handler.ts
View File

@ -48,27 +48,29 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
text = text.slice(0, actionMatch.index) + text.slice(actionMatch.index + actionMatch[2].length + 4); text = text.slice(0, actionMatch.index) + text.slice(actionMatch.index + actionMatch[2].length + 4);
} }
// Predetermine overflow line breaks to avoid words breaking while displaying if (text) {
const textWords = text.split(' '); // Predetermine overflow line breaks to avoid words breaking while displaying
let lastLineCount = 1; const textWords = text.split(' ');
let newText = textWords[0]; let lastLineCount = 1;
for (let w = 1; w < textWords.length; w++) { let newText = textWords[0];
const nextWordText = `${newText} ${textWords[w]}`; for (let w = 1; w < textWords.length; w++) {
if (textWords[w].includes('\n')) { const nextWordText = `${newText} ${textWords[w]}`;
newText = nextWordText; if (textWords[w].includes('\n')) {
lastLineCount++;
} else {
const lineCount = this.message.runWordWrap(nextWordText).split(/\n/g).length;
if (lineCount > lastLineCount) {
lastLineCount = lineCount;
newText = `${newText}\n${textWords[w]}`;
} else
newText = nextWordText; newText = nextWordText;
lastLineCount++;
} else {
const lineCount = this.message.runWordWrap(nextWordText).split(/\n/g).length;
if (lineCount > lastLineCount) {
lastLineCount = lineCount;
newText = `${newText}\n${textWords[w]}`;
} else
newText = nextWordText;
}
} }
text = newText;
} }
text = newText;
if (this.textTimer) { if (this.textTimer) {
this.textTimer.remove(); this.textTimer.remove();
if (this.textCallbackTimer) if (this.textCallbackTimer)