From 5377941e10bfc14d6612a18d9e5c3518df61166f Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 19 Sep 2018 16:46:32 +0100 Subject: [PATCH] Fixes issues with ores, closes https://github.com/FTBTeam/FTB-Continuum/issues/461 --- src/main/java/techreborn/world/TechRebornWorldGen.java | 3 ++- src/main/java/techreborn/world/config/OreConfig.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/techreborn/world/TechRebornWorldGen.java b/src/main/java/techreborn/world/TechRebornWorldGen.java index 5f92f2c87..ae6bf2a45 100644 --- a/src/main/java/techreborn/world/TechRebornWorldGen.java +++ b/src/main/java/techreborn/world/TechRebornWorldGen.java @@ -112,10 +112,11 @@ public class TechRebornWorldGen implements IWorldGenerator { for (OreConfig defaultOre : defaultOres) { boolean hasFoundOre = false; for (OreConfig ore : config) { - if (ore.blockName.equals(defaultOre.blockName) && ore.meta == defaultOre.meta) { + if (ore.blockName.replaceAll(":", ".").equals(defaultOre.blockName.replaceAll(":", ".")) && ore.meta == defaultOre.meta) { hasFoundOre = true; // Should allow for states to be saved/loaded ore.state = defaultOre.state; + break; } } if (!hasFoundOre) { diff --git a/src/main/java/techreborn/world/config/OreConfig.java b/src/main/java/techreborn/world/config/OreConfig.java index bc76fd8d4..c9b663e7d 100644 --- a/src/main/java/techreborn/world/config/OreConfig.java +++ b/src/main/java/techreborn/world/config/OreConfig.java @@ -64,4 +64,7 @@ public class OreConfig { this.minYHeight = minYHeight; this.maxYHeight = maxYHeight; } + + public OreConfig() { + } }