From 4a25456b7f54c5f11f1b75aff819a904b1919a10 Mon Sep 17 00:00:00 2001
From: BananaPuncher714 <banana@aaaaahhhhhhh.com>
Date: Mon, 17 Nov 2025 16:11:42 -0500
Subject: [PATCH] Fix invalid versions

---
 build-versions.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/build-versions.sh b/build-versions.sh
index a03b03d..1b878b3 100755
--- a/build-versions.sh
+++ b/build-versions.sh
@@ -34,7 +34,9 @@ for ver in "${versions[@]}"; do
         BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.11.2" || echo "$BUILD_JAVA_8,1.11.2" )
     elif [[ "$ver" =~ ^1\.12(\.[12])?$ ]]; then
         BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.12.2" || echo "$BUILD_JAVA_8,1.12.2" )
-    elif [[ "$ver" =~ ^1\.13(\.[12])?$ ]]; then
+    elif [[ "$ver" =~ ^1\.13$ ]]; then
+        BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.13" || echo "$BUILD_JAVA_8,1.13" )
+    elif [[ "$ver" =~ ^1\.13\.[12]?$ ]]; then
         BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.13.2" || echo "$BUILD_JAVA_8,1.13.2" )
     elif [[ "$ver" =~ ^1\.14(\.[1-4])?$ ]]; then
         BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.14.4" || echo "$BUILD_JAVA_8,1.14.4" )
@@ -47,7 +49,7 @@ for ver in "${versions[@]}"; do
     elif [[ "$ver" =~ ^1\.16\.[34]$ ]]; then
         BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.16.4" || echo "$BUILD_JAVA_8,1.16.4" )
     elif [[ "$ver" =~ ^1\.17(\.*)?$ ]]; then
-        >&2 echo "Spigot 1.17.x not supported due to java 14 CVEs"
+        >&2 echo "Spigot 1.17.x not supported due to java 16 CVEs"
     elif [[ "$ver" =~ ^1\.18(\.1)?$ ]]; then
         BUILD_JAVA_17=$( [ -z ${BUILD_JAVA_17+x} ] && echo "1.18.1" || echo "$BUILD_JAVA_17,1.18.1" )
     elif [[ "$ver" =~ ^1\.18\.2$ ]]; then
@@ -64,7 +66,7 @@ for ver in "${versions[@]}"; do
         BUILD_JAVA_17=$( [ -z ${BUILD_JAVA_17+x} ] && echo "1.20.2" || echo "$BUILD_JAVA_17,1.20.2" )
     elif [[ "$ver" =~ ^1\.20\.[34]$ ]]; then
         BUILD_JAVA_17=$( [ -z ${BUILD_JAVA_17+x} ] && echo "1.20.4" || echo "$BUILD_JAVA_17,1.20.4" )
-    elif [[ "$ver" =~ ^1\.20\.*$ ]]; then
+    elif [[ "$ver" =~ ^1\.20\.[56]$ ]]; then
         BUILD_JAVA_21=$( [ -z ${BUILD_JAVA_21+x} ] && echo "1.20.6" || echo "$BUILD_JAVA_21,1.20.6" )
     elif [[ "$ver" =~ ^1\.21(\.1)?$ ]]; then
         BUILD_JAVA_21=$( [ -z ${BUILD_JAVA_21+x} ] && echo "1.21.1" || echo "$BUILD_JAVA_21,1.21.1" )
@@ -106,7 +108,6 @@ if [ ! -z ${BUILD_JAVA_21+x} ]; then
         -- docker.io/maven:3.9.11-eclipse-temurin-21 ./scripts/install-spigot.sh
 fi
 
-
 if [ ! -z ${BUILD_JAVA_17+x} ]; then
     if [ -z ${JAVA_VERSION+x} ]; then
         JAVA_VERSION=17