From e56c0cdbb9ffbdfa1a43b4955ade6d961e3727aa Mon Sep 17 00:00:00 2001 From: Saurabh Totey Date: Mon, 4 Nov 2019 19:15:14 -0700 Subject: [PATCH] Removed unnecessary altar tier checks in attempt to fix #1646 (#1665) * Removed altar tier check for altar consumption * Removed altar tier check for altar consumption for blood orbs --- src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 5dda98bc..e35cdcdf 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -291,7 +291,7 @@ public class BloodAltar implements IFluidHandler { hasOperated = true; } if (fluid != null && fluid.amount >= 1) { - int liquidDrained = Math.min((int) (altarTier.ordinal() >= 2 ? consumptionRate * (1 + consumptionMultiplier) : consumptionRate), fluid.amount); + int liquidDrained = Math.min((int) (consumptionRate * (1 + consumptionMultiplier)), fluid.amount); if (liquidDrained > (liquidRequired * stackSize - progress)) liquidDrained = liquidRequired * stackSize - progress; @@ -353,7 +353,7 @@ public class BloodAltar implements IFluidHandler { return; if (fluid != null && fluid.amount >= 1) { - int liquidDrained = Math.min((int) (altarTier.ordinal() >= 2 ? orb.getFillRate() * (1 + consumptionMultiplier) : orb.getFillRate()), fluid.amount); + int liquidDrained = Math.min((int) (orb.getFillRate() * (1 + consumptionMultiplier)), fluid.amount); int drain = NetworkHelper.getSoulNetwork(binding).add(SoulTicket.block(world, pos, liquidDrained), (int) (orb.getCapacity() * this.orbCapacityMultiplier)); fluid.amount = fluid.amount - drain;