From 96d271a5ee424fc3c4dcff4a175e52d640d80120 Mon Sep 17 00:00:00 2001
From: Arcaratus <byou64@gmail.com>
Date: Mon, 22 Jun 2015 13:01:42 -0400
Subject: [PATCH] Should fix #361
---
.../common/items/sigil/SigilOfSupression.java | 3 ---
.../common/spell/complex/effect/SpellHelper.java | 5 +++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java
index adb48e3f..203d27a9 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java
@@ -179,7 +179,6 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi
Block block = par2World.getBlock(x + i, y + j, z + k);
-
if (SpellHelper.isBlockFluid(block))
{
if (par2World.getTileEntity(x + i, y + j, z + k) != null)
@@ -210,8 +209,6 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi
}
}
}
-
- return;
}
@Override
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java
index ebfa88c4..55c03291 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java
@@ -42,6 +42,7 @@ import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.IFluidBlock;
import net.minecraftforge.oredict.OreDictionary;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
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);
break;
case 4:
- float f = (float) 1.0F;
+ float f = 1.0F;
float f1 = f * 0.6F + 0.4F;
float f2 = f * f * 0.7F - 0.5F;
float f3 = f * f * 0.6F - 0.7F;
@@ -347,7 +348,7 @@ public class SpellHelper
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)