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

Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite

Browse source
This commit is contained in:
Arcaratus 2015-11-27 20:15:47 -05:00
commit 08e7844df1
15 changed files with 388 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/WayofTime/bloodmagic/tile/TileAltar.java
View file

@ -111,7 +111,6 @@ public class TileAltar extends TileInventory implements IBloodAltar, IUpdatePlay
else
tagCompound.setString(NBTHolder.NBT_EMPTY, "");
if (fluidOutput != null)
tagCompound.setInteger(NBTHolder.NBT_OUTPUT_AMOUNT, fluidOutput.amount);
@ -313,7 +312,7 @@ public class TileAltar extends TileInventory implements IBloodAltar, IUpdatePlay
if (fluid != null && fluid.amount >= 1) {
int liquidDrained = Math.min((int) (altarTier.ordinal() >= 2 ? consumptionRate * (1 + consumptionMultiplier) : consumptionRate), fluid.amount);
int drain = NetworkHelper.addCurrentEssenceToMaximum(ownerName, liquidDrained, (int) (item.getMaxEssence(returnedItem.getMetadata()) * this.orbCapacityMultiplier));
int drain = NetworkHelper.getSoulNetwork(ownerName, getWorld()).addLifeEssence(liquidDrained, (int) (item.getMaxEssence(returnedItem.getMetadata()) * this.orbCapacityMultiplier));
fluid.amount = fluid.amount - drain;