Fix Spigot 1.21.11 merge, set to SNAPSHOT

mikeprimm · mikeprimm · commit d8bc15d64555 · 2026-01-05T20:37:37.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -41,7 +41,7 @@ allprojects  {
   apply plugin: 'java'
   
   group = 'us.dynmap'
-  version = '3.7-beta-11'
+  version = '3.7-SNAPSHOT'
 
 }
 
diff --git a/bukkit-helper-121-11/.gitignore b/bukkit-helper-121-11/.gitignore
@@ -0,0 +1 @@
+/build/
diff --git a/spigot/src/main/java/org/dynmap/bukkit/Helper.java b/spigot/src/main/java/org/dynmap/bukkit/Helper.java
@@ -58,7 +58,7 @@ else if (v.contains("(MC: 1.21.6") || v.contains("(MC: 1.21.7") || v.contains("(
             else if (v.contains("(MC: 1.21.9)") || v.contains("(MC: 1.21.10)")) {
 	            BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v121_10.BukkitVersionHelperSpigot121_10");
             }
-            else if (v.contains("(MC: 1.21.11)")) {
+            else if (v.contains("(MC: 1.21.")) {	// Set up in case 1.21.12 works 'as is'
 	            BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v121_11.BukkitVersionHelperSpigot121_11");
             }
             else if (v.contains("(MC: 1.20)") || v.contains("(MC: 1.20.1)")) {

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ else if (v.contains("(MC: 1.21.6") \|\| v.contains("(MC: 1.21.7") \|\| v.contains("(`
`58`	`58`	`else if (v.contains("(MC: 1.21.9)") \|\| v.contains("(MC: 1.21.10)")) {`
`59`	`59`	`BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v121_10.BukkitVersionHelperSpigot121_10");`
`60`	`60`	`}`
`61`		`- else if (v.contains("(MC: 1.21.11)")) {`
	`61`	`+ else if (v.contains("(MC: 1.21.")) { // Set up in case 1.21.12 works 'as is'`
`62`	`62`	`BukkitVersionHelper.helper = loadVersionHelper("org.dynmap.bukkit.helper.v121_11.BukkitVersionHelperSpigot121_11");`
`63`	`63`	`}`
`64`	`64`	`else if (v.contains("(MC: 1.20)") \|\| v.contains("(MC: 1.20.1)")) {`