From d815b4ca6ae8931dba6b8cb680f9b3c3f7dc663b Mon Sep 17 00:00:00 2001
From: srslyyyy <51768772+srslyyyy@users.noreply.github.com>
Date: Sun, 22 Jan 2023 20:28:35 +0100
Subject: [PATCH 1/3] Update dumpxml.lua

---
 [editor]/editor_main/server/dumpxml.lua | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/[editor]/editor_main/server/dumpxml.lua b/[editor]/editor_main/server/dumpxml.lua
index 12045224d..a663dc911 100644
--- a/[editor]/editor_main/server/dumpxml.lua
+++ b/[editor]/editor_main/server/dumpxml.lua
@@ -80,6 +80,12 @@ function dumpMeta ( xml, extraNodes, resource, filename, test )
 	dimension = dimension or 0
 	extraNodes = extraNodes or {}
 
+	-- Fixes onPlayerResourceStart version warning
+
+	local minVersion = xmlCreateChild(xml, "min_mta_version")
+
+	xmlNodeSetAttribute(minVersion, "server", "1.5.8-9.20957")
+
 	--Add OOP support
 	--[[local oopNode = xmlCreateChild(xml, "oop")
 	xmlNodeSetValue(oopNode, "true")]]

From 021ddd46122a12e10e9dca24dd046b37109a5742 Mon Sep 17 00:00:00 2001
From: srslyyyy <51768772+srslyyyy@users.noreply.github.com>
Date: Wed, 25 Jan 2023 03:26:39 +0100
Subject: [PATCH 2/3] Fetch version from editor meta.xml instead

---
 [editor]/editor_main/meta.xml           |  2 +-
 [editor]/editor_main/server/dumpxml.lua | 32 +++++++++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/[editor]/editor_main/meta.xml b/[editor]/editor_main/meta.xml
index bf2682d30..3c03611e3 100644
--- a/[editor]/editor_main/meta.xml
+++ b/[editor]/editor_main/meta.xml
@@ -1,7 +1,7 @@
 <meta>
 	<info author="erorr404,jbeta,Talidan" description="Map editor's main component" edf:definition="editor_main.edf" />
 
-	<min_mta_version server="1.3.0-9.04584" />
+	<min_mta_version server="1.5.8-9.20957" />
 
 	<!-- Script to shutdown the running gamemode and maps, because otherwise you get trouble -->
 	<script src="gamemodestopper.lua" type="server" />
diff --git a/[editor]/editor_main/server/dumpxml.lua b/[editor]/editor_main/server/dumpxml.lua
index a663dc911..e82280ba0 100644
--- a/[editor]/editor_main/server/dumpxml.lua
+++ b/[editor]/editor_main/server/dumpxml.lua
@@ -76,15 +76,39 @@ function dumpNodes ( xmlNode, elementTable, elementChildren )
 end
 
 function dumpMeta ( xml, extraNodes, resource, filename, test )
-	if not resource then return false end
+	if not resource then
+		return false
+	end
+
 	dimension = dimension or 0
 	extraNodes = extraNodes or {}
 
-	-- Fixes onPlayerResourceStart version warning
+	-- Fetch min_mta_version from editor_main meta.xml
+
+	local metaFile = xmlLoadFile("meta.xml")
+
+	if metaFile then
+		local editorMinVer = xmlFindChild(metaFile, "min_mta_version", 0)
+
+		if editorMinVer then
+			local mapVersionNode = xmlFindChild(xml, "min_mta_version", 0) or xmlCreateChild(xml, "min_mta_version")
 
-	local minVersion = xmlCreateChild(xml, "min_mta_version")
+			if mapVersionNode then
+				local clientMinVer = xmlNodeGetAttribute(editorMinVer, "client")
+				local serverMinVer = xmlNodeGetAttribute(editorMinVer, "server")
 
-	xmlNodeSetAttribute(minVersion, "server", "1.5.8-9.20957")
+				if clientMinVer then
+					xmlNodeSetAttribute(mapVersionNode, "client", clientMinVer)
+				end
+
+				if serverMinVer then
+					xmlNodeSetAttribute(mapVersionNode, "server", serverMinVer)
+				end
+			end
+		end
+
+		xmlUnloadFile(metaFile)
+	end
 
 	--Add OOP support
 	--[[local oopNode = xmlCreateChild(xml, "oop")

From 939b9146813befef2b11eaf322f95e4ffcb8ebdb Mon Sep 17 00:00:00 2001
From: srslyyyy <51768772+srslyyyy@users.noreply.github.com>
Date: Wed, 25 Jan 2023 12:01:44 +0100
Subject: [PATCH 3/3] Move get/set ver. into separate method.

---
 [editor]/editor_main/server/dumpxml.lua | 54 ++++++++++++++-----------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/[editor]/editor_main/server/dumpxml.lua b/[editor]/editor_main/server/dumpxml.lua
index e82280ba0..68f31046f 100644
--- a/[editor]/editor_main/server/dumpxml.lua
+++ b/[editor]/editor_main/server/dumpxml.lua
@@ -75,41 +75,49 @@ function dumpNodes ( xmlNode, elementTable, elementChildren )
 	end
 end
 
-function dumpMeta ( xml, extraNodes, resource, filename, test )
-	if not resource then
+local function syncMapMinVersion(mapXml)
+	local metaFile = xmlLoadFile("meta.xml")
+
+	if not metaFile then
 		return false
 	end
 
-	dimension = dimension or 0
-	extraNodes = extraNodes or {}
+	local editorMinVer = xmlFindChild(metaFile, "min_mta_version", 0)
 
-	-- Fetch min_mta_version from editor_main meta.xml
+	if editorMinVer then
+		local mapVersionNode = xmlFindChild(mapXml, "min_mta_version", 0) or xmlCreateChild(mapXml, "min_mta_version")
 
-	local metaFile = xmlLoadFile("meta.xml")
-
-	if metaFile then
-		local editorMinVer = xmlFindChild(metaFile, "min_mta_version", 0)
-
-		if editorMinVer then
-			local mapVersionNode = xmlFindChild(xml, "min_mta_version", 0) or xmlCreateChild(xml, "min_mta_version")
+		if mapVersionNode then
+			local clientMinVer = xmlNodeGetAttribute(editorMinVer, "client")
+			local serverMinVer = xmlNodeGetAttribute(editorMinVer, "server")
 
-			if mapVersionNode then
-				local clientMinVer = xmlNodeGetAttribute(editorMinVer, "client")
-				local serverMinVer = xmlNodeGetAttribute(editorMinVer, "server")
-
-				if clientMinVer then
-					xmlNodeSetAttribute(mapVersionNode, "client", clientMinVer)
-				end
+			if clientMinVer then
+				xmlNodeSetAttribute(mapVersionNode, "client", clientMinVer)
+			end
 
-				if serverMinVer then
-					xmlNodeSetAttribute(mapVersionNode, "server", serverMinVer)
-				end
+			if serverMinVer then
+				xmlNodeSetAttribute(mapVersionNode, "server", serverMinVer)
 			end
 		end
+	end
 
-		xmlUnloadFile(metaFile)
+	xmlUnloadFile(metaFile)
+
+	return true
+end
+
+function dumpMeta ( xml, extraNodes, resource, filename, test )
+	if not resource then
+		return false
 	end
 
+	dimension = dimension or 0
+	extraNodes = extraNodes or {}
+
+	-- Fetch min_mta_version from editor_main meta.xml
+
+	syncMapMinVersion(xml)
+
 	--Add OOP support
 	--[[local oopNode = xmlCreateChild(xml, "oop")
 	xmlNodeSetValue(oopNode, "true")]]