Merge pull request #4625 from IvanSavenko/fix_doublevisit

Fix crash on AI double-visiting a town with new hero

AI/Nullkiller/Goals/RecruitHero.cpp

@@ -74,9 +74,6 @@ void RecruitHero::accept(AIGateway * ai)
 
 		ai->nullkiller->heroManager->update();
 	}
-
-	if(t->visitingHero)
-		ai->moveHeroToTile(t->visitablePos(), t->visitingHero.get());
 }
 
 }

server/CGameHandler.cpp

@@ -456,26 +456,28 @@ void CGameHandler::handleReceivedPack(CPackForServer * pack)
 	{
 		sendPackageResponse(false);
 	}
-
-	bool result;
-	try
-	{
-		ApplyGhNetPackVisitor applier(*this);
-		pack->visit(applier);
-		result = applier.getResult();
-	}
-	catch(ExceptionNotAllowedAction &)
+	else
 	{
-		result = false;
-	}
+		bool result;
+		try
+		{
+			ApplyGhNetPackVisitor applier(*this);
+			pack->visit(applier);
+			result = applier.getResult();
+		}
+		catch(ExceptionNotAllowedAction &)
+		{
+			result = false;
+		}
 
-	if(result)
-		logGlobal->trace("Message %s successfully applied!", typeid(*pack).name());
-	else
-		complain((boost::format("Got false in applying %s... that request must have been fishy!")
-			% typeid(*pack).name()).str());
+		if(result)
+			logGlobal->trace("Message %s successfully applied!", typeid(*pack).name());
+		else
+			complain((boost::format("Got false in applying %s... that request must have been fishy!")
+				% typeid(*pack).name()).str());
 
-	sendPackageResponse(true);
+		sendPackageResponse(true);
+	}
 	vstd::clear_pointer(pack);
 }