From 5b2bf383445945dc298bfde790f0e9198d7effcc Mon Sep 17 00:00:00 2001 From: Vatuu <21113232+Vatuu@users.noreply.github.com> Date: Fri, 9 Sep 2022 18:10:52 +0200 Subject: [PATCH 1/3] Fixed Issue #884: Cache freaking out on global override. --- .../java/com/volmit/iris/engine/object/IrisObjectPlacement.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java index 5fd50d186..d090439f1 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java @@ -203,6 +203,8 @@ public class IrisObjectPlacement { TableCache tc = new TableCache(); for(IrisObjectLoot loot : getLoot()) { + if(loot == null) + continue; IrisLootTable table = manager.getLootLoader().load(loot.getName()); if(table == null) { Iris.warn("Couldn't find loot table " + loot.getName()); From 1904f67662b33c346fd63889ebbe8487fa852c67 Mon Sep 17 00:00:00 2001 From: Vatuu <21113232+Vatuu@users.noreply.github.com> Date: Fri, 9 Sep 2022 19:48:23 +0200 Subject: [PATCH 2/3] Fixed Issue #864: Mantle not retaining object placements. --- .../java/com/volmit/iris/engine/jigsaw/PlannedStructure.java | 3 +-- .../iris/engine/mantle/components/MantleObjectComponent.java | 4 +--- src/main/java/com/volmit/iris/util/matter/Matter.java | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java index dfda4e11f..33378aeb0 100644 --- a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java +++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java @@ -126,8 +126,7 @@ public class PlannedStructure { } int id = rng.i(0, Integer.MAX_VALUE); - vo.place(xx, height, zz, placer, options, rng, e.shouldReduce(eng) ? null : (b) - -> e.set(b.getX(), b.getY(), b.getZ(), v.getLoadKey() + "@" + id), null, getData()); + vo.place(xx, height, zz, placer, options, rng, (b) -> e.set(b.getX(), b.getY(), b.getZ(), v.getLoadKey() + "@" + id), null, getData()); } public void place(World world) { diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java index 432a6bb7b..91f200a2e 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java @@ -95,9 +95,7 @@ public class MantleObjectComponent extends IrisMantleComponent { int xx = rng.i(x, x + 15); int zz = rng.i(z, z + 15); int id = rng.i(0, Integer.MAX_VALUE); - v.place(xx, -1, zz, writer, objectPlacement, rng, - getMantle().shouldReduce(getEngineMantle().getEngine()) ? null : (b) -> writer.setData(b.getX(), b.getY(), b.getZ(), - v.getLoadKey() + "@" + id), null, getData()); + v.place(xx, -1, zz, writer, objectPlacement, rng, (b) -> writer.setData(b.getX(), b.getY(), b.getZ(), v.getLoadKey() + "@" + id), null, getData()); } } diff --git a/src/main/java/com/volmit/iris/util/matter/Matter.java b/src/main/java/com/volmit/iris/util/matter/Matter.java index d9b2a65fd..3bc390a83 100644 --- a/src/main/java/com/volmit/iris/util/matter/Matter.java +++ b/src/main/java/com/volmit/iris/util/matter/Matter.java @@ -24,7 +24,6 @@ import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.BlockPosition; -import com.volmit.iris.util.scheduling.J; import org.bukkit.World; import org.bukkit.block.data.BlockData; import org.bukkit.entity.Entity; From 94557830f51a8797f122d3c592ed449ec64618e6 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Fri, 9 Sep 2022 18:02:21 -0700 Subject: [PATCH 3/3] v+ --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9bcc6d3d5..3d3674606 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ plugins { id "de.undercouch.download" version "5.0.1" } -version '2.2.17-1.19.2' // Needs to be version specific +version '2.2.18-1.19.2' // Needs to be version specific def nmsVersion = "1.19.2" //[NMS] def apiVersion = '1.19' def specialSourceVersion = '1.11.0' //[NMS]