fix server exceptions (#1694)

keldaanCommunity · Apr 30, 2024 · f225629 · f225629
1 parent 02aae7a
commit f225629
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/app/core/evolution-rules.ts b/app/core/evolution-rules.ts
@@ -12,7 +12,7 @@ import { values } from "../utils/schemas"
 type DivergentEvolution = (
   pokemon: Pokemon,
   player: Player,
-  ...aditionalArgs: any[]
+  ...aditionalArgs: unknown[]
 ) => Pkm
 
 export abstract class EvolutionRule {
@@ -169,7 +169,7 @@ export class ItemEvolutionRule extends EvolutionRule {
 
   constructor(
     itemsTriggeringEvolution: Item[],
-    divergentEvolution?: (pokemon: Pokemon, player: Player, item: Item) => Pkm
+    divergentEvolution?: DivergentEvolution
   ) {
     super(divergentEvolution)
     this.itemsTriggeringEvolution = itemsTriggeringEvolution

diff --git a/app/core/pokemon-entity.ts b/app/core/pokemon-entity.ts
@@ -1225,15 +1225,15 @@ export class PokemonEntity extends Schema implements IPokemonEntity {
       }, 16) // delay to next tick, targeting 60 ticks per second
     }
 
-    if (this.passive === Passive.CORSOLA) {
+    if (this.passive === Passive.CORSOLA && this.player) {
       const galarCorsola = this.refToBoardPokemon.evolutionRule.evolve(
         this.refToBoardPokemon as Pokemon,
-        this.player!,
+        this.player,
         this.simulation.stageLevel
       )
       galarCorsola.evolutionRule.tryEvolve(
         galarCorsola,
-        this.player!,
+        this.player,
         this.simulation.stageLevel
       )
     }

diff --git a/app/models/colyseus-models/pokemon.ts b/app/models/colyseus-models/pokemon.ts
@@ -5401,6 +5401,7 @@ function updateCastform(pokemon: Pokemon, weather: Weather, player: Player) {
   }
 
   if (pokemon.name === weatherForm) return
+  if(!player) return
 
   const newPokemon = PokemonFactory.createPokemonFromName(weatherForm, player)
   pokemon.items.forEach((item) => {
@@ -5427,7 +5428,10 @@ export class Castform extends Pokemon {
   passive = Passive.CASTFORM
   attackSprite = AttackSprite.PSYCHIC_RANGE
 
-  beforeSimulationStart({ weather, player }) {
+  beforeSimulationStart({
+    weather,
+    player
+  }: { weather: Weather; player: Player }) {
     updateCastform(this, weather, player)
   }
 }
@@ -5450,7 +5454,10 @@ export class CastformSun extends Pokemon {
   passive = Passive.CASTFORM
   attackSprite = AttackSprite.DRAGON_RANGE
 
-  beforeSimulationStart({ weather, player }) {
+  beforeSimulationStart({
+    weather,
+    player
+  }: { weather: Weather; player: Player }) {
     updateCastform(this, weather, player)
   }
 }
@@ -5473,7 +5480,10 @@ export class CastformRain extends Pokemon {
   passive = Passive.CASTFORM
   attackSprite = AttackSprite.WATER_RANGE
 
-  beforeSimulationStart({ weather, player }) {
+  beforeSimulationStart({
+    weather,
+    player
+  }: { weather: Weather; player: Player }) {
     updateCastform(this, weather, player)
   }
 }
@@ -5496,7 +5506,10 @@ export class CastformHail extends Pokemon {
   passive = Passive.CASTFORM
   attackSprite = AttackSprite.ICE_RANGE
 
-  beforeSimulationStart({ weather, player }) {
+  beforeSimulationStart({
+    weather,
+    player
+  }: { weather: Weather; player: Player }) {
     updateCastform(this, weather, player)
   }
 }