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

Fixes BloodAltar being able to obtain negative progress. (#1649)

Browse source 
* Fixes BloodAltar being able to obtain negative progress.

* Updated to use Math.max()
This commit is contained in:
Tobias 2019-09-05 03:51:25 +02:00 committed by Nick Ignoffo
parent 24b3552b60
commit 4f1308874d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,16 +3,16 @@ package WayofTime.bloodmagic.altar;
import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent; import WayofTime.bloodmagic.api.event.BloodMagicCraftedEvent;
import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.api.impl.BloodMagicAPI;
import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar; import WayofTime.bloodmagic.api.impl.recipe.RecipeBloodAltar;
import WayofTime.bloodmagic.block.BlockLifeEssence;
import WayofTime.bloodmagic.block.enums.BloodRuneType; import WayofTime.bloodmagic.block.enums.BloodRuneType;
import WayofTime.bloodmagic.core.data.Binding; import WayofTime.bloodmagic.core.data.Binding;
import WayofTime.bloodmagic.core.data.SoulTicket; import WayofTime.bloodmagic.core.data.SoulTicket;
import WayofTime.bloodmagic.iface.IBindable; import WayofTime.bloodmagic.iface.IBindable;
import WayofTime.bloodmagic.util.Constants;
import WayofTime.bloodmagic.orb.BloodOrb; import WayofTime.bloodmagic.orb.BloodOrb;
import WayofTime.bloodmagic.orb.IBloodOrb; import WayofTime.bloodmagic.orb.IBloodOrb;
import WayofTime.bloodmagic.util.helper.NetworkHelper;
import WayofTime.bloodmagic.block.BlockLifeEssence;
import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.tile.TileAltar;
import WayofTime.bloodmagic.util.Constants;
import WayofTime.bloodmagic.util.helper.NetworkHelper;
import com.google.common.base.Enums; import com.google.common.base.Enums;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -297,7 +297,7 @@ public class BloodAltar implements IFluidHandler {
} }
} else if (!hasOperated && progress > 0) { } else if (!hasOperated && progress > 0) {
progress -= (int) (efficiencyMultiplier * drainRate); progress = Math.max(0, progress - (int) (efficiencyMultiplier * drainRate));
if (internalCounter % 2 == 0 && world instanceof WorldServer) { if (internalCounter % 2 == 0 && world instanceof WorldServer) {
WorldServer server = (WorldServer) world; WorldServer server = (WorldServer) world;