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

Fixed the Blood Altar so it can actually fill Blood Orbs (derp).

Browse source
This commit is contained in:
WayofTime 2018-04-22 20:59:29 -04:00
parent f4aef16ed1
commit 6522b0fa1b
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog.txt
View file

@ -2,7 +2,7 @@
Version 2.2.10 Version 2.2.10
------------------------------------------------------ ------------------------------------------------------
- Fixed Turret Array crash on servers. - Fixed Turret Array crash on servers.
- Fixed the Blood Altar so it can actually fill Blood Orbs (derp).
------------------------------------------------------ ------------------------------------------------------
Version 2.2.9 Version 2.2.9

2
gradle.properties
View file

@ -1,6 +1,6 @@
mod_name=BloodMagic mod_name=BloodMagic
package_group=com.wayoftime.bloodmagic package_group=com.wayoftime.bloodmagic
mod_version=2.2.8 mod_version=2.2.10
mc_version=1.12.2 mc_version=1.12.2
forge_version=14.23.2.2611 forge_version=14.23.2.2611
curse_id=224791 curse_id=224791

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

@ -268,7 +268,7 @@ public class BloodAltar implements IFluidHandler
return; return;
} }
if (recipe == null) if (!canBeFilled && recipe == null)
{ {
startCycle(); startCycle();
return; return;
@ -365,7 +365,6 @@ public class BloodAltar implements IFluidHandler
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) (altarTier.ordinal() >= 2 ? orb.getFillRate() * (1 + consumptionMultiplier) : orb.getFillRate()), fluid.amount);
int drain = NetworkHelper.getSoulNetwork(binding).add(liquidDrained, (int) (orb.getCapacity() * this.orbCapacityMultiplier)); int drain = NetworkHelper.getSoulNetwork(binding).add(liquidDrained, (int) (orb.getCapacity() * this.orbCapacityMultiplier));
fluid.amount = fluid.amount - drain; fluid.amount = fluid.amount - drain;