Browse Source

Fix to support teleporting into a treasure map on a ship.

Justin Butler 20 years ago
parent
commit
fa4d2a16a3
1 changed files with 4 additions and 2 deletions
  1. 4 2
      direct/src/distributed/DistributedCartesianGrid.py

+ 4 - 2
direct/src/distributed/DistributedCartesianGrid.py

@@ -138,9 +138,11 @@ class DistributedCartesianGrid(DistributedNode.DistributedNode,
     def removeObjectFromGrid(self, av):
     def removeObjectFromGrid(self, av):
         # TODO: WHAT LOCATION SHOULD WE SET THIS TO?
         # TODO: WHAT LOCATION SHOULD WE SET THIS TO?
         #av.reparentTo(hidden)
         #av.reparentTo(hidden)
-        av.detachNode()
+        if (av.getParent().compareTo(self) == 0):
+            # only detach if object is directly parented
+            av.detachNode()
         #av.b_setLocation(0,0)
         #av.b_setLocation(0,0)
-        
+
         
         
     def handleAvatarZoneChange(self, av, zoneId):
     def handleAvatarZoneChange(self, av, zoneId):
         assert self.notify.debug("handleAvatarZoneChange(%s, %s)" % (av.doId, zoneId))
         assert self.notify.debug("handleAvatarZoneChange(%s, %s)" % (av.doId, zoneId))