From fc37f4f355d0f90b60f3be60de324ebad7d852b3 Mon Sep 17 00:00:00 2001 From: Josh Wilson Date: Mon, 26 Jan 2009 00:32:25 +0000 Subject: [PATCH] postponing parent present assert until after deferred generates --- direct/src/distributed/ClientRepositoryBase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/direct/src/distributed/ClientRepositoryBase.py b/direct/src/distributed/ClientRepositoryBase.py index f4b0cec005..3f33223911 100644 --- a/direct/src/distributed/ClientRepositoryBase.py +++ b/direct/src/distributed/ClientRepositoryBase.py @@ -180,12 +180,11 @@ class ClientRepositoryBase(ConnectionRepository): def handleGenerateWithRequiredOther(self, di): parentId = di.getUint32() zoneId = di.getUint32() - assert parentId == self.GameGlobalsId or parentId in self.doId2do # Get the class Id classId = di.getUint16() # Get the DO Id doId = di.getUint32() - + dclass = self.dclassesByNumber[classId] deferrable = getattr(dclass.getClassDef(), 'deferrable', False) @@ -225,6 +224,7 @@ class ClientRepositoryBase(ConnectionRepository): def __doGenerate(self, parentId, zoneId, classId, doId, di): # Look up the dclass + assert parentId == self.GameGlobalsId or parentId in self.doId2do dclass = self.dclassesByNumber[classId] assert(self.notify.debug("performing generate for %s %s" % (dclass.getName(), doId))) dclass.startGenerate()