lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed unnecessary altar tier checks in attempt to fix #1646 (#1665)

Browse source 
* Removed altar tier check for altar consumption

* Removed altar tier check for altar consumption for blood orbs
This commit is contained in:
Saurabh Totey 2019-11-04 19:15:14 -07:00 • committed by Nick Ignoffo
parent a02631d9be
commit e56c0cdbb9
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java
View file

@ -291,7 +291,7 @@ public class BloodAltar implements IFluidHandler {
hasOperated = true; hasOperated = true;
} }
if (fluid != null && fluid.amount >= 1) { 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)) if (liquidDrained > (liquidRequired * stackSize - progress))
liquidDrained = liquidRequired * stackSize - progress; liquidDrained = liquidRequired * stackSize - progress;
@ -353,7 +353,7 @@ public class BloodAltar implements IFluidHandler {
return; return;
if (fluid != null && fluid.amount >= 1) { 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)); int drain = NetworkHelper.getSoulNetwork(binding).add(SoulTicket.block(world, pos, liquidDrained), (int) (orb.getCapacity() * this.orbCapacityMultiplier));
fluid.amount = fluid.amount - drain; fluid.amount = fluid.amount - drain;