fix possible crash on getting mode

rosebudmods · Aug 23, 2024 · 0207f43 · 0207f43
1 parent 29b3ded
commit 0207f43
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/io/ix0rai/rainglow/config/PerWorldConfig.java b/src/main/java/io/ix0rai/rainglow/config/PerWorldConfig.java
@@ -46,11 +46,14 @@ public RainglowMode getMode(World world) {
 			}
 		}
 
-		if (mode == null) {
-			return RainglowMode.get(Rainglow.CONFIG.defaultMode.value());
-		} else {
-			return RainglowMode.get(mode);
+		if (mode != null) {
+			RainglowMode rainglowMode = RainglowMode.get(mode);
+			if (rainglowMode != null) {
+				return rainglowMode;
+			}
 		}
+
+		return RainglowMode.get(Rainglow.CONFIG.defaultMode.value());
 	}
 
 	public void setMode(World world, RainglowMode mode) {