From 09fb58dd089a77ecbb9b46bc0946a60d122c1d01 Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 2 Jul 2009 04:06:17 +0000 Subject: [PATCH] band-aid localAvatarDoId --- direct/src/distributed/DistributedSmoothNode.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/direct/src/distributed/DistributedSmoothNode.py b/direct/src/distributed/DistributedSmoothNode.py index 7ed736479b..aff5189aba 100644 --- a/direct/src/distributed/DistributedSmoothNode.py +++ b/direct/src/distributed/DistributedSmoothNode.py @@ -359,7 +359,8 @@ class DistributedSmoothNode(DistributedNode.DistributedNode, if howFarFuture - chug >= MaxFuture: # Too far off; advise the other client of our clock information. if globalClockDelta.getUncertainty() != None and \ - realTime - self.lastSuggestResync >= MinSuggestResync: + realTime - self.lastSuggestResync >= MinSuggestResync and \ + hasattr(self.cr, 'localAvatarDoId'): self.lastSuggestResync = realTime timestampB = globalClockDelta.localToNetworkTime(realTime) serverTime = realTime - globalClockDelta.getDelta() @@ -459,7 +460,8 @@ class DistributedSmoothNode(DistributedNode.DistributedNode, if (not other): assert self.notify.info( "Warning: couldn't find the avatar %d" % (avId)) - elif hasattr(other, "d_returnResync"): + elif hasattr(other, "d_returnResync") and \ + hasattr(self.cr, 'localAvatarDoId'): realTime = globalClock.getRealTime() serverTime = realTime - globalClockDelta.getDelta() assert self.notify.info(