TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

don't treat duplicate removes as errors on live

Browse Source
This commit is contained in:
Darren Ranalli 2006-11-30 22:06:06 +00:00
parent ed32a262f4
commit 214ade7c18
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
direct/src/distributed/DoHierarchy.py
View File

@ -87,10 +87,16 @@ class DoHierarchy:
from direct.showbase.PythonUtil import StackTrace from direct.showbase.PythonUtil import StackTrace
self.notify.info('deleteObjectLocation(DistributedToon %s)(%s, %s): %s' % (do.doId, parentId, zoneId, StackTrace().compact())) self.notify.info('deleteObjectLocation(DistributedToon %s)(%s, %s): %s' % (do.doId, parentId, zoneId, StackTrace().compact()))
doId = do.doId doId = do.doId
if doId not in self._allDoIds: # until we figure out why Toontown is crashing with duplicate Toon generates, don't do the check on LIVE
self.notify.error( try:
'deleteObjectLocation(%s %s) not in _allDoIds; duplicate delete()? or invalid previous location on a new object?' % ( isLive = base.cr.isLive()
do.__class__.__name__, do.doId)) except:
isLive = True
if not isLive:
if doId not in self._allDoIds:
self.notify.error(
'deleteObjectLocation(%s %s) not in _allDoIds; duplicate delete()? or invalid previous location on a new object?' % (
do.__class__.__name__, do.doId))
# jbutler: temp hack to get by the assert, this will be fixed soon # jbutler: temp hack to get by the assert, this will be fixed soon
if (doId not in self._allDoIds): if (doId not in self._allDoIds):
return return