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

Fixed some @Arcaratus derps :D

Browse source
This commit is contained in:
WayofTime 2015-04-10 17:11:09 -04:00
parent 7d0450cc63
commit 80fab2df12
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java
View file

@ -44,13 +44,13 @@ public class RitualEffectAutoAlchemy extends RitualEffect
int flag = 0;
TileEntity topEntity = world.getTileEntity(x, y + 1, z);
if (!(topEntity instanceof IBloodAltar))
if (!(topEntity instanceof IBloodAltar) || !(topEntity instanceof IBloodAltar))
{
return;
}
IBloodAltar altar = (IBloodAltar) topEntity;
ItemStack targetStack = altar.getStackInSlot(0);
ItemStack targetStack = ((IInventory)altar).getStackInSlot(0);
if (targetStack == null)
{
return;

27
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLifeConduit.java
View file

@ -1,19 +1,20 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone;
import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import java.util.ArrayList;
import java.util.List;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
public class RitualEffectLifeConduit extends RitualEffect
{
@ -50,6 +51,12 @@ public class RitualEffectLifeConduit extends RitualEffect
{
return;
}
if(!(tileAltar instanceof IFluidHandler))
{
return;
}
int d0 = 15;
int vertRange = 20;
@ -69,10 +76,10 @@ public class RitualEffectLifeConduit extends RitualEffect
return;
}
int fillAmount = Math.min(currentEssence / 2, tileAltar.fill(ForgeDirection.UP, new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 10000), false));
int fillAmount = Math.min(currentEssence / 2, ((IFluidHandler)tileAltar).fill(ForgeDirection.UP, new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 10000), false));
{
tileAltar.fill(ForgeDirection.UP, new FluidStack(AlchemicalWizardry.lifeEssenceFluid, fillAmount), true);
((IFluidHandler)tileAltar).fill(ForgeDirection.UP, new FluidStack(AlchemicalWizardry.lifeEssenceFluid, fillAmount), true);
if (entityOwner.getHealth() > 2.0f && fillAmount != 0)
{
entityOwner.setHealth(2.0f);