From 6e07b60f48c8bb01145092ac331b6e40be332245 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Thu, 11 Aug 2005 22:33:22 +0000 Subject: [PATCH] Fixed code to detect invalid updates to not totally hose everything: it was trying to print where() which failed because it was doing so before all the values were intialized. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3680 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/whirled/server/SceneManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/java/com/threerings/whirled/server/SceneManager.java b/src/java/com/threerings/whirled/server/SceneManager.java index ed4b40087..c219d6d5d 100644 --- a/src/java/com/threerings/whirled/server/SceneManager.java +++ b/src/java/com/threerings/whirled/server/SceneManager.java @@ -66,22 +66,22 @@ public class SceneManager extends PlaceManager protected void setSceneData (Scene scene, UpdateList updates, SceneRegistry screg) { + _scene = scene; + _screg = screg; + _updates = updates; + // make sure the list and our version of the scene are in // accordance - if (!updates.validate(scene.getVersion())) { + if (!_updates.validate(scene.getVersion())) { Log.warning("Provided with invalid updates; flushing " + "[where=" + where() + ", sceneId=" + scene.getId() + "]."); // clear out the update list as it will not allow us to bring // clients up to date with our current scene version; instead // they'll have to download the whole thing - updates = new UpdateList(); + _updates = new UpdateList(); } - _scene = scene; - _screg = screg; - _updates = updates; - // let derived classes react to the receipt of scene data gotSceneData(); }