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

don't crash out with duplicate doId on LIVE

Browse Source
This commit is contained in:
Darren Ranalli 2006-11-21 04:09:25 +00:00
parent bdf6973526
commit 0ca5963d3b
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

@ -60,10 +60,16 @@ class DoHierarchy:
def storeObjectLocation(self, do, parentId, zoneId):
doId = do.doId
if doId in self._allDoIds:
self.notify.error(
'storeObjectLocation(%s %s) already in _allDoIds; duplicate generate()? or didn\'t clean up previous instance of DO?' % (
do.__class__.__name__, do.doId))
# until we figure out why Toontown is crashing with duplicate Toon generates, don't do the check on LIVE
try:
isLive = base.cr.isLive()
except:
isLive = True
if not isLive:
if doId in self._allDoIds:
self.notify.error(
'storeObjectLocation(%s %s) already in _allDoIds; duplicate generate()? or didn\'t clean up previous instance of DO?' % (
do.__class__.__name__, do.doId))
parentZoneDict = self._table.setdefault(parentId, {})
zoneDoSet = parentZoneDict.setdefault(zoneId, set())
zoneDoSet.add(doId)