diff --git a/src/main/java/com/volmit/iris/core/edit/DustRevealer.java b/src/main/java/com/volmit/iris/core/edit/DustRevealer.java index ffaf9e724..142791656 100644 --- a/src/main/java/com/volmit/iris/core/edit/DustRevealer.java +++ b/src/main/java/com/volmit/iris/core/edit/DustRevealer.java @@ -98,7 +98,7 @@ public class DustRevealer { Engine access = IrisToolbelt.access(world).getEngine(); if(access != null) { - String a = access.getObjectPlacementKey(block.getX(), block.getY(), block.getZ()); + String a = access.getObjectPlacementKey(block.getX(), block.getY() - block.getWorld().getMinHeight(), block.getZ()); if(a != null) { world.playSound(block.getLocation(), Sound.ITEM_LODESTONE_COMPASS_LOCK, 1f, 0.1f); diff --git a/src/main/java/com/volmit/iris/core/service/WandSVC.java b/src/main/java/com/volmit/iris/core/service/WandSVC.java index 244163b9f..4b60d0664 100644 --- a/src/main/java/com/volmit/iris/core/service/WandSVC.java +++ b/src/main/java/com/volmit/iris/core/service/WandSVC.java @@ -42,6 +42,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; @@ -388,6 +389,8 @@ public class WandSVC implements IrisService { @EventHandler public void on(PlayerInteractEvent e) { + if(e.getHand() != EquipmentSlot.HAND) + return; try { if(isHoldingWand(e.getPlayer())) { if(e.getAction().equals(Action.LEFT_CLICK_BLOCK)) { diff --git a/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java b/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java index 3af60176c..7e1ad4c01 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java @@ -60,7 +60,7 @@ public class IrisEngineMantle implements EngineMantle { public IrisEngineMantle(Engine engine) { this.engine = engine; - this.mantle = new Mantle(new File(engine.getWorld().worldFolder(), "mantle"), engine.getTarget().getHeight(), engine.getTarget().getMinY()); + this.mantle = new Mantle(new File(engine.getWorld().worldFolder(), "mantle"), engine.getTarget().getHeight()); radius = radCache.aquire(this::computeParallaxSize); components = new KList<>(); registerComponent(new MantleCarvingComponent(this)); diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java index 736d680f2..cd33cf998 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java @@ -42,8 +42,6 @@ public class EngineTarget { return world.maxHeight() - world.minHeight(); } - public int getMinY() { return world.minHeight(); } - public void close() { } diff --git a/src/main/java/com/volmit/iris/util/mantle/Mantle.java b/src/main/java/com/volmit/iris/util/mantle/Mantle.java index 1b12d52ce..e08222ed8 100644 --- a/src/main/java/com/volmit/iris/util/mantle/Mantle.java +++ b/src/main/java/com/volmit/iris/util/mantle/Mantle.java @@ -58,7 +58,6 @@ import java.util.concurrent.atomic.AtomicBoolean; public class Mantle { private final File dataFolder; private final int worldHeight; - private final int minY; private final Map lastUse; @Getter private final Map loadedRegions; @@ -77,12 +76,11 @@ public class Mantle { * the world's height (in blocks) */ @BlockCoordinates - public Mantle(File dataFolder, int worldHeight, int minY) { + public Mantle(File dataFolder, int worldHeight) { this.hyperLock = new HyperLock(); this.closed = new AtomicBoolean(false); this.dataFolder = dataFolder; this.worldHeight = worldHeight; - this.minY = minY; this.io = new AtomicBoolean(false); dataFolder.mkdirs(); unload = new KSet<>(); @@ -354,7 +352,6 @@ public class Mantle { @SuppressWarnings("unchecked") @BlockCoordinates public T get(int x, int y, int z, Class t) { - y -= minY; if(closed.get()) { throw new RuntimeException("The Mantle is closed"); }