fix(server): combat crash

Kaetram · Sep 17, 2023 · 7fdccfd · 7fdccfd
1 parent e9aad9b
commit 7fdccfd
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/packages/server/src/game/entity/character/combat/combat.ts b/packages/server/src/game/entity/character/combat/combat.ts
@@ -114,7 +114,12 @@ export default class Combat {
 
     private handleLoop(): void {
         // No target or target is dead, stop combat.
-        if (!this.character.hasTarget() || this.character.target?.isDead()) return this.stop();
+        if (
+            !this.character.hasTarget() ||
+            this.character.target?.isDead() ||
+            this.character.teleporting
+        )
+            return this.stop();
 
         // Prevent combat loop from persisting during PVP flag changes.
         if (
@@ -124,9 +129,6 @@ export default class Combat {
         )
             return this.stop();
 
-        // Do not attack while teleporting.
-        if (this.character.teleporting) return;
-
         this.loopCallback?.(this.lastAttack);
 
         this.checkTargetPosition();