Minor fixes

lib/gameState/CGameState.cpp

@@ -663,10 +663,8 @@ void CGameState::initDifficulty()
 	logGlobal->debug("\tLoading difficulty settings");
 	const JsonNode config(JsonPath::builtin("config/difficulty.json"));
 	
-	const JsonVector &vector = config["battleBonus"].Vector();
-	const JsonNode &level = vector[scenarioOps->difficulty];
-	const JsonNode & difficultyAI(level["ai"][GameConstants::DIFFICULTY_NAMES[scenarioOps->difficulty]]);
-	const JsonNode & difficultyHuman(level["human"][GameConstants::DIFFICULTY_NAMES[scenarioOps->difficulty]]);
+	const JsonNode & difficultyAI(config["ai"][GameConstants::DIFFICULTY_NAMES[scenarioOps->difficulty]]);
+	const JsonNode & difficultyHuman(config["human"][GameConstants::DIFFICULTY_NAMES[scenarioOps->difficulty]]);
 	
 	auto setDifficulty = [](PlayerState & state, const JsonNode & json)
 	{

server/battles/BattleProcessor.cpp

@@ -117,7 +117,7 @@ void BattleProcessor::startBattlePrimary(const CArmedInstance *army1, const CArm
 	
 	//add battle bonuses based from player state only when attacks neutral creatures
 	const auto * attackerInfo = gameHandler->getPlayerState(army1->getOwner(), false);
-	if(attackerInfo && army2->getOwner() == PlayerColor::NEUTRAL)
+	if(attackerInfo && !army2->getOwner().isValidPlayer())
 	{
 		for(auto bonus : attackerInfo->battleBonuses)
 		{