mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-19 22:09:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash caused by removing arena tags on a new catch

Browse Source
This commit is contained in:
Moka 2024-11-16 22:55:09 +01:00
parent 77b94bf45d
commit b2cec85833
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/field/pokemon.ts
View File

@ -3092,10 +3092,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
} }
lapseTag(tagType: BattlerTagType): boolean { lapseTag(tagType: BattlerTagType): boolean {
const tags = this.summonData?.tags; if (!this.summonData) {
if (isNullOrUndefined(tags)) {
return false; return false;
} }
const tags = this.summonData.tags;
const tag = tags.find(t => t.tagType === tagType); const tag = tags.find(t => t.tagType === tagType);
if (tag && !(tag.lapse(this, BattlerTagLapseType.CUSTOM))) { if (tag && !(tag.lapse(this, BattlerTagLapseType.CUSTOM))) {
tag.onRemove(this); tag.onRemove(this);
@ -3105,6 +3105,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
} }
lapseTags(lapseType: BattlerTagLapseType): void { lapseTags(lapseType: BattlerTagLapseType): void {
if (!this.summonData) {
return;
}
const tags = this.summonData.tags; const tags = this.summonData.tags;
tags.filter(t => lapseType === BattlerTagLapseType.FAINT || ((t.lapseTypes.some(lType => lType === lapseType)) && !(t.lapse(this, lapseType)))).forEach(t => { tags.filter(t => lapseType === BattlerTagLapseType.FAINT || ((t.lapseTypes.some(lType => lType === lapseType)) && !(t.lapse(this, lapseType)))).forEach(t => {
t.onRemove(this); t.onRemove(this);
@ -3113,6 +3116,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
} }
removeTag(tagType: BattlerTagType): boolean { removeTag(tagType: BattlerTagType): boolean {
if (!this.summonData) {
return false;
}
const tags = this.summonData.tags; const tags = this.summonData.tags;
const tag = tags.find(t => t.tagType === tagType); const tag = tags.find(t => t.tagType === tagType);
if (tag) { if (tag) {