Merge branch 'master' into realitymod-dev

Author: paulhobbel

ext/Shared/__init__.lua

@@ -35,6 +35,8 @@ local m_Defaults = {
 	variation = 0,
 }
 
+local m_MapGameModePaths = {}
+
 local function PatchOriginalObject(p_Object, p_World)
 	if p_Object.originalRef == nil then
 		print("Object without original reference found, dynamic object?", true)
@@ -194,6 +196,11 @@ local function GetCustomLevelFromHttp(p_FileName)
 	for _, l_Address in ipairs(Config.MIRRORS) do
 		local s_StartTime = SharedUtils:GetTime()
 
+		if m_MapGameModePaths[p_FileName] then
+			p_FileName = m_MapGameModePaths[p_FileName]
+			print("Adjusted file name to " .. p_FileName)
+		end
+
 		local s_Path = l_Address .. p_FileName .. ".json"
 		local s_HttpResponse = Net:GetHTTP(s_Path, s_HttpOptions)
 
@@ -391,3 +398,8 @@ ResourceManager:RegisterInstanceLoadHandler(Guid('C4DCACFF-ED8F-BC87-F647-0BC8AC
 	p_Instance.timeoutTime = Config.CLIENT_TIMEOUT
 	print("Changed ServerSettings")
 end)
+
+---@param p_MapGameModePaths table
+Events:Subscribe("CLL:MapGameModePaths", function(p_MapGameModePaths)
+	m_MapGameModePaths = p_MapGameModePaths
+end)

mod.json

@@ -3,7 +3,7 @@
 	"Authors": ["RM Dev Team"],
 	"Description": "Load custom levels created using MapEditor",
 	"URL": "https://github.com/BF3RM/CustomLevelLoader",
-	"Version": "0.1.18",
+	"Version": "0.1.19",
 	"HasWebUI": false,
 	"HasVeniceEXT": true,
 	"Dependencies": {