From 2d222b127801e7231aefe6d69a5239ea615f7969 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 9 Apr 2022 17:27:56 -0500
Subject: [PATCH] Correct spiget handling of jars that contain jars

Fixes #1426
---
 scripts/start-spiget                           | 8 ++++----
 tests/setuponlytests/spiget/docker-compose.yml | 2 +-
 tests/setuponlytests/spiget/verify.sh          | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/start-spiget b/scripts/start-spiget
index 7d0eac5981e..d6e184169bd 100755
--- a/scripts/start-spiget
+++ b/scripts/start-spiget
@@ -101,13 +101,13 @@ downloadResourceFromSpiget() {
     log "ERROR: failed to retrieve file type of resource $resource"
     exit 1
   fi
-  if containsJars "${outfile}"; then
+  if containsPlugin "${outfile}"; then
+    log "Moving resource ${resource} into plugins"
+    mv "$outfile" /data/plugins
+  elif containsJars "${outfile}"; then
     log "Extracting contents of resource ${resource} into plugins"
     extract "$outfile" /data/plugins
     rm "$outfile"
-  elif containsPlugin "${outfile}"; then
-    log "Moving resource ${resource} into plugins"
-    mv "$outfile" /data/plugins
   else
     log "ERROR: file for resource ${resource} has an unexpected file type: ${fileType}"
     exit 2
diff --git a/tests/setuponlytests/spiget/docker-compose.yml b/tests/setuponlytests/spiget/docker-compose.yml
index a114887153a..1ee81146309 100644
--- a/tests/setuponlytests/spiget/docker-compose.yml
+++ b/tests/setuponlytests/spiget/docker-compose.yml
@@ -8,6 +8,6 @@ services:
       EULA: "TRUE"
       SETUP_ONLY: "TRUE"
       TYPE: PAPER
-      SPIGET_RESOURCES: "34315,3836,6245,2124"
+      SPIGET_RESOURCES: "34315,3836,6245,2124,88135"
     volumes:
       - ./data:/data
diff --git a/tests/setuponlytests/spiget/verify.sh b/tests/setuponlytests/spiget/verify.sh
index 848490eec10..9fc3d8fd62d 100644
--- a/tests/setuponlytests/spiget/verify.sh
+++ b/tests/setuponlytests/spiget/verify.sh
@@ -1,4 +1,5 @@
 mc-image-helper assert fileExists plugins/3836.jar
 mc-image-helper assert fileExists plugins/34315.jar
 mc-image-helper assert fileExists plugins/6245.jar
+mc-image-helper assert fileExists plugins/88135.jar
 mc-image-helper assert fileExists plugins/SkinsRestorer.jar
\ No newline at end of file