Fix regressions

lib/constants/EntityIdentifiers.h

@@ -418,12 +418,12 @@ class DLL_LINKAGE BuildingID : public IdentifierWithEnum<BuildingID, BuildingIDB
 public:
 	using IdentifierWithEnum<BuildingID, BuildingIDBase>::IdentifierWithEnum;
 
-	static BuildingID HALL_LEVEL(uint level)
+	static BuildingID HALL_LEVEL(unsigned int level)
 	{
 		assert(level < 4);
 		return BuildingID(Type::VILLAGE_HALL + level);
 	}
-	static BuildingID FORT_LEVEL(uint level)
+	static BuildingID FORT_LEVEL(unsigned int level)
 	{
 		assert(level < 3);
 		return BuildingID(Type::TOWN_HALL + level);

lib/mapObjects/CGTownInstance.cpp

@@ -1208,7 +1208,7 @@ void CGTownInstance::serializeJsonOptions(JsonSerializeFormat & handler)
 
 FactionID CGTownInstance::getFaction() const
 {
-	return town->faction->getId();
+	return  FactionID(subID.getNum());
 }
 
 TerrainId CGTownInstance::getNativeTerrain() const

lib/serializer/JsonSerializeFormat.h

@@ -213,7 +213,7 @@ public:
 		for (auto entry : value)
 			valueInt.insert(entry.getNum());
 
-		serializeLIC(fieldName, decoder, encoder, standard, value);
+		serializeLIC(fieldName, decoder, encoder, standardInt, valueInt);
 
 		value.clear();
 		for (auto entry : valueInt)