From ab2d8fa01b0ac049c10d1efe16dbfb3ec85e50a9 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Wed, 25 Sep 2013 16:58:36 -0700 Subject: [PATCH] Add wrapper exception to the new Structure ID system to point to the correct Structure. --- .../gen/structure/StructureComponent.java.patch | 14 ++++++++++++++ .../world/gen/structure/StructureStart.java.patch | 14 ++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 patches/minecraft/net/minecraft/world/gen/structure/StructureComponent.java.patch create mode 100644 patches/minecraft/net/minecraft/world/gen/structure/StructureStart.java.patch diff --git a/patches/minecraft/net/minecraft/world/gen/structure/StructureComponent.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/StructureComponent.java.patch new file mode 100644 index 0000000000..df5b89c361 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureComponent.java.patch @@ -0,0 +1,14 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/structure/StructureComponent.java ++++ ../src_work/minecraft/net/minecraft/world/gen/structure/StructureComponent.java +@@ -35,6 +35,11 @@ + + public NBTTagCompound func_143010_b() + { ++ if (MapGenStructureIO.func_143036_a(this) == null) ++ { ++ throw new RuntimeException("StructureComponent \"" + this.getClass().getName() + "\" missing ID Mapping, Modder see MapGenStructureIO"); ++ } ++ + NBTTagCompound nbttagcompound = new NBTTagCompound(); + nbttagcompound.setString("id", MapGenStructureIO.func_143036_a(this)); + nbttagcompound.setTag("BB", this.boundingBox.func_143047_a("BB")); diff --git a/patches/minecraft/net/minecraft/world/gen/structure/StructureStart.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/StructureStart.java.patch new file mode 100644 index 0000000000..5a00556cd5 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureStart.java.patch @@ -0,0 +1,14 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/structure/StructureStart.java ++++ ../src_work/minecraft/net/minecraft/world/gen/structure/StructureStart.java +@@ -68,6 +68,11 @@ + + public NBTTagCompound func_143021_a(int par1, int par2) + { ++ if (MapGenStructureIO.func_143033_a(this) == null) ++ { ++ throw new RuntimeException("StructureStart \"" + this.getClass().getName() + "\" missing ID Mapping, Modder see MapGenStructureIO"); ++ } ++ + NBTTagCompound nbttagcompound = new NBTTagCompound(); + nbttagcompound.setString("id", MapGenStructureIO.func_143033_a(this)); + nbttagcompound.setInteger("ChunkX", par1);