Keep DIM1/DIM-1 subdirectories when cloning a vanilla world directory for Spigot (#4334)

docs/requirements.txt

@@ -2,7 +2,7 @@ click==8.5.0
 colorama==0.4.6
 deepmerge==3.0.1
 ghp-import==2.1.0
-griffe==2.3.2
+griffe==2.3.0
 Jinja2==3.1.6
 Markdown==3.11
 MarkupSafe==3.0.4
@@ -10,16 +10,16 @@ mergedeep==1.3.4
 mkdocs==1.6.1
 mkdocs-autorefs==1.4.4
 mkdocs-get-deps==0.2.2
-mkdocstrings==1.0.7
+mkdocstrings==1.0.6
 mkdocstrings-python==2.0.9
 packaging==26.3
 pathspec==1.1.1
-platformdirs==4.13.0
+platformdirs==4.12.3
 Pygments==2.21.0
-pymdown-extensions==12.2
+pymdown-extensions==12.1
 python-dateutil==2.9.0.post0
 PyYAML==6.0.3
 pyyaml_env_tag==1.1
 six==1.17.0
 watchdog==6.0.0
-zensical==0.0.69
+zensical==0.0.67

scripts/start-autopause

@@ -53,17 +53,6 @@ if [[ "$AUTOPAUSE_KNOCK_INTERFACE" == "lo" ]] ; then
   logWarning "         Continuing with this setting."
 fi
 
-if [[ -n "$MAX_TICK_TIME" && "$MAX_TICK_TIME" != "-1" ]] ; then
-  logWarning "MAX_TICK_TIME is non-default, for autopause to work properly, this check should be disabled (-1 for versions >= 1.8.1)"
-elif [[ -z "$MAX_TICK_TIME" ]] ; then
-  MAX_TICK_TIME=-1
-  if versionLessThan 1.8.1; then
-    # 10 years
-    MAX_TICK_TIME=315360000000
-  fi
-  export MAX_TICK_TIME
-fi
-
 # seq_cooldown cannot be larger than AUTOPAUSE_TIMEOUT_KN, otherwise the server may
 # become paused while knockd is still ignoring packets, preventing players from joining.
 let COOLDOWN=$AUTOPAUSE_TIMEOUT_KN/2

scripts/start-configuration

@@ -207,6 +207,17 @@ if isTrue "${VERSION_FROM_MODRINTH_PROJECTS:-}" && [[ ${MODRINTH_PROJECTS:-} ]];
 fi
 
 if isTrue "${ENABLE_AUTOPAUSE}"; then
+  if [[ -n "${MAX_TICK_TIME:-}" && "$MAX_TICK_TIME" != "-1" ]] ; then
+    logWarning "MAX_TICK_TIME is non-default, for autopause to work properly, this check should be disabled (-1 for versions >= 1.8.1)"
+  elif [[ -z "${MAX_TICK_TIME:-}" ]] ; then
+    MAX_TICK_TIME=-1
+    if versionLessThan 1.8.1; then
+      # 10 years
+      MAX_TICK_TIME=315360000000
+    fi
+    export MAX_TICK_TIME
+  fi
+  # Keep the default in this process so it reaches server.properties setup.
   "$(dirname "$0")/start-autopause"
 elif isTrue "${ENABLE_AUTOSTOP}"; then
   "$(dirname "$0")/start-autostop"

scripts/start-setupWorld

@@ -127,8 +127,14 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
   if [ "$FAMILY" = "SPIGOT" ]; then
     # Reorganise if a Spigot server
     log "Moving End and Nether maps to Spigot location"
-    [ -d "$worldDest/DIM1" ] && mv -f "$worldDest/DIM1" "${worldDest}_the_end"
-    [ -d "$worldDest/DIM-1" ] && mv -f "$worldDest/DIM-1" "${worldDest}_nether"
+    if [ -d "$worldDest/DIM1" ]; then
+      mkdir -p "${worldDest}_the_end"
+      mv -f "$worldDest/DIM1" "${worldDest}_the_end/"
+    fi
+    if [ -d "$worldDest/DIM-1" ]; then
+      mkdir -p "${worldDest}_nether"
+      mv -f "$worldDest/DIM-1" "${worldDest}_nether/"
+    fi
   fi
 fi
 

tests/setuponlytests/vanilla_world_dir_for_spigot_server/docker-compose.yml

@@ -0,0 +1,15 @@
+services:
+  mc:
+    restart: "no"
+    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
+    environment:
+      EULA: "TRUE"
+      SETUP_ONLY: "TRUE"
+      TYPE: "PAPER"
+      WORLD: /worlds/world
+      # the following are only used to speed up test execution
+      VERSION: 1.18.1
+      PAPER_CUSTOM_JAR: /servers/fake.jar
+    volumes:
+      - ./worlds:/worlds:ro
+      - ./data:/data

tests/setuponlytests/vanilla_world_dir_for_spigot_server/verify.sh

@@ -0,0 +1,3 @@
+mc-image-helper assert fileExists world/level.dat && \
+mc-image-helper assert fileExists world_nether/DIM-1/some_nether_file && \
+mc-image-helper assert fileExists world_the_end/DIM1/some_end_file