From 16ed35d9fbb3d2207d8e16c5c9a89e9d6fb95fb9 Mon Sep 17 00:00:00 2001 From: DrZed Date: Thu, 5 Feb 2015 14:16:32 -0600 Subject: [PATCH] Fix things now ready for karel :P --- .../java/HxCKDMS/HxCBlocks/Events/EventBlockInteract.java | 2 +- src/main/java/HxCKDMS/HxCBlocks/Events/EventSlaughter.java | 4 ++-- src/main/java/HxCKDMS/HxCBlocks/Events/EventVacuumItems.java | 4 ++-- src/main/java/HxCKDMS/HxCBlocks/Events/EventVacuumXP.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/HxCKDMS/HxCBlocks/Events/EventBlockInteract.java b/src/main/java/HxCKDMS/HxCBlocks/Events/EventBlockInteract.java index f7c370b..4096a8b 100644 --- a/src/main/java/HxCKDMS/HxCBlocks/Events/EventBlockInteract.java +++ b/src/main/java/HxCKDMS/HxCBlocks/Events/EventBlockInteract.java @@ -102,7 +102,7 @@ public void onPlayerInteract(PlayerInteractEvent event) { stack.setTagCompound(dat); } } - } else if (tile instanceof TileBarrier && event.action.equals(PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) && item instanceof ItemSpade) { + } else if (tile instanceof TileBarrier && event.action.equals(PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) && item instanceof ItemSoulFragment) { TileBarrier HxCTile = (TileBarrier) tile; HxCTile.modifier = (HxCTile.modifier + 1); if (!world.isRemote) diff --git a/src/main/java/HxCKDMS/HxCBlocks/Events/EventSlaughter.java b/src/main/java/HxCKDMS/HxCBlocks/Events/EventSlaughter.java index eb7837b..500fd42 100644 --- a/src/main/java/HxCKDMS/HxCBlocks/Events/EventSlaughter.java +++ b/src/main/java/HxCKDMS/HxCBlocks/Events/EventSlaughter.java @@ -28,7 +28,7 @@ public void Slaughter(int[] coords, World world){ } protected AxisAlignedBB getAreaBoundingBox(float x, float y, float z, int mod) { - return AxisAlignedBB.getBoundingBox(x - (0.5 + mod), y - (1.5 + mod), z - (0.5 + mod), - /** Indented because CDO :P **/ (x + 0.5) + mod, (y + 1.5) + mod, z +(0.5 + mod)); + return AxisAlignedBB.getBoundingBox(x - 1 + mod, y - 1 + mod, z - 1 + mod, + /** Indented because CDO :P **/ x + 0.5 + mod, y + 1 + mod, z +1 + mod); } } diff --git a/src/main/java/HxCKDMS/HxCBlocks/Events/EventVacuumItems.java b/src/main/java/HxCKDMS/HxCBlocks/Events/EventVacuumItems.java index f9dde8d..2543eee 100644 --- a/src/main/java/HxCKDMS/HxCBlocks/Events/EventVacuumItems.java +++ b/src/main/java/HxCKDMS/HxCBlocks/Events/EventVacuumItems.java @@ -30,7 +30,7 @@ public void vacuum(int[] coords, World world) { } protected AxisAlignedBB getAreaBoundingBox(float x, float y, float z, int mod) { - return AxisAlignedBB.getBoundingBox(x - (0.5 + mod), y - (2 + mod), z - (0.5 + mod), - /** Indented because CDO :P **/ (x + 0.5) + mod, (y + 2) + mod, z +(0.5 + mod)); + return AxisAlignedBB.getBoundingBox(x - 1 + mod, y - 1 + mod, z - 1 + mod, + /** Indented because CDO :P **/ x + 0.5 + mod, y + 1 + mod, z +1 + mod); } } diff --git a/src/main/java/HxCKDMS/HxCBlocks/Events/EventVacuumXP.java b/src/main/java/HxCKDMS/HxCBlocks/Events/EventVacuumXP.java index 4bd7ac5..e48ec53 100644 --- a/src/main/java/HxCKDMS/HxCBlocks/Events/EventVacuumXP.java +++ b/src/main/java/HxCKDMS/HxCBlocks/Events/EventVacuumXP.java @@ -33,7 +33,7 @@ public void vacuum(int[] coords, World world) { } protected AxisAlignedBB getAreaBoundingBox(float x, float y, float z, int mod) { - return AxisAlignedBB.getBoundingBox(x - (0.5 + mod), y - (2 + mod), z - (0.5 + mod), - /** Indented because CDO :P **/ (x + 0.5) + mod, (y + 2) + mod, z +(0.5 + mod)); + return AxisAlignedBB.getBoundingBox(x - 1 + mod, y - 1 + mod, z - 1 + mod, + /** Indented because CDO :P **/ x + 0.5 + mod, y + 1 + mod, z +1 + mod); } }