Correct spiget handling of jars that contain jars (#1462)

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

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

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