Fixes #109: Ensure that 'remove player from interactable' happens BEF…

…ORE removing from the town
neu-se · Dec 14, 2022 · d9ce5bd · d9ce5bd
1 parent 6904d83
commit d9ce5bd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/townService/src/town/Town.ts b/townService/src/town/Town.ts
@@ -165,11 +165,11 @@ export default class Town {
    * @param session PlayerSession to destroy
    */
   private _removePlayer(player: Player): void {
-    this._players = this._players.filter(p => p.id !== player.id);
-    this._broadcastEmitter.emit('playerDisconnect', player.toPlayerModel());
     if (player.location.interactableID) {
       this._removePlayerFromInteractable(player);
     }
+    this._players = this._players.filter(p => p.id !== player.id);
+    this._broadcastEmitter.emit('playerDisconnect', player.toPlayerModel());
   }
 
   /**