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

Green Grove ritual should apply to Reeds and Cactus (#1359)

Browse source
This commit is contained in:
Nicholas Ignoffo 2018-07-16 16:42:10 -07:00
parent a7fcfbd2d0
commit fb90656335
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java
View file

@ -8,9 +8,7 @@ import WayofTime.bloodmagic.soul.EnumDemonWillType;
import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagic;
import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler;
import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.Utils;
import net.minecraft.block.Block; import net.minecraft.block.*;
import net.minecraft.block.BlockFarmland;
import net.minecraft.block.IGrowable;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -93,11 +91,13 @@ public class RitualGreenGrove extends Ritual {
IBlockState state = world.getBlockState(newPos); IBlockState state = world.getBlockState(newPos);
if (!BloodMagicAPI.INSTANCE.getBlacklist().getGreenGrove().contains(state)) { if (!BloodMagicAPI.INSTANCE.getBlacklist().getGreenGrove().contains(state)) {
if (state.getBlock() instanceof IGrowable) { boolean flag = state.getBlock() instanceof IGrowable || state.getBlock() instanceof BlockCactus || state.getBlock() instanceof BlockReed;
if (flag) {
if (world.rand.nextDouble() < growthChance) { if (world.rand.nextDouble() < growthChance) {
state.getBlock().updateTick(world, newPos, state, new Random()); state.getBlock().updateTick(world, newPos, state, new Random());
IBlockState newState = world.getBlockState(newPos); IBlockState newState = world.getBlockState(newPos);
if (!newState.equals(state)) { if (!newState.equals(state)) {
world.playEvent(2005, newPos, 0);
totalGrowths++; totalGrowths++;
if (consumeRawWill) { if (consumeRawWill) {
rawWill -= rawWillDrain; rawWill -= rawWillDrain;