Fixed a bug in class Map where X/Y were swapped accross multiple occasions, which would cause issues on a map that doesn't have equal X/Y sizes