MOTD no longer needs to be pre-normalized (#2434)

2023-10-13 15:54:45 -05:00 · 2023-10-13 15:54:45 -05:00 · 2ebcc0fe00
parent e5f818bdf1
commit 2ebcc0fe00
19 changed files with 1 additions and 3 deletions
--- a/scripts/start-setupServerProperties
+++ b/scripts/start-setupServerProperties
@ -28,9 +28,6 @@ function customizeServerProps {
      MOTD="{\"text\":\"${MOTD}\"}"
    fi
  fi
-  if [[ $MOTD ]]; then
-    MOTD="$(echo "$MOTD" | mc-image-helper asciify)"
-  fi

  if [[ -v MODE ]]; then
    log "Setting mode"
--- a/tests/setuponlytests/cf_files/require.sh
+++ b/tests/setuponlytests/cf_files/require.sh
--- a/tests/setuponlytests/conflicting_world_for_spigot_server/require.sh
+++ b/tests/setuponlytests/conflicting_world_for_spigot_server/require.sh
--- a/tests/setuponlytests/conflicting_world_for_vanilla_server/require.sh
+++ b/tests/setuponlytests/conflicting_world_for_vanilla_server/require.sh
--- a/tests/setuponlytests/curseforge/require.sh
+++ b/tests/setuponlytests/curseforge/require.sh
--- a/tests/setuponlytests/icon-file-exact/require.sh
+++ b/tests/setuponlytests/icon-file-exact/require.sh
--- a/tests/setuponlytests/icon-gif-multiframe/require.sh
+++ b/tests/setuponlytests/icon-gif-multiframe/require.sh
--- a/tests/setuponlytests/icon-png-atscale/require.sh
+++ b/tests/setuponlytests/icon-png-atscale/require.sh
--- a/tests/setuponlytests/pufferfish/require.sh
+++ b/tests/setuponlytests/pufferfish/require.sh
--- a/tests/setuponlytests/quilt/require.sh
+++ b/tests/setuponlytests/quilt/require.sh
--- a/tests/setuponlytests/spiget/require.sh
+++ b/tests/setuponlytests/spiget/require.sh
@ -0,0 +1 @@
+[[ $EXTENDED_TESTS ]] || exit 1
--- a/tests/setuponlytests/spigot_world_for_vanilla_server/require.sh
+++ b/tests/setuponlytests/spigot_world_for_vanilla_server/require.sh
--- a/tests/setuponlytests/spongevanilla_version_compare/require.sh
+++ b/tests/setuponlytests/spongevanilla_version_compare/require.sh
--- a/tests/setuponlytests/test.sh
+++ b/tests/setuponlytests/test.sh
--- a/tests/setuponlytests/vanilla_world_for_spigot_server/require.sh
+++ b/tests/setuponlytests/vanilla_world_for_spigot_server/require.sh
--- a/tests/setuponlytests/vanillatweaks_sharecode/require.sh
+++ b/tests/setuponlytests/vanillatweaks_sharecode/require.sh
--- a/tests/setuponlytests/world_from_tar/require.sh
+++ b/tests/setuponlytests/world_from_tar/require.sh
--- a/tests/setuponlytests/world_from_tarbz2/require.sh
+++ b/tests/setuponlytests/world_from_tarbz2/require.sh
--- a/tests/setuponlytests/world_from_tarzst/require.sh
+++ b/tests/setuponlytests/world_from_tarzst/require.sh