From 65cca049acf1e6f7f81122a6e293943df9e86d4c Mon Sep 17 00:00:00 2001 From: Michael Primm Date: Wed, 27 Sep 2023 16:35:44 -0500 Subject: [PATCH 1/4] Fix running on spigot/paper 1.20, 1.20.1 --- spigot/src/main/java/org/dynmap/bukkit/Helper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spigot/src/main/java/org/dynmap/bukkit/Helper.java b/spigot/src/main/java/org/dynmap/bukkit/Helper.java index f5dcd711..333c08e3 100644 --- a/spigot/src/main/java/org/dynmap/bukkit/Helper.java +++ b/spigot/src/main/java/org/dynmap/bukkit/Helper.java @@ -40,12 +40,12 @@ public class Helper { Log.info("Loading Glowstone support"); BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.BukkitVersionHelperGlowstone"); } - else if (v.contains("(MC: 1.20")) { - BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v120_2.BukkitVersionHelperSpigot120_2"); - } else if (v.contains("(MC: 1.20)") || v.contains("(MC: 1.20.1)")) { BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v120.BukkitVersionHelperSpigot120"); } + else if (v.contains("(MC: 1.20")) { + BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v120_2.BukkitVersionHelperSpigot120_2"); + } else if (v.contains("(MC: 1.19)") || v.contains("(MC: 1.19.1)") || v.contains("(MC: 1.19.2)")) { BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v119.BukkitVersionHelperSpigot119"); } From c807861859f47de608a3e19c6e61995c81cd857b Mon Sep 17 00:00:00 2001 From: Michael Primm Date: Wed, 27 Sep 2023 21:35:40 -0500 Subject: [PATCH 2/4] Restrict /dmarker file imports to {dynmap-directory}/import --- .../src/main/java/org/dynmap/DynmapCore.java | 9 ++++++ .../dynmap/markers/impl/MarkerAPIImpl.java | 29 +++++++++++++++---- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ .../src/main/resources/configuration.txt | 3 ++ spigot/src/main/resources/configuration.txt | 3 ++ 25 files changed, 99 insertions(+), 7 deletions(-) diff --git a/DynmapCore/src/main/java/org/dynmap/DynmapCore.java b/DynmapCore/src/main/java/org/dynmap/DynmapCore.java index 6bb2beb8..bd0e12d5 100644 --- a/DynmapCore/src/main/java/org/dynmap/DynmapCore.java +++ b/DynmapCore/src/main/java/org/dynmap/DynmapCore.java @@ -164,6 +164,7 @@ public class DynmapCore implements DynmapCommonAPI { private File dataDirectory; private File tilesDirectory; private File exportDirectory; + private File importDirectory; private String plugin_ver; private MapStorage defaultStorage; @@ -224,6 +225,9 @@ public class DynmapCore implements DynmapCommonAPI { public final File getExportFolder() { return exportDirectory; } + public final File getImportFolder() { + return importDirectory; + } public void setMinecraftVersion(String mcver) { this.platformVersion = mcver; } @@ -428,6 +432,11 @@ public class DynmapCore implements DynmapCommonAPI { if (!exportDirectory.isDirectory() && !exportDirectory.mkdirs()) { Log.warning("Could not create directory for exports ('" + exportDirectory + "')."); } + // Prime the imports directory + importDirectory = getFile(configuration.getString("importpath", "import")); + if (!importDirectory.isDirectory() && !importDirectory.mkdirs()) { + Log.warning("Could not create directory for imports ('" + importDirectory + "')."); + } // Create default storage handler String storetype = configuration.getString("storage/type", "filetree"); if (storetype.equals("filetree")) { diff --git a/DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java b/DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java index a185e222..c4947b96 100644 --- a/DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java +++ b/DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java @@ -2176,6 +2176,10 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener { sender.sendMessage("file:\"filename\" required"); return true; } + if (!validateImportFile(file)) { + sender.sendMessage("Error: '" + ARG_FILE + "' cannot include directory separators - must be just filename in " + plugin.getImportFolder().getAbsolutePath() + " directory"); + return true; + } if(label == null) label = id; MarkerIcon ico = MarkerAPIImpl.getMarkerIconImpl(id); @@ -2184,10 +2188,9 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener { return true; } /* Open stream to filename */ - File iconf = new File(file); FileInputStream fis = null; try { - fis = new FileInputStream(iconf); + fis = new FileInputStream(new File(plugin.getImportFolder(), file)); /* Create new icon */ MarkerIcon mi = api.createMarkerIcon(id, label, fis); if(mi == null) { @@ -3201,6 +3204,12 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener { } return true; } + private static boolean validateImportFile(String fname) { + if ((fname.indexOf('/') >= 0) || (fname.indexOf('\\') >= 0)) { + return false; + } + return true; + } /** Process importdesc for given item */ private static boolean processImportDesc(DynmapCore plugin, DynmapCommandSender sender, String cmd, String commandLabel, String[] args) { if(args.length > 1) { @@ -3214,13 +3223,17 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener { } String f = parms.get(ARG_FILE); if (f == null) { - sender.sendMessage("Error: no '" + ARG_FILE + "' parameter"); + sender.sendMessage("file:\"filename\" required"); + return true; + } + if (!validateImportFile(f)) { + sender.sendMessage("Error: '" + ARG_FILE + "' cannot include directory separators - must be just filename in " + plugin.getImportFolder().getAbsolutePath() + " directory"); return true; } FileReader fr = null; String val = null; try { - fr = new FileReader(f); + fr = new FileReader(new File(plugin.getImportFolder(), f)); StringBuilder sb = new StringBuilder(); char[] buf = new char[512]; int len; @@ -3261,13 +3274,17 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener { } String f = parms.get(ARG_FILE); if (f == null) { - sender.sendMessage("Error: no '" + ARG_FILE + "' parameter"); + sender.sendMessage("file:\"filename\" required"); + return true; + } + if (!validateImportFile(f)) { + sender.sendMessage("Error: '" + ARG_FILE + "' cannot include directory separators - must be just filename in " + plugin.getImportFolder().getAbsolutePath() + " directory"); return true; } FileReader fr = null; String val = null; try { - fr = new FileReader(f); + fr = new FileReader(new File(plugin.getImportFolder(), f)); StringBuilder sb = new StringBuilder(); char[] buf = new char[512]; int len; diff --git a/bukkit-helper/.settings/org.eclipse.jdt.core.prefs b/bukkit-helper/.settings/org.eclipse.jdt.core.prefs index 5d7dc348..0da38a77 100644 --- a/bukkit-helper/.settings/org.eclipse.jdt.core.prefs +++ b/bukkit-helper/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Sat Sep 23 12:37:23 CDT 2023 +#Wed Sep 27 17:17:03 CDT 2023 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.nullReference=warning eclipse.preferences.version=1 diff --git a/fabric-1.14.4/src/main/resources/configuration.txt b/fabric-1.14.4/src/main/resources/configuration.txt index ef6b6fb8..20eade27 100644 --- a/fabric-1.14.4/src/main/resources/configuration.txt +++ b/fabric-1.14.4/src/main/resources/configuration.txt @@ -327,6 +327,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/fabric-1.15.2/src/main/resources/configuration.txt b/fabric-1.15.2/src/main/resources/configuration.txt index ef6b6fb8..20eade27 100644 --- a/fabric-1.15.2/src/main/resources/configuration.txt +++ b/fabric-1.15.2/src/main/resources/configuration.txt @@ -327,6 +327,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/fabric-1.16.4/src/main/resources/configuration.txt b/fabric-1.16.4/src/main/resources/configuration.txt index b243a731..794b1291 100644 --- a/fabric-1.16.4/src/main/resources/configuration.txt +++ b/fabric-1.16.4/src/main/resources/configuration.txt @@ -335,6 +335,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/fabric-1.17.1/src/main/resources/configuration.txt b/fabric-1.17.1/src/main/resources/configuration.txt index b243a731..794b1291 100644 --- a/fabric-1.17.1/src/main/resources/configuration.txt +++ b/fabric-1.17.1/src/main/resources/configuration.txt @@ -335,6 +335,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/fabric-1.18.2/src/main/resources/configuration.txt b/fabric-1.18.2/src/main/resources/configuration.txt index d4278e3a..0d47a67f 100644 --- a/fabric-1.18.2/src/main/resources/configuration.txt +++ b/fabric-1.18.2/src/main/resources/configuration.txt @@ -333,6 +333,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/fabric-1.19.1/src/main/resources/configuration.txt b/fabric-1.19.1/src/main/resources/configuration.txt index d70f5426..51067ee9 100644 --- a/fabric-1.19.1/src/main/resources/configuration.txt +++ b/fabric-1.19.1/src/main/resources/configuration.txt @@ -333,6 +333,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/fabric-1.19.3/src/main/resources/configuration.txt b/fabric-1.19.3/src/main/resources/configuration.txt index d70f5426..51067ee9 100644 --- a/fabric-1.19.3/src/main/resources/configuration.txt +++ b/fabric-1.19.3/src/main/resources/configuration.txt @@ -333,6 +333,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/fabric-1.19.4/src/main/resources/configuration.txt b/fabric-1.19.4/src/main/resources/configuration.txt index d70f5426..51067ee9 100644 --- a/fabric-1.19.4/src/main/resources/configuration.txt +++ b/fabric-1.19.4/src/main/resources/configuration.txt @@ -333,6 +333,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/fabric-1.19/src/main/resources/configuration.txt b/fabric-1.19/src/main/resources/configuration.txt index d70f5426..51067ee9 100644 --- a/fabric-1.19/src/main/resources/configuration.txt +++ b/fabric-1.19/src/main/resources/configuration.txt @@ -333,6 +333,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/fabric-1.20.2/src/main/resources/configuration.txt b/fabric-1.20.2/src/main/resources/configuration.txt index d70f5426..51067ee9 100644 --- a/fabric-1.20.2/src/main/resources/configuration.txt +++ b/fabric-1.20.2/src/main/resources/configuration.txt @@ -333,6 +333,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/fabric-1.20/src/main/resources/configuration.txt b/fabric-1.20/src/main/resources/configuration.txt index d70f5426..51067ee9 100644 --- a/fabric-1.20/src/main/resources/configuration.txt +++ b/fabric-1.20/src/main/resources/configuration.txt @@ -333,6 +333,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/forge-1.14.4/src/main/resources/configuration.txt b/forge-1.14.4/src/main/resources/configuration.txt index 26ba0815..3b1d0c66 100644 --- a/forge-1.14.4/src/main/resources/configuration.txt +++ b/forge-1.14.4/src/main/resources/configuration.txt @@ -335,6 +335,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/forge-1.15.2/src/main/resources/configuration.txt b/forge-1.15.2/src/main/resources/configuration.txt index 26ba0815..3b1d0c66 100644 --- a/forge-1.15.2/src/main/resources/configuration.txt +++ b/forge-1.15.2/src/main/resources/configuration.txt @@ -335,6 +335,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/forge-1.16.5/src/main/resources/configuration.txt b/forge-1.16.5/src/main/resources/configuration.txt index ce49227c..300412ab 100644 --- a/forge-1.16.5/src/main/resources/configuration.txt +++ b/forge-1.16.5/src/main/resources/configuration.txt @@ -335,6 +335,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/forge-1.17.1/src/main/resources/configuration.txt b/forge-1.17.1/src/main/resources/configuration.txt index 03974a5e..06aed6d7 100644 --- a/forge-1.17.1/src/main/resources/configuration.txt +++ b/forge-1.17.1/src/main/resources/configuration.txt @@ -335,6 +335,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/forge-1.18.2/src/main/resources/configuration.txt b/forge-1.18.2/src/main/resources/configuration.txt index ce49227c..300412ab 100644 --- a/forge-1.18.2/src/main/resources/configuration.txt +++ b/forge-1.18.2/src/main/resources/configuration.txt @@ -335,6 +335,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/forge-1.19.2/src/main/resources/configuration.txt b/forge-1.19.2/src/main/resources/configuration.txt index ce49227c..300412ab 100644 --- a/forge-1.19.2/src/main/resources/configuration.txt +++ b/forge-1.19.2/src/main/resources/configuration.txt @@ -335,6 +335,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/forge-1.19.3/src/main/resources/configuration.txt b/forge-1.19.3/src/main/resources/configuration.txt index ce49227c..300412ab 100644 --- a/forge-1.19.3/src/main/resources/configuration.txt +++ b/forge-1.19.3/src/main/resources/configuration.txt @@ -335,6 +335,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/forge-1.19/src/main/resources/configuration.txt b/forge-1.19/src/main/resources/configuration.txt index ce49227c..300412ab 100644 --- a/forge-1.19/src/main/resources/configuration.txt +++ b/forge-1.19/src/main/resources/configuration.txt @@ -335,6 +335,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/forge-1.20.2/src/main/resources/configuration.txt b/forge-1.20.2/src/main/resources/configuration.txt index ce49227c..300412ab 100644 --- a/forge-1.20.2/src/main/resources/configuration.txt +++ b/forge-1.20.2/src/main/resources/configuration.txt @@ -335,6 +335,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/forge-1.20/src/main/resources/configuration.txt b/forge-1.20/src/main/resources/configuration.txt index ce49227c..300412ab 100644 --- a/forge-1.20/src/main/resources/configuration.txt +++ b/forge-1.20/src/main/resources/configuration.txt @@ -335,6 +335,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 diff --git a/spigot/src/main/resources/configuration.txt b/spigot/src/main/resources/configuration.txt index df097b11..73529b49 100644 --- a/spigot/src/main/resources/configuration.txt +++ b/spigot/src/main/resources/configuration.txt @@ -342,6 +342,9 @@ update-webpath-files: true # The path were the /dynmapexp command exports OBJ ZIP files exportpath: export +# The path where files can be imported for /dmarker commands +importpath: import + # The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access). # If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified) #webserver-bindaddress: 0.0.0.0 From 96554717f10800faf55dd5d4d5697cbb07013546 Mon Sep 17 00:00:00 2001 From: Michael Primm Date: Wed, 27 Sep 2023 22:06:10 -0500 Subject: [PATCH 3/4] Switch to 3.7-beta-2 --- build.gradle | 2 +- oldbuilds/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 1d5cf8f9..e9d8a03e 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ allprojects { apply plugin: 'java' group = 'us.dynmap' - version = '3.7-SNAPSHOT' + version = '3.7-beta-2' } diff --git a/oldbuilds/build.gradle b/oldbuilds/build.gradle index a72db540..bb61deac 100644 --- a/oldbuilds/build.gradle +++ b/oldbuilds/build.gradle @@ -25,7 +25,7 @@ allprojects { apply plugin: 'java' group = 'us.dynmap' - version = '3.7-SNAPSHOT' + version = '3.7-beta-2' } From ca80758605f6bdbe6d243e071d0d2b582b759bf0 Mon Sep 17 00:00:00 2001 From: Michael Primm Date: Thu, 28 Sep 2023 00:37:31 -0500 Subject: [PATCH 4/4] Back to SNAPSHOT --- build.gradle | 2 +- bukkit-helper/.project | 37 ++++++++++++++++++++----------------- oldbuilds/build.gradle | 2 +- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index e9d8a03e..1d5cf8f9 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ allprojects { apply plugin: 'java' group = 'us.dynmap' - version = '3.7-beta-2' + version = '3.7-SNAPSHOT' } diff --git a/bukkit-helper/.project b/bukkit-helper/.project index f654b6b0..33f7105e 100644 --- a/bukkit-helper/.project +++ b/bukkit-helper/.project @@ -2,32 +2,35 @@ Dynmap(Spigot-Common) bukkit-helper - + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature org.eclipse.buildship.core.gradleprojectnature - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - org.eclipse.m2e.core.maven2Builder - - - - 1 + 30 - org.eclipse.core.resources.regexFilterMatcher node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ diff --git a/oldbuilds/build.gradle b/oldbuilds/build.gradle index bb61deac..a72db540 100644 --- a/oldbuilds/build.gradle +++ b/oldbuilds/build.gradle @@ -25,7 +25,7 @@ allprojects { apply plugin: 'java' group = 'us.dynmap' - version = '3.7-beta-2' + version = '3.7-SNAPSHOT' }