diff --git a/core/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java b/core/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java index cb156dc65..adfb25a96 100644 --- a/core/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java +++ b/core/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java @@ -33,6 +33,7 @@ import com.volmit.iris.util.nbt.mca.palette.MCAPaletteAccess; import com.volmit.iris.util.nbt.tag.CompoundTag; import org.bukkit.*; import org.bukkit.block.Biome; +import org.bukkit.block.data.BlockData; import org.bukkit.entity.Dolphin; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisMerger.java b/core/src/main/java/com/volmit/iris/engine/object/IrisMerger.java index d3867e3ea..64a300191 100644 --- a/core/src/main/java/com/volmit/iris/engine/object/IrisMerger.java +++ b/core/src/main/java/com/volmit/iris/engine/object/IrisMerger.java @@ -48,7 +48,7 @@ public class IrisMerger { private boolean useMemoryWorld = false; @Desc("Allows to gen chunks on the mergers world") - private boolean allowGenChunks = false; + private boolean allowGenChunks = true; @Desc("Uses a world instead of a generator") private String world; diff --git a/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java b/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java index 6f22e3585..c531f1048 100644 --- a/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java +++ b/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java @@ -572,12 +572,18 @@ public class NMSBinding implements INMSBinding { return null; } - @Override public Entity spawnEntity(Location location, org.bukkit.entity.EntityType type, CreatureSpawnEvent.SpawnReason reason) { return ((CraftWorld) location.getWorld()).spawn(location, type.getEntityClass(), null, reason); } + @Override + public boolean setBlock(World world, int x, int y, int z, BlockData data, int flag, int updateDepth) { + var level = ((CraftWorld) world).getHandle(); + var blockData = ((CraftBlockData) data).getState(); + return level.setBlock(new BlockPos(x, y, z), blockData, flag, updateDepth); + } + @Override public Color getBiomeColor(Location location, BiomeColor type) { LevelReader reader = ((CraftWorld) location.getWorld()).getHandle(); diff --git a/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java b/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java index b7963e6b4..f3df1953b 100644 --- a/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java +++ b/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java @@ -575,6 +575,12 @@ public class NMSBinding implements INMSBinding { return null; } + @Override + public boolean setBlock(World world, int x, int y, int z, BlockData data, int flag, int updateDepth) { + var level = ((CraftWorld) world).getHandle(); + var blockData = ((CraftBlockData) data).getState(); + return level.setBlock(new BlockPos(x, y, z), blockData, flag, updateDepth); + } @Override public Entity spawnEntity(Location location, org.bukkit.entity.EntityType type, CreatureSpawnEvent.SpawnReason reason) {