跨cellapp的teleport实现

kbengine#49

Author: kbengine

kbe/src/server/cellapp/cellapp.cpp

@@ -1622,13 +1622,16 @@ void Cellapp::reqTeleportToCellApp(Network::Channel* pChannel, MemoryStream& s)
 	e->setPositionAndDirection(pos, dir);
 
 	// 进入新space之前必须通知客户端leaveSpace
-	Network::Bundle* pSendBundle = Network::Bundle::ObjPool().createObject();
-	Network::Bundle* pForwardBundle = Network::Bundle::ObjPool().createObject();
-	(*pForwardBundle).newMessage(ClientInterface::onEntityLeaveSpace);
-	(*pForwardBundle) << e->id();
-	NETWORK_ENTITY_MESSAGE_FORWARD_CLIENT(e->id(), (*pSendBundle), (*pForwardBundle));
-	e->clientMailbox()->postMail(pSendBundle);
-	Network::Bundle::ObjPool().reclaimObject(pForwardBundle);
+	if(e->clientMailbox())
+	{
+		Network::Bundle* pSendBundle = Network::Bundle::ObjPool().createObject();
+		Network::Bundle* pForwardBundle = Network::Bundle::ObjPool().createObject();
+		(*pForwardBundle).newMessage(ClientInterface::onEntityLeaveSpace);
+		(*pForwardBundle) << e->id();
+		NETWORK_ENTITY_MESSAGE_FORWARD_CLIENT(e->id(), (*pSendBundle), (*pForwardBundle));
+		e->clientMailbox()->postMail(pSendBundle);
+		Network::Bundle::ObjPool().reclaimObject(pForwardBundle);
+	}
 
 	// 进入新的space中
 	space->addEntityAndEnterWorld(e);

kbe/src/server/cellapp/controllers.cpp

@@ -56,7 +56,15 @@ bool Controllers::add(Controller* pController)
 {
 	uint32 id = pController->id();
 	if(id == 0)
+	{
 		id = freeID();
+	}
+	else
+	{
+		// Ë¢ÐÂid¼ÆÊýÆ÷
+		if(lastid_ <= id)
+			lastid_ = id + 1;
+	}
 
 	objects_[id].reset(pController);
 	pController->id(id);
@@ -86,8 +94,7 @@ bool Controllers::remove(uint32 id)
 //-------------------------------------------------------------------------------------
 void Controllers::addToStream(KBEngine::MemoryStream& s)
 {
-	uint32 size = 0;
-	size = objects_.size();
+	uint32 size = objects_.size();
 	s << lastid_ << size;
 
 	CONTROLLERS_MAP::iterator iter = objects_.begin();
@@ -129,7 +136,9 @@ void Controllers::createFromStream(KBEngine::MemoryStream& s)
 		};
 
 		pController->type(type);
-		objects_[pController->id()].reset(pController);
+		pController->createFromStream(s);
+
+		add(pController);
 	}
 }
 

kbe/src/server/cellapp/entity.cpp

@@ -2987,8 +2987,8 @@ void Entity::createMoveHandlerFromStream(KBEngine::MemoryStream& s)
 		stopMove();
 
 		pMoveController_ = new MoveController(this);
-		pControllers_->objects()[pMoveController_->id()].reset(pMoveController_);
 		pMoveController_->createFromStream(s);
+		pControllers_->add(pMoveController_);
 	}
 }
 

kbe/src/server/cellapp/proximity_controller.cpp

@@ -42,6 +42,7 @@ y_(y)
 //-------------------------------------------------------------------------------------
 ProximityController::ProximityController(Entity* pEntity):
 Controller(pEntity),
+pTrapTrigger_(NULL),
 xz_(0.f),
 y_(0.f)
 {
@@ -71,6 +72,14 @@ void ProximityController::createFromStream(KBEngine::MemoryStream& s)
 //-------------------------------------------------------------------------------------
 bool ProximityController::reinstall(CoordinateNode* pCoordinateNode)
 {
+	// 跨cellapp场景跳转时可能出现这种情况
+	// 因为使用ProximityController::ProximityController(Entity* pEntity)构造
+	if(pTrapTrigger_ == NULL)
+	{
+		pTrapTrigger_ = new TrapTrigger(static_cast<EntityCoordinateNode*>(pCoordinateNode), 
+								this, xz_, y_);
+	}
+
 	return pTrapTrigger_->reinstall(pCoordinateNode);
 }