From ae02056948cc1570a8fac81893817026e1f1f57b Mon Sep 17 00:00:00 2001
From: evanpelle <evanpelle@gmail.com>
Date: Thu, 23 Jan 2025 11:17:26 -0800
Subject: [PATCH] combine ExecutionView & Execution

---
 src/core/GameView.ts  | 2 +-
 src/core/game/Game.ts | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/core/GameView.ts b/src/core/GameView.ts
index 0943582a0..18d5f061a 100644
--- a/src/core/GameView.ts
+++ b/src/core/GameView.ts
@@ -1,6 +1,6 @@
 import { GameUpdates, GameUpdateType, MapPos, MessageType, NameViewData, Player, PlayerActions, PlayerProfile, PlayerUpdate, Unit, UnitUpdate } from './game/Game';
 import { Config } from "./configuration/Config";
-import { Alliance, AllianceRequest, AllPlayers, Cell, DefenseBonus, EmojiMessage, Execution, ExecutionView, Game, Gold, Nation, PlayerID, PlayerInfo, PlayerType, Relation, TerrainType, TerraNullius, Tick, UnitInfo, UnitType } from "./game/Game";
+import { Alliance, AllianceRequest, AllPlayers, Cell, DefenseBonus, EmojiMessage, Game, Gold, Nation, PlayerID, PlayerInfo, PlayerType, Relation, TerrainType, TerraNullius, Tick, UnitInfo, UnitType } from "./game/Game";
 import { ClientID } from "./Schemas";
 import { TerraNulliusImpl } from './game/TerraNulliusImpl';
 import { WorkerClient } from './worker/WorkerClient';
diff --git a/src/core/game/Game.ts b/src/core/game/Game.ts
index a30533028..ab478fba1 100644
--- a/src/core/game/Game.ts
+++ b/src/core/game/Game.ts
@@ -120,14 +120,9 @@ export enum PlayerType {
     FakeHuman = "FAKEHUMAN",
 }
 
-export interface ExecutionView {
+export interface Execution {
     isActive(): boolean
-    // TODO: remove owner
-    owner(): Player
     activeDuringSpawnPhase(): boolean
-}
-
-export interface Execution extends ExecutionView {
     init(mg: Game, ticks: number): void
     tick(ticks: number): void
     owner(): Player