From a525cab5ff668dd9920ee045183c91a7b43b1790 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Wed, 18 Sep 2013 23:37:23 -0700 Subject: [PATCH] Move the Structure data save files to per-world data folders. Vanilla saves them to the global folder which will potentially cause conflicts if two worlds generate 'Villages'. Which in the modded world is highly likely. Refer back to the long standing vanilla issue where nether 'villages' would override the overworlds villages, it's the same situation. --- .../gen/structure/MapGenStructure.java.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 patches/minecraft/net/minecraft/world/gen/structure/MapGenStructure.java.patch diff --git a/patches/minecraft/net/minecraft/world/gen/structure/MapGenStructure.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/MapGenStructure.java.patch new file mode 100644 index 0000000000..d690244d14 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/structure/MapGenStructure.java.patch @@ -0,0 +1,17 @@ +--- ../src_base/minecraft/net/minecraft/world/gen/structure/MapGenStructure.java ++++ ../src_work/minecraft/net/minecraft/world/gen/structure/MapGenStructure.java +@@ -234,12 +234,12 @@ + { + if (this.field_143029_e == null) + { +- this.field_143029_e = (MapGenStructureData)par1World.loadItemData(MapGenStructureData.class, this.func_143025_a()); ++ this.field_143029_e = (MapGenStructureData)par1World.perWorldStorage.loadData(MapGenStructureData.class, this.func_143025_a()); + + if (this.field_143029_e == null) + { + this.field_143029_e = new MapGenStructureData(this.func_143025_a()); +- par1World.setItemData(this.func_143025_a(), this.field_143029_e); ++ par1World.perWorldStorage.setData(this.func_143025_a(), this.field_143029_e); + } + else + {