From 1b515b56ee64656876e40da3b57de8278f3257cd Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Sat, 11 Oct 2003 03:47:54 +0000 Subject: [PATCH] protect against distrib entities destroyed after their level --- direct/src/level/Entity.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/direct/src/level/Entity.py b/direct/src/level/Entity.py index aa52552a85..5ba635bcd1 100755 --- a/direct/src/level/Entity.py +++ b/direct/src/level/Entity.py @@ -26,7 +26,14 @@ class Entity(DirectObject): return 'ent%s(%s)' % (self.entId, self.level.getEntityType(self.entId)) def destroy(self): - self.level.onEntityDestroy(self.entId) + Entity.notify.debug('Entity.destroy() %s' % self.entId) + # client-side distributed entities might be doing this after + # the level has been been destroyed...? + if self.level.isInitialized(): + self.level.onEntityDestroy(self.entId) + else: + Entity.notify.warning('Entity %s destroyed after level??' % + self.entid) del self.level del self.entId