keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fix crashed caused by bad mods reflectively breaking the grass drop list. Closes #3943

This commit is contained in:
LexManos 2017-06-02 16:22:16 -07:00
parent c544f06880
commit e67bde9e9e
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/net/minecraftforge/common/ForgeHooks.java
View File

@ -55,10 +55,8 @@ import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.inventory.ContainerRepair; import net.minecraft.inventory.ContainerRepair;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemBucket;
import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemPickaxe;
@ -149,6 +147,10 @@ public class ForgeHooks
@Nonnull @Nonnull
public static ItemStack getGrassSeed(Random rand, int fortune) public static ItemStack getGrassSeed(Random rand, int fortune)
{ {
if (seedList.size() == 0)
{
return ItemStack.EMPTY; //Some bad mods hack in and empty our list, so lets not hard crash -.-
}
SeedEntry entry = WeightedRandom.getRandomItem(rand, seedList); SeedEntry entry = WeightedRandom.getRandomItem(rand, seedList);
if (entry == null || entry.seed.isEmpty()) if (entry == null || entry.seed.isEmpty())
{ {
@ -510,7 +512,7 @@ public class ForgeHooks
} }
return false; return false;
} }
public static void onDifficultyChange(EnumDifficulty difficulty, EnumDifficulty oldDifficulty) public static void onDifficultyChange(EnumDifficulty difficulty, EnumDifficulty oldDifficulty)
{ {
MinecraftForge.EVENT_BUS.post(new DifficultyChangeEvent(difficulty, oldDifficulty)); MinecraftForge.EVENT_BUS.post(new DifficultyChangeEvent(difficulty, oldDifficulty));
@ -1269,8 +1271,8 @@ public class ForgeHooks
return (ev.getResult() == Event.Result.ALLOW || (ev.getResult() == Event.Result.DEFAULT && def)); return (ev.getResult() == Event.Result.ALLOW || (ev.getResult() == Event.Result.DEFAULT && def));
} }
public static void onCropsGrowPost(World worldIn, BlockPos pos, IBlockState state, IBlockState blockState) public static void onCropsGrowPost(World worldIn, BlockPos pos, IBlockState state, IBlockState blockState)
{ {
MinecraftForge.EVENT_BUS.post(new BlockEvent.CropGrowEvent.Post(worldIn, pos, state, worldIn.getBlockState(pos))); MinecraftForge.EVENT_BUS.post(new BlockEvent.CropGrowEvent.Post(worldIn, pos, state, worldIn.getBlockState(pos)));
} }
} }