From affaf1cd686e989e3b6f0aa48d08d243c6e26b6b Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 8 Feb 2015 14:03:42 +0000 Subject: [PATCH] Force remap potion IDs if they go out of bounds. Closes #525 --- .../common/core/handler/ConfigHandler.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 829dc4665..c3a5a54e1 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -59,11 +59,11 @@ public final class ConfigHandler { public static int flowerQuantity = 2; public static int flowerDensity = 16; - public static int potionIDSoulCross = 191; - public static int potionIDFeatherfeet = 192; - public static int potionIDEmptiness = 193; - public static int potionIDBloodthirst = 194; - public static int potionIDAllure = 195; + public static int potionIDSoulCross = 91; + public static int potionIDFeatherfeet = 92; + public static int potionIDEmptiness = 93; + public static int potionIDBloodthirst = 94; + public static int potionIDAllure = 95; public static void loadConfig(File configFile) { config = new Configuration(configFile); @@ -198,7 +198,13 @@ public final class ConfigHandler { public static int loadPropPotionId(String propName, int default_) { Property prop = config.get(CATEGORY_POTIONS, propName, default_); - return prop.getInt(default_); + int val = prop.getInt(default_); + if(val > 127) { + val = default_; + prop.set(default_); + } + + return val; } public static class ChangeListener {