From fda5389ac228d38be6012ba7b9244135294c451e Mon Sep 17 00:00:00 2001 From: Boblet Date: Tue, 10 Jan 2023 16:40:44 +0100 Subject: [PATCH] fixes, again --- src/main/java/com/hbm/config/FalloutConfigJSON.java | 4 ++-- .../hbm/tileentity/machine/TileEntityMachineMiningLaser.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hbm/config/FalloutConfigJSON.java b/src/main/java/com/hbm/config/FalloutConfigJSON.java index 0801c078e..eba732a84 100644 --- a/src/main/java/com/hbm/config/FalloutConfigJSON.java +++ b/src/main/java/com/hbm/config/FalloutConfigJSON.java @@ -309,10 +309,10 @@ public class FalloutConfigJSON { if(obj.has("primarySubstitution")) entry.prim(readMetaArray(obj.get("primarySubstitution"))); if(obj.has("secondarySubstitutions")) entry.sec(readMetaArray(obj.get("secondarySubstitutions"))); - if(obj.has("chance")) entry.c(obj.get("chance").getAsInt()); + if(obj.has("chance")) entry.c(obj.get("chance").getAsDouble()); if(obj.has("minimumDistancePercent")) entry.min(obj.get("minimumDistancePercent").getAsDouble()); - if(obj.has("maximumDistancePercent")) entry.min(obj.get("maximumDistancePercent").getAsDouble()); + if(obj.has("maximumDistancePercent")) entry.max(obj.get("maximumDistancePercent").getAsDouble()); return entry; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java index 806a425e6..7ad5f1698 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java @@ -419,7 +419,7 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen } private boolean canBreak(Block block, int x, int y, int z) { - return block.isAir(worldObj, x, y, z) && block.getBlockHardness(worldObj, x, y, z) >= 0 && !block.getMaterial().isLiquid() && block != Blocks.bedrock; + return !block.isAir(worldObj, x, y, z) && block.getBlockHardness(worldObj, x, y, z) >= 0 && !block.getMaterial().isLiquid() && block != Blocks.bedrock; } public int getRange() {