up

kbengine · kbengine · commit 104ae2051651 · 2014-08-11T17:33:05.000+08:00
diff --git a/kbe/src/server/baseapp/baseapp.cpp b/kbe/src/server/baseapp/baseapp.cpp
@@ -2405,7 +2405,7 @@ void Baseapp::reLoginGateway(Mercury::Channel* pChannel, std::string& accountNam
 		accountName % key % entityID);
 
 	Base* base = findEntity(entityID);
-	if(base == NULL || !PyObject_TypeCheck(base, Proxy::getScriptType()))
+	if(base == NULL || !PyObject_TypeCheck(base, Proxy::getScriptType()) || base->isDestroyed())
 	{
 		loginGatewayFailed(pChannel, accountName, SERVER_ERR_ILLEGAL_LOGIN);
 		return;
@@ -2439,7 +2439,6 @@ void Baseapp::reLoginGateway(Mercury::Channel* pChannel, std::string& accountNam
 		(*pBundle).newMessage(ClientInterface::onReLoginGatewaySuccessfully);
 		(*pBundle).send(this->getNetworkInterface(), pChannel);
 		Mercury::Bundle::ObjPool().reclaimObject(pBundle);
-		
 	}
 	else
 	{

Original file line number	Diff line number	Diff line change
`@@ -2405,7 +2405,7 @@ void Baseapp::reLoginGateway(Mercury::Channel* pChannel, std::string& accountNam`
`2405`	`2405`	`accountName % key % entityID);`
`2406`	`2406`
`2407`	`2407`	`Base* base = findEntity(entityID);`
`2408`		`- if(base == NULL \|\| !PyObject_TypeCheck(base, Proxy::getScriptType()))`
	`2408`	`+ if(base == NULL \|\| !PyObject_TypeCheck(base, Proxy::getScriptType()) \|\| base->isDestroyed())`
`2409`	`2409`	`{`
`2410`	`2410`	`loginGatewayFailed(pChannel, accountName, SERVER_ERR_ILLEGAL_LOGIN);`
`2411`	`2411`	`return;`
`@@ -2439,7 +2439,6 @@ void Baseapp::reLoginGateway(Mercury::Channel* pChannel, std::string& accountNam`
`2439`	`2439`	`(*pBundle).newMessage(ClientInterface::onReLoginGatewaySuccessfully);`
`2440`	`2440`	`(*pBundle).send(this->getNetworkInterface(), pChannel);`
`2441`	`2441`	`Mercury::Bundle::ObjPool().reclaimObject(pBundle);`
`2442`		`-`
`2443`	`2442`	`}`
`2444`	`2443`	`else`
`2445`	`2444`	`{`