完善teleport功能。

Author: kbengine

kbe/src/server/cellapp/entity.cpp

@@ -2845,6 +2845,10 @@ void Entity::createFromStream(KBEngine::MemoryStream& s)
 	s >> scriptUType >> spaceID_ >> isDestroyed_ >> isOnGround_ >> topSpeed_ >> 
 		topSpeedY_ >> layer_ >> baseMailboxComponentID;
 
+	// 此时强制设置为不在地面，无法判定其是否在地面，角色需要客户端上报是否在地面
+	// 而服务端的NPC则与移动后是否在地面来判定。
+	isOnGround_ = false;
+
 	this->scriptModule_ = EntityDef::findScriptModule(scriptUType);
 
 	// 设置entity的baseMailbox
@@ -2950,7 +2954,10 @@ void Entity::createWitnessFromStream(KBEngine::MemoryStream& s)
 		EntityMailbox* client = static_cast<EntityMailbox*>(clientMB);	
 		clientMailbox(client);
 
-		setWitness(Witness::ObjPool().createObject());
+		// 不要使用setWitness，因为此时不需要走onAttach流程，客户端不需要重新enterworld。
+		// setWitness(Witness::ObjPool().createObject());
+		pWitness_ = Witness::ObjPool().createObject();
+		pWitness_->pEntity(this);
 		pWitness_->createFromStream(s);
 	}
 }

kbe/src/server/cellapp/move_controller.cpp

@@ -21,6 +21,9 @@ along with KBEngine.  If not, see <http://www.gnu.org/licenses/>.
 #include "cellapp.hpp"
 #include "entity.hpp"
 #include "move_controller.hpp"	
+#include "moveto_point_handler.hpp"	
+#include "moveto_entity_handler.hpp"	
+#include "navigate_handler.hpp"	
 
 namespace KBEngine{	
 
@@ -45,13 +48,29 @@ void MoveController::addToStream(KBEngine::MemoryStream& s)
 {
 	Controller::addToStream(s);
 
+	uint8 utype = pMoveToPointHandler_->type();
+	s << utype;
+
 	pMoveToPointHandler_->addToStream(s);
 }
 
 //-------------------------------------------------------------------------------------
 void MoveController::createFromStream(KBEngine::MemoryStream& s)
 {
 	Controller::createFromStream(s);
+	KBE_ASSERT(pMoveToPointHandler_ == NULL);
+
+	uint8 utype;
+	s >> utype;
+
+	if(utype == MoveToPointHandler::MOVE_TYPE_NAV)
+		pMoveToPointHandler_ = new NavigateHandler();
+	else if(utype == MoveToPointHandler::MOVE_TYPE_ENTITY)
+		pMoveToPointHandler_ = new MoveToEntityHandler();
+	else if(utype == MoveToPointHandler::MOVE_TYPE_POINT)
+		pMoveToPointHandler_ = new MoveToPointHandler();
+	else
+		KBE_ASSERT(false);
 
 	pMoveToPointHandler_->createFromStream(s);
 }

kbe/src/server/cellapp/moveto_point_handler.cpp

@@ -73,7 +73,7 @@ void MoveToPointHandler::addToStream(KBEngine::MemoryStream& s)
 {
 	uint8 utype = type();
 
-	s << utype << destPos_.x << destPos_.y << destPos_.z << velocity_ << faceMovement_ << moveVertically_ <<
+	s << /*utype <<*/ destPos_.x << destPos_.y << destPos_.z << velocity_ << faceMovement_ << moveVertically_ <<
 		range_ << layer_;
 
 	s.appendBlob(script::Pickler::pickle(pyuserarg_));

kbe/src/server/cellapp/witness.cpp

@@ -113,6 +113,7 @@ void Witness::createFromStream(KBEngine::MemoryStream& s)
 	}
 
 	lastBasePos.z = -FLT_MAX;
+	Cellapp::getSingleton().addUpdatable(this);
 }
 
 //-------------------------------------------------------------------------------------

kbe/src/server/cellapp/witness.hpp

@@ -103,6 +103,7 @@ class Witness : public PoolObject, public Updatable
 		return bytes;
 	}
 
+	INLINE void pEntity(Entity* pEntity);
 	INLINE Entity* pEntity();
 
 	void attach(Entity* pEntity);

kbe/src/server/cellapp/witness.ipp

@@ -27,6 +27,12 @@ INLINE Entity* Witness::pEntity()
 	return pEntity_;
 }
 
+//-------------------------------------------------------------------------------------
+INLINE void Witness::pEntity(Entity* pEntity)
+{
+	pEntity_ = pEntity;
+}
+
 //-------------------------------------------------------------------------------------
 INLINE float Witness::aoiRadius()const
 {