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

Fix Sigil of the Green Grove disappearing on modded crops (#937)

Browse source 
Currently, the Sigil of the Green Grove uses ForgeEventFactory.onApplyBonemeal
for its effects, which gives the right answer for all crops, but for modded
crops, it has the side effect of removing one item from the current stack
(since it's intended for actual bonemeal). That's not desired in this case,
since the sigil isn't supposed to get used up, so this change directly makes
and fires the event itself. This problem was originally reported in
josephcsible/ExpandedBonemeal#1.
This commit is contained in:
Joseph C. Sible 2016-10-01 13:35:34 -04:00 committed by Nick Ignoffo
parent 55bc3ead7f
commit 59704162a6
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java
View file

@ -9,6 +9,9 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.BonemealEvent;
import net.minecraftforge.fml.common.eventhandler.Event.Result;
import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.BloodMagicAPI;
public class ItemSigilGreenGrove extends ItemSigilToggleableBase public class ItemSigilGreenGrove extends ItemSigilToggleableBase
@ -78,9 +81,11 @@ public class ItemSigilGreenGrove extends ItemSigilToggleableBase
{ {
IBlockState iblockstate = worldIn.getBlockState(target); IBlockState iblockstate = worldIn.getBlockState(target);
int hook = net.minecraftforge.event.ForgeEventFactory.onApplyBonemeal(player, worldIn, target, iblockstate, stack); BonemealEvent event = new BonemealEvent(player, worldIn, target, iblockstate);
if (hook != 0) if (MinecraftForge.EVENT_BUS.post(event))
return hook > 0; return false;
else if (event.getResult() == Result.ALLOW)
return true;
if (iblockstate.getBlock() instanceof IGrowable) if (iblockstate.getBlock() instanceof IGrowable)
{ {