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

removed DistributedToon/isLive checks now that DelayDeleted objects remove themselves from the repository properly

Browse Source
This commit is contained in:
Darren Ranalli 2008-02-21 01:24:33 +00:00
parent fb964c3d16
commit 3882d21189
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,21 +59,11 @@ class DoHierarchy:
return r
def storeObjectLocation(self, do, parentId, zoneId):
if do.__class__.__name__ == 'DistributedToon':
if not base.cr.isLive():
from direct.showbase.PythonUtil import StackTrace
self.notify.info('storeObjectLocation(DistributedToon %s)(%s, %s): %s' % (do.doId, parentId, zoneId, StackTrace().compact()))
doId = 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))
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)
@ -82,21 +72,11 @@ class DoHierarchy:
do.__class__.__name__, doId, parentId, zoneId))
def deleteObjectLocation(self, do, parentId, zoneId):
if do.__class__.__name__ == 'DistributedToon':
if not base.cr.isLive():
from direct.showbase.PythonUtil import StackTrace
self.notify.info('deleteObjectLocation(DistributedToon %s)(%s, %s): %s' % (do.doId, parentId, zoneId, StackTrace().compact()))
doId = do.doId
# until we figure out why Toontown is crashing with duplicate deletes, don't do the check on LIVE
try:
isLive = base.cr.isLive()
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))
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
if (doId not in self._allDoIds):
return