From e76a54c18f4564aaecaf1b07c2e843f41ef24b05 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Thu, 13 Jul 2006 22:15:37 +0000 Subject: [PATCH] If a client somehow has a higher version scene than we do, tell them all about the current scene model instead of informing them that the version they have is OK. It's not ok! git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@25 c613c5cb-e716-0410-b11b-feb51c14d237 --- .../com/threerings/whirled/server/SceneProvider.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/java/com/threerings/whirled/server/SceneProvider.java b/src/java/com/threerings/whirled/server/SceneProvider.java index d300a226..cd63d6e8 100644 --- a/src/java/com/threerings/whirled/server/SceneProvider.java +++ b/src/java/com/threerings/whirled/server/SceneProvider.java @@ -135,9 +135,12 @@ public class SceneProvider // check to see if they need a newer version of the scene data SceneModel model = scmgr.getScene().getSceneModel(); - if (sceneVersion < model.version) { - // try getting updates - SceneUpdate[] updates = scmgr.getUpdates(sceneVersion); + if (sceneVersion != model.version) { + SceneUpdate[] updates = null; + if (sceneVersion < model.version) { + // try getting updates to bring the client to the right version + updates = scmgr.getUpdates(sceneVersion); + } if (updates != null) { listener.moveSucceededWithUpdates(ploid, config, updates); } else {