diff --git a/logic/Gaming/Game.cs b/logic/Gaming/Game.cs index df595aae..046d590c 100755 --- a/logic/Gaming/Game.cs +++ b/logic/Gaming/Game.cs @@ -165,7 +165,7 @@ public bool InstallModule(long teamID, long shipID, ModuleType moduleType) if (!gameMap.Timer.IsGaming) return false; Ship? ship = gameMap.FindShipInPlayerID(teamID, shipID); - if (ship != null) + if (ship != null && ship.IsRemoved == false) return moduleManager.InstallModule(ship, moduleType); return false; } @@ -197,7 +197,7 @@ public bool Recycle(long teamID, long shipID) if (!gameMap.Timer.IsGaming) return false; Ship? ship = gameMap.FindShipInPlayerID(teamID, shipID); - if (ship != null) + if (ship != null && ship.IsRemoved == false) { bool validRecyclePoint = false; foreach (XY recyclePoint in teamList[(int)ship.TeamID].BirthPointList) @@ -212,7 +212,7 @@ public bool Recycle(long teamID, long shipID) { return shipManager.Recycle(ship); } - } + } return false; } public bool Repair(long teamID, long shipID)