Merge pull request #5 from AshSimmonds/main

player's collisionMask didn't react to spells
danprince · Nov 16, 2022 · 80e6052 · 80e6052
2 parents 1986b98 + d28fd8f
commit 80e6052
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/actions.ts b/src/actions.ts
@@ -32,8 +32,6 @@ export function Die(object: GameObject, killer?: GameObject) {
       .burst(2 + randomInt(3))
       .remove();
 
-    object.onDeath(death);
-
     for (let ritual of game.rituals) {
       ritual.onDeath?.(death);
     }
@@ -45,6 +43,8 @@ export function Die(object: GameObject, killer?: GameObject) {
     game.addSouls(death.souls);
   }
 
+  object.onDeath(death);
+
   game.despawn(object);
 }
 

diff --git a/src/objects.ts b/src/objects.ts
@@ -27,10 +27,8 @@ export function Player() {
   player.onCollision = unit => {
     Damage(player, unit.hp);
     Die(unit);
-    if (player.hp <= 0) {
-      window.location = window.location;
-    }
   };
+  player.onDeath = () => window.location = window.location;
   return player;
 }