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

Green Grove Sigil fix.

Browse source 
Fixed the Green Grove sigil so that it checs if a plant can grow first.
This commit is contained in:
WayofTime 2020-11-15 12:09:18 -05:00
parent 71ba0229c5
commit 6f7cd030e6
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilGreenGrove.java
View file

@ -27,8 +27,7 @@ public class ItemSigilGreenGrove extends ItemSigilToggleableBase
if (PlayerHelper.isFakePlayer(player)) if (PlayerHelper.isFakePlayer(player))
return false; return false;
if (NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess() if (NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess() && applyBonemeal(stack, world, blockPos, player))
&& applyBonemeal(stack, world, blockPos, player))
{ {
if (!world.isRemote) if (!world.isRemote)
{ {
@ -70,11 +69,14 @@ public class ItemSigilGreenGrove extends ItemSigilToggleableBase
if (worldIn.rand.nextInt(50) == 0) if (worldIn.rand.nextInt(50) == 0)
{ {
BlockState preBlockState = worldIn.getBlockState(blockPos); BlockState preBlockState = worldIn.getBlockState(blockPos);
((IGrowable) state.getBlock()).grow(serverWorld, worldIn.rand, blockPos, state); if (((IGrowable) state.getBlock()).canGrow(serverWorld, blockPos, preBlockState, worldIn.isRemote))
{
((IGrowable) state.getBlock()).grow(serverWorld, worldIn.rand, blockPos, state);
BlockState newState = worldIn.getBlockState(blockPos); BlockState newState = worldIn.getBlockState(blockPos);
if (!newState.equals(preBlockState) && !worldIn.isRemote) if (!newState.equals(preBlockState) && !worldIn.isRemote)
worldIn.playEvent(2005, blockPos, 0); worldIn.playEvent(2005, blockPos, 0);
}
} }
} }
} }