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

Fix crafting causing crash (#3388) Closes #3387

This commit is contained in:
Shadowfacts 2016-11-16 19:15:24 -05:00 committed by LexManos
parent 42a7036393
commit bf8fa5d286
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,6 +125,8 @@ import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.eventhandler.Event;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import javax.annotation.Nonnull;
public class ForgeHooks
{
//TODO: Loot tables?
@ -957,21 +959,20 @@ public class ForgeHooks
{
return craftingPlayer.get();
}
public static ItemStack getContainerItem(ItemStack stack)
@Nonnull
public static ItemStack getContainerItem(@Nonnull ItemStack stack)
{
if (stack == null) return null;
if (stack.getItem().hasContainerItem(stack))
{
stack = stack.getItem().getContainerItem(stack);
if (stack != null && stack.isItemStackDamageable() && stack.getMetadata() > stack.getMaxDamage())
if (!stack.func_190926_b() && stack.isItemStackDamageable() && stack.getMetadata() > stack.getMaxDamage())
{
ForgeEventFactory.onPlayerDestroyItem(craftingPlayer.get(), stack, null);
return null;
return ItemStack.field_190927_a;
}
return stack;
}
return null;
return ItemStack.field_190927_a;
}
public static boolean isInsideOfMaterial(Material material, Entity entity, BlockPos pos)