Merge pull request #229 from Sciencei/master

Expanded plants that Sigil of Growth/Ritual of the Green Grove work with
This commit is contained in:
WayofTime 2015-01-25 07:09:46 -05:00
commit e15c52d48f
2 changed files with 4 additions and 2 deletions

View file

@ -20,6 +20,7 @@ import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.BonemealEvent; import net.minecraftforge.event.entity.player.BonemealEvent;
import java.util.List; import java.util.List;
public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
@ -191,7 +192,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
Block block = par2World.getBlock(ix, iy, iz); Block block = par2World.getBlock(ix, iy, iz);
if (block instanceof IPlantable) if (block instanceof IPlantable || block instanceof IGrowable)
{ {
if (par2World.rand.nextInt(50) == 0) if (par2World.rand.nextInt(50) == 0)
{ {

View file

@ -9,6 +9,7 @@ import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.IPlantable;
import net.minecraft.block.IGrowable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -73,7 +74,7 @@ public class RitualEffectGrowth extends RitualEffect
{ {
Block block = world.getBlock(x + i, y + 2, z + j); Block block = world.getBlock(x + i, y + 2, z + j);
if (block instanceof IPlantable) if (block instanceof IPlantable || block instanceof IGrowable)
{ {
{ {
SpellHelper.sendIndexedParticleToAllAround(world, x, y, z, 20, world.provider.dimensionId, 3, x, y, z); SpellHelper.sendIndexedParticleToAllAround(world, x, y, z, 20, world.provider.dimensionId, 3, x, y, z);