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

Should fix #361

Browse source
This commit is contained in:
Arcaratus 2015-06-22 13:01:42 -04:00
parent 62879c48cb
commit 96d271a5ee
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java
View file

@ -179,7 +179,6 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi
Block block = par2World.getBlock(x + i, y + j, z + k); Block block = par2World.getBlock(x + i, y + j, z + k);
if (SpellHelper.isBlockFluid(block)) if (SpellHelper.isBlockFluid(block))
{ {
if (par2World.getTileEntity(x + i, y + j, z + k) != null) if (par2World.getTileEntity(x + i, y + j, z + k) != null)
@ -210,8 +209,6 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi
} }
} }
} }
return;
} }
@Override @Override

5
src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java
View file

@ -42,6 +42,7 @@ import net.minecraft.world.World;
import net.minecraft.world.WorldServer; import net.minecraft.world.WorldServer;
import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.IFluidBlock;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles; import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
@ -259,7 +260,7 @@ public class SpellHelper
SpellHelper.sendParticleToPlayer(player, "mobSpell", xCoord + 0.5D + rand.nextGaussian() / 8, yCoord + 1.1D, zCoord + 0.5D + rand.nextGaussian() / 8, 1.0D, 0.371D, 0.371D); SpellHelper.sendParticleToPlayer(player, "mobSpell", xCoord + 0.5D + rand.nextGaussian() / 8, yCoord + 1.1D, zCoord + 0.5D + rand.nextGaussian() / 8, 1.0D, 0.371D, 0.371D);
break; break;
case 4: case 4:
float f = (float) 1.0F; float f = 1.0F;
float f1 = f * 0.6F + 0.4F; float f1 = f * 0.6F + 0.4F;
float f2 = f * f * 0.7F - 0.5F; float f2 = f * f * 0.7F - 0.5F;
float f3 = f * f * 0.6F - 0.7F; float f3 = f * f * 0.6F - 0.7F;
@ -347,7 +348,7 @@ public class SpellHelper
public static boolean isBlockFluid(Block block) public static boolean isBlockFluid(Block block)
{ {
return block instanceof BlockLiquid; return block instanceof IFluidBlock;
} }
public static void evaporateWaterBlock(World world, int posX, int posY, int posZ) public static void evaporateWaterBlock(World world, int posX, int posY, int posZ)