Attempt to fix auto-start-timer issues.

2013-09-20 23:25:38 +02:00
parent 349172b3b6
commit 42d656863f
5 changed files with 63 additions and 49 deletions
@@ -637,11 +637,16 @@ public class ArenaImpl implements Arena
            refund(p);
        }

-        ArenaPlayer ap = arenaPlayerMap.get(p);
        if (inLobby(p)) {
+            ArenaPlayer ap = arenaPlayerMap.get(p);
            if (ap.getArenaClass() != null) {
                limitManager.playerLeftClass(ap.getArenaClass(), ap.getPlayer());
            }
+
+            // Last lobby player leaving? Stop the timer
+            if (lobbyPlayers.size() == 1) {
+                autoStartTimer.stop();
+            }
        }
        
        movePlayerToEntry(p);
@@ -1290,6 +1295,11 @@ public class ArenaImpl implements Arena
        return arenaPlayerMap.values();
    }

+    @Override
+    public AutoStartTimer getAutoStartTimer() {
+        return autoStartTimer;
+    }
+
    /*@Override
    public List<ArenaPlayerStatistics> getArenaPlayerStatistics(Comparator<ArenaPlayerStatistics> comparator)
    {