From 04780afe3100021740ef7f43867f8047954d5a6b Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Mon, 31 May 2010 02:37:17 +0000 Subject: [PATCH] Let's make this work like SceneMoveHandler: if for some reason the client has a *newer* version of the scene than the server, we assume it's an error and make them redownload the full scene. git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@918 c613c5cb-e716-0410-b11b-feb51c14d237 --- .../threerings/whirled/zone/server/ZoneMoveHandler.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/whirled/zone/server/ZoneMoveHandler.java b/src/java/com/threerings/whirled/zone/server/ZoneMoveHandler.java index ba296b36..fe8aeffb 100644 --- a/src/java/com/threerings/whirled/zone/server/ZoneMoveHandler.java +++ b/src/java/com/threerings/whirled/zone/server/ZoneMoveHandler.java @@ -97,8 +97,11 @@ public class ZoneMoveHandler extends AbstractSceneMoveHandler // check to see if they need a newer version of the scene data ZoneService.ZoneMoveListener listener = (ZoneService.ZoneMoveListener)_listener; SceneModel model = scmgr.getScene().getSceneModel(); - if (_version < model.version) { - SceneUpdate[] updates = scmgr.getUpdates(_version); + if (_version != model.version) { + SceneUpdate[] updates = null; + if (_version < model.version) { + updates = scmgr.getUpdates(_version); + } if (updates != null) { listener.moveSucceededWithUpdates(ploid, config, _summary, updates); } else {