diff --git a/src/java/com/threerings/parlor/game/server/GameManager.java b/src/java/com/threerings/parlor/game/server/GameManager.java index 3b52a40f..94c0e716 100644 --- a/src/java/com/threerings/parlor/game/server/GameManager.java +++ b/src/java/com/threerings/parlor/game/server/GameManager.java @@ -783,13 +783,11 @@ public class GameManager extends PlaceManager _gameconfig = (GameConfig)_config; // start up our tick interval - _tickInterval = new Interval(_omgr) { - @Override - public void expired () { + _tickInterval = _omgr.newInterval(new Runnable() { + public void run () { tick(System.currentTimeMillis()); } - }; - _tickInterval.schedule(TICK_DELAY, true); + }).schedule(TICK_DELAY, true); // configure our AIs for (int ii = 0; ii < _gameconfig.ais.length; ii++) { @@ -1115,13 +1113,11 @@ public class GameManager extends PlaceManager protected void startAITicker () { if (_aiTicker == null) { - _aiTicker = new Interval(_omgr) { - @Override - public void expired () { + _aiTicker = _omgr.newInterval(new Runnable() { + public void run () { tickAIs(); } - }; - _aiTicker.schedule(AI_TICK_DELAY, true); + }).schedule(AI_TICK_DELAY, true); } } @@ -1272,6 +1268,7 @@ public class GameManager extends PlaceManager protected void gameWasCancelled () { // nothing to do by default + stopAITicker(); } /** diff --git a/src/java/com/threerings/parlor/tourney/server/TourniesManager.java b/src/java/com/threerings/parlor/tourney/server/TourniesManager.java index b76ba735..608cc480 100644 --- a/src/java/com/threerings/parlor/tourney/server/TourniesManager.java +++ b/src/java/com/threerings/parlor/tourney/server/TourniesManager.java @@ -30,7 +30,6 @@ import com.google.inject.Injector; import com.google.inject.Singleton; import com.samskivert.io.PersistenceException; -import com.samskivert.util.Interval; import com.samskivert.util.Lifecycle; import com.threerings.presents.client.InvocationService; @@ -48,7 +47,7 @@ import static com.threerings.parlor.Log.log; */ @Singleton public abstract class TourniesManager - implements TourniesProvider, Lifecycle.Component + implements TourniesProvider, Lifecycle.InitComponent { @Inject public TourniesManager (Lifecycle cycle) { @@ -60,18 +59,11 @@ public abstract class TourniesManager { loadTourneyConfigs(); - _interval = new Interval(_omgr) { - @Override public void expired () { + _omgr.newInterval(new Runnable() { + public void run () { updateTournies(); } - }; - _interval.schedule(getIntervalDelay(), true); - } - - // from interface Lifecycle.Component - public void shutdown () - { - _interval.cancel(); + }).schedule(getIntervalDelay(), true); } // from interface TourniesService @@ -139,9 +131,6 @@ public abstract class TourniesManager */ protected abstract long getIntervalDelay (); - /** The interval which updates loaded tournies. */ - protected Interval _interval; - /** Count to provide a unique key to tournies as they're created. */ protected int _tourneyCount;