From 59c10f5d71043f780662e20eff7359e6288f98d7 Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Tue, 20 Jun 2023 18:37:40 -0700
Subject: [PATCH] Remove save compat hacks for saves from 7.

Save compat was broken by pydcs anyway, so these now do nothing but hide
initialization bugs.
---
 game/ato/flightplans/flightplan.py | 7 -------
 game/squadrons/squadron.py         | 9 +--------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/game/ato/flightplans/flightplan.py b/game/ato/flightplans/flightplan.py
index c9592b65..29b0ee05 100644
--- a/game/ato/flightplans/flightplan.py
+++ b/game/ato/flightplans/flightplan.py
@@ -21,7 +21,6 @@ from .planningerror import PlanningError
 from ..flightwaypointtype import FlightWaypointType
 from ..starttype import StartType
 from ..traveltime import GroundSpeed, TravelTime
-from ...savecompat import has_save_compat_for
 
 if TYPE_CHECKING:
     from game.dcs.aircrafttype import FuelConsumption
@@ -65,12 +64,6 @@ class FlightPlan(ABC, Generic[LayoutT]):
         self.layout = layout
         self.tot_offset = self.default_tot_offset()
 
-    @has_save_compat_for(7)
-    def __setstate__(self, state: dict[str, Any]) -> None:
-        if "tot_offset" not in state:
-            state["tot_offset"] = self.default_tot_offset()
-        self.__dict__.update(state)
-
     @property
     def package(self) -> Package:
         return self.flight.package
diff --git a/game/squadrons/squadron.py b/game/squadrons/squadron.py
index 0454a06c..2974e729 100644
--- a/game/squadrons/squadron.py
+++ b/game/squadrons/squadron.py
@@ -5,7 +5,7 @@ import random
 from collections.abc import Iterable
 from dataclasses import dataclass, field
 from datetime import datetime
-from typing import Optional, Sequence, TYPE_CHECKING, Any
+from typing import Optional, Sequence, TYPE_CHECKING
 from uuid import uuid4, UUID
 
 from faker import Faker
@@ -14,7 +14,6 @@ from game.ato import Flight, FlightType, Package
 from game.settings import AutoAtoBehavior, Settings
 from .pilot import Pilot, PilotStatus
 from ..db.database import Database
-from ..savecompat import has_save_compat_for
 from ..utils import meters
 
 if TYPE_CHECKING:
@@ -65,12 +64,6 @@ class Squadron:
     untasked_aircraft: int = field(init=False, hash=False, compare=False, default=0)
     pending_deliveries: int = field(init=False, hash=False, compare=False, default=0)
 
-    @has_save_compat_for(7)
-    def __setstate__(self, state: dict[str, Any]) -> None:
-        if "id" not in state:
-            state["id"] = uuid4()
-        self.__dict__.update(state)
-
     def __str__(self) -> str:
         if self.nickname is None:
             return self.name