From 55ff76a85d33df9f0f66dee3968513c29126208e Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Wed, 24 Nov 2021 14:39:30 -0600
Subject: [PATCH 1/3] docs: clarified java version compatibilities #1130

---
 README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1a7ff69c..1320af64 100644
--- a/README.md
+++ b/README.md
@@ -270,7 +270,7 @@ the server jar remain in the `/data` directory. It is safe to remove those._
 
 ## Running Minecraft server on different Java version
 
-To use a different version of Java, please use a docker tag to run your Minecraft server.
+When using the image `itzg:/minecraft-server` without a tag, the `latest` image tag is implied from the table below. To use a different version of Java, please use an alternate tag to run your Minecraft server container.
 
 | Tag name       | Java version | Linux  | JVM Type | Architecture      |
 | -------------- | -------------|--------|----------|-------------------|
@@ -283,11 +283,13 @@ To use a different version of Java, please use a docker tag to run your Minecraf
 | java16-openj9  | 16           | Debian | OpenJ9   | amd64             |
 | java17         | 17           | Ubuntu | Hotspot  | amd64,arm64,armv7 |
 
-For example, to use Java version 16 on any supported architecture:
+For example, to use Java version 8 on any supported architecture:
 
-    docker run --name mc itzg/minecraft-server:java16
+    docker run --name mc itzg/minecraft-server:java8-multiarch
 
 > Keep in mind that some versions of Minecraft server, such as Forge before 1.17, can't work on the newest versions of Java. Instead, one of the Java 8 images should be used. Also, FORGE doesn't support openj9 JVM implementation.
+> 
+> Some versions of vanilla Minecraft, such as 1.10, also do not run correctly with Java 17. If in doubt, use `java8-multiarch` for any version less than 1.17.
 
 ### Deprecated Image Tags
 

From 66ead9128a94e678bd28d55d81e0d5d2a61dbdd7 Mon Sep 17 00:00:00 2001
From: itzg <itzg@users.noreply.github.com>
Date: Wed, 24 Nov 2021 20:40:16 +0000
Subject: [PATCH 2/3] docs: Auto update markdown TOC

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1320af64..068c701a 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ By default, the container will download the latest version of the "vanilla" [Min
    * [Running on RaspberryPi](#running-on-raspberrypi)
    * [Contributing](#contributing)
 
-<!-- Added by: runner, at: Tue Nov 23 02:51:46 UTC 2021 -->
+<!-- Added by: runner, at: Wed Nov 24 20:40:15 UTC 2021 -->
 
 <!--te-->
 

From ff4d46d50953fd142920481115fa3066cc2ac207 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Wed, 24 Nov 2021 15:52:22 -0600
Subject: [PATCH 3/3] fix: corrected versionLessThan for versions with dashes
 #1132

---
 scripts/start-utils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/start-utils b/scripts/start-utils
index 497a4257..00f8a9a4 100755
--- a/scripts/start-utils
+++ b/scripts/start-utils
@@ -113,7 +113,7 @@ function normalizeMemSize() {
 
 function versionLessThan() {
   local activeParts
-  IFS=. read -ra activeParts <<<"${VANILLA_VERSION}"
+  IFS=. read -ra activeParts <<<"${VANILLA_VERSION%%-*}"
 
   local givenParts
   IFS=. read -ra givenParts <<<"$1"