called destroySpace, crash. (kbengine#52)

kbengine · kbengine · commit e02ffd2d9d08 · 2014-07-19T18:54:53.000+08:00
diff --git a/kbe/src/server/cellapp/entity.hpp b/kbe/src/server/cellapp/entity.hpp
@@ -467,6 +467,7 @@ class Entity : public script::ScriptObject
 		��ȡentity���ڽڵ�
 	*/
 	INLINE EntityCoordinateNode* pEntityCoordinateNode()const;
+	INLINE void pEntityCoordinateNode(EntityCoordinateNode* pNode);
 
 	/**
 		��װж�ؽڵ�
diff --git a/kbe/src/server/cellapp/entity.ipp b/kbe/src/server/cellapp/entity.ipp
@@ -174,6 +174,12 @@ INLINE EntityCoordinateNode* Entity::pEntityCoordinateNode()const
 	return pEntityCoordinateNode_;
 }
 
+//-------------------------------------------------------------------------------------
+INLINE void Entity::pEntityCoordinateNode(EntityCoordinateNode* pNode)
+{
+	pEntityCoordinateNode_ = pNode;
+}
+
 //-------------------------------------------------------------------------------------
 INLINE void Entity::isOnGround(bool v)
 {
diff --git a/kbe/src/server/cellapp/space.cpp b/kbe/src/server/cellapp/space.cpp
@@ -345,7 +345,20 @@ bool Space::destroy(ENTITY_ID entityID)
 
 	// ������ٴ�����
 	if(creator)
-		creator->destroyEntity();
+	{
+		if(Cellapp::getSingleton().findEntity(creator->getID()) != NULL)
+		{
+			creator->destroyEntity();
+		}
+		else
+		{
+			// ֮���Ի���������Ϊ����spaceEntity�ڵ���destroy���ٵ�ʱ��onDestroy�е�����destroySpace
+			// ��ô�ͻ������spaceEntity-destroy�����е��������������creator->destroyEntity()
+			// ��ʱ�ͻ����EntityApp::destroyEntity: not found.
+			// Ȼ����spaceEntity������ʱ������pEntityCoordinateNode_������� ����Ӧ������ΪNULL��
+			creator->pEntityCoordinateNode(NULL);
+		}
+	}
 
 	pNavHandle_.clear();
 	entities_.clear();

-Original file line number
+Diff line change
 		获取entity所在节点
 	*/
 	INLINE EntityCoordinateNode* pEntityCoordinateNode()const;
 +	INLINE void pEntityCoordinateNode(EntityCoordinateNode* pNode);
 	/**
 		安装卸载节点
Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,12 @@ INLINE EntityCoordinateNode* Entity::pEntityCoordinateNode()const`
`174`	`174`	`return pEntityCoordinateNode_;`
`175`	`175`	`}`
`176`	`176`
	`177`	`+//-------------------------------------------------------------------------------------`
	`178`	`+INLINE void Entity::pEntityCoordinateNode(EntityCoordinateNode* pNode)`
	`179`	`+{`
	`180`	`+ pEntityCoordinateNode_ = pNode;`
	`181`	`+}`
	`182`	`+`
`177`	`183`	`//-------------------------------------------------------------------------------------`
`178`	`184`	`INLINE void Entity::isOnGround(bool v)`
`179`	`185`	`{`