timer shortening

Author: Licho1

Shared/PlasmaShared/GlobalConst.cs

@@ -209,9 +209,9 @@ static void SetMode(ModeType newMode)
         public const int MinNetKarmaToVote = -30;
         public const int PostVoteHideThreshold = -6;
         public const bool OnlyAdminsSeePostVoters = false;
-        public const int PlanetWarsMinutesToAttackIfNoOption = 2;
-        public const int PlanetWarsMinutesToAttack = 5;
-        public const int PlanetWarsMinutesToAccept = 10;
+        public const int PlanetWarsMinutesToAttackIfNoOption = 1;
+        public const int PlanetWarsMinutesToAttack = 1;
+        public const int PlanetWarsMinutesToAccept = 2;
         public const int PlanetWarsDropshipsStayForMinutes = 2*60;
         public const int PlanetWarsMaxTeamsize = 4;
         public const double PlanetWarsDefenderWinKillCcMultiplier = 0.2;

ZkLobbyServer/SpringieInterface/PlanetWarsMatchMaker.cs

@@ -66,6 +66,10 @@ public PlanetWarsMatchMaker(ZkLobbyServer.ZkLobbyServer server)
                 DefenderVotes = dbState.DefenderVotes ?? new Dictionary<int, List<string>>();
                 AttackerSideChangeTime = dbState.AttackerSideChangeTime;
                 RunningBattles = dbState.RunningBattles ?? new Dictionary<int, AttackOption>();
+
+                // sanity: if PhaseStartTime is in the future or too old, reset to now
+                if (PhaseStartTime > DateTime.UtcNow || PhaseStartTime < DateTime.UtcNow.AddHours(-1))
+                    PhaseStartTime = DateTime.UtcNow;
             }
             else
             {