diff --git a/src/main/java/com/hbm/blocks/generic/DungeonSpawner.java b/src/main/java/com/hbm/blocks/generic/DungeonSpawner.java index f74bf86b9..df541e443 100644 --- a/src/main/java/com/hbm/blocks/generic/DungeonSpawner.java +++ b/src/main/java/com/hbm/blocks/generic/DungeonSpawner.java @@ -87,13 +87,13 @@ public class DungeonSpawner extends BlockContainer { int z = tile.zCoord; if(tile.phase == 0) { if(world.getTotalWorldTime() % 20 != 0) return false; - return !world.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(20, 10, 20)).isEmpty(); + //return !world.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(20, 10, 20)).isEmpty(); } if(tile.phase < 3) { if(world.getTotalWorldTime() % 20 != 0 || tile.timer < 60) return false; - return world.getEntitiesWithinAABB(EntityUndeadSoldier.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(50, 20, 50)).isEmpty(); + //return world.getEntitiesWithinAABB(EntityUndeadSoldier.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(50, 20, 50)).isEmpty(); } - return true; + return false; }; public static Consumer PHASE_TEST = (tile) -> { diff --git a/src/main/java/com/hbm/items/tool/ItemConveyorWand.java b/src/main/java/com/hbm/items/tool/ItemConveyorWand.java index f3b386723..b393d59f5 100644 --- a/src/main/java/com/hbm/items/tool/ItemConveyorWand.java +++ b/src/main/java/com/hbm/items/tool/ItemConveyorWand.java @@ -506,7 +506,7 @@ public class ItemConveyorWand extends Item implements ILookOverlay { @SideOnly(Side.CLIENT) public void printHook(Pre event, World world, int x, int y, int z) { EntityPlayer player = MainRegistry.proxy.me(); - if(player == null || !player.isSneaking()) return; + if(player == null || !player.isSneaking() || !player.capabilities.isCreativeMode) return; Block block = world.getBlock(x, y, z); if(block instanceof BlockConveyorBase) { diff --git a/src/main/java/com/hbm/items/weapon/sedna/mags/MagazineFullReload.java b/src/main/java/com/hbm/items/weapon/sedna/mags/MagazineFullReload.java index f93420294..25f25c2c1 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/mags/MagazineFullReload.java +++ b/src/main/java/com/hbm/items/weapon/sedna/mags/MagazineFullReload.java @@ -75,7 +75,7 @@ public class MagazineFullReload extends MagazineSingleTypeBase { if(config.ammo.matchesRecipe(slot, true)) { int alreadyLoaded = this.getAmount(stack, inventory); - int wantsToLoad = (int) Math.ceil((double) this.getCapacity(stack) / (double) config.ammoReloadCount) - (alreadyLoaded / config.ammoReloadCount); + int wantsToLoad = (int) Math.ceil((double) (this.getCapacity(stack) - alreadyLoaded) / (double) config.ammoReloadCount); int toLoad = Math.min(wantsToLoad, slot.stackSize); this.setAmount(stack, Math.min((toLoad * config.ammoReloadCount) + alreadyLoaded, this.capacity)); inventory.decrStackSize(i, toLoad); diff --git a/src/main/resources/assets/hbm/structures/spire.nbt b/src/main/resources/assets/hbm/structures/spire.nbt new file mode 100644 index 000000000..0a23bdd39 Binary files /dev/null and b/src/main/resources/assets/hbm/structures/spire.nbt differ