RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

band-aid localAvatarDoId

This commit is contained in:
David Rose 2009-07-02 04:06:17 +00:00
parent dd84f35bbe
commit 09fb58dd08
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
direct/src/distributed/DistributedSmoothNode.py
View File

@ -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(