Fix loading flower data

MinicraftPlus · Dec 6, 2024 · 90bb104 · 90bb104
1 parent a2812a7
commit 90bb104
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/client/java/minicraft/saveload/Load.java b/src/client/java/minicraft/saveload/Load.java
@@ -755,7 +755,7 @@ private void loadWorld(String filename) {
 								default:
 									tilename = "White Wool";
 							}
-						} else if (worldVer.compareTo(new Version("2.2.1-dev2")) < 0) {
+						} else if (worldVer.compareTo(new Version("2.3.0-dev1")) < 0) {
 							tilename = "White Wool";
 						}
 					} else if (l == World.minLevelDepth + 1 && tilename.equalsIgnoreCase("Lapis") && worldVer.compareTo(new Version("2.0.3-dev6")) < 0) {
@@ -883,7 +883,7 @@ public static void loadTile(Version worldVer, short[] tiles, short[] data, int i
 			data[idx] = Tiles.get(matcher.group(1)).id;
 		} else {
 			tiles[idx] = Tiles.get(tileName).id;
-			if (worldVer.compareTo(new Version("2.2.1-dev1")) <= 0 && tileName.equalsIgnoreCase("FLOWER")) {
+			if (worldVer.compareTo(new Version("2.3.0-dev1")) <= 0 && tileName.equalsIgnoreCase("FLOWER")) {
 				data[idx] = 0;
 			} else {
 				data[idx] = Short.parseShort(tileData);
@@ -1046,12 +1046,9 @@ protected static String subOldName(String name, Version worldVer) {
 				name = name.replace("Potion", "Awkward Potion");
 		}
 
-		if (worldVer.compareTo(new Version("2.2.1-dev2")) < 0) {
+		if (worldVer.compareTo(new Version("2.3.0-dev1")) < 0) {
 			if (name.startsWith("Wool"))
 				name = name.replace("Wool", "White Wool");
-		}
-
-		if (worldVer.compareTo(new Version("2.2.1-dev2")) < 0) {
 			if (name.startsWith("Flower"))
 				name = name.replace("Flower", "Oxeye Daisy");
 		}