From f8a81ce0ac0aa1e2d1bfa52027783b279b46e6c7 Mon Sep 17 00:00:00 2001
From: Leonid Meleshin <leon.03.99@gmail.com>
Date: Mon, 6 Jun 2022 09:51:08 +0300
Subject: [PATCH 1/2] feat: URI-encode markers loading world name

---
 DynmapCore/src/main/resources/extracted/web/js/markers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DynmapCore/src/main/resources/extracted/web/js/markers.js b/DynmapCore/src/main/resources/extracted/web/js/markers.js
index 33a7e1dc..42742f1a 100644
--- a/DynmapCore/src/main/resources/extracted/web/js/markers.js
+++ b/DynmapCore/src/main/resources/extracted/web/js/markers.js
@@ -27,7 +27,7 @@ componentconstructors['markers'] = function(dynmap, configuration) {
 			
 	function loadmarkers(world) {
 		removeAllMarkers();
-		var url = concatURL(dynmap.options.url.markers, '_markers_/marker_'+world+'.json');
+		var url = concatURL(dynmap.options.url.markers, '_markers_/marker_' + encodeURIComponent(world) + '.json');
 		
 		$.getJSON(url, function(data) {
 			var ts = data.timestamp;

From 63ab35a9a54b2db01aebb3a6499bc74c6fc4773f Mon Sep 17 00:00:00 2001
From: tecdude <92227828+tecdude@users.noreply.github.com>
Date: Fri, 17 Jun 2022 18:47:54 +0100
Subject: [PATCH 2/2] safari coloured search bar

added support for coloured bar in apple safari 15+
---
 DynmapCore/src/main/resources/extracted/web/index.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/DynmapCore/src/main/resources/extracted/web/index.html b/DynmapCore/src/main/resources/extracted/web/index.html
index 38bb3e17..575a0ca4 100644
--- a/DynmapCore/src/main/resources/extracted/web/index.html
+++ b/DynmapCore/src/main/resources/extracted/web/index.html
@@ -10,7 +10,8 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" />
 	<!-- These 2 lines make us fullscreen on apple mobile products - remove if you don't like that -->
 	<meta name="apple-mobile-web-app-capable" content="yes" />
-	<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />	
+	<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+   	<meta name="theme-color" content="#000000">
 
 	<link rel="icon" href="images/dynmap.ico" type="image/ico" />
 
@@ -54,4 +55,4 @@
 
 	<div id="mcmap"></div>
 </body>
-</html>
\ No newline at end of file
+</html>