From 87ccfb36c4706f37885d858925528c0e0528a32f Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Sat, 12 May 2018 21:50:45 +0100 Subject: [PATCH] Protect against other mods providing bad meta values for logs (#523) --- .../binnie/extratrees/block/BlockETLog.java | 6 +++++- .../binnie/extratrees/block/ILogType.java | 21 +++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/binnie/extratrees/block/BlockETLog.java b/src/main/java/binnie/extratrees/block/BlockETLog.java index e736a11f..3dee0474 100644 --- a/src/main/java/binnie/extratrees/block/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/BlockETLog.java @@ -128,7 +128,11 @@ public class BlockETLog extends BlockLog implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return I18N.localise("extratrees.block.log.name", ILogType.ExtraTreeLog.values()[meta].getName()); + ILogType.ExtraTreeLog[] logs= ILogType.ExtraTreeLog.values(); + if(meta < 0 || meta >= logs.length) { + meta = 0; + } + return I18N.localise("extratrees.block.log.name", logs[meta].getName()); } @Override diff --git a/src/main/java/binnie/extratrees/block/ILogType.java b/src/main/java/binnie/extratrees/block/ILogType.java index f1d8f8ee..520effcd 100644 --- a/src/main/java/binnie/extratrees/block/ILogType.java +++ b/src/main/java/binnie/extratrees/block/ILogType.java @@ -1,19 +1,22 @@ package binnie.extratrees.block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +import net.minecraftforge.common.util.ForgeDirection; + +import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.TreeManager; +import forestry.arboriculture.worldgen.BlockTypeLog; + import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.IDesignMaterial; import cpw.mods.fml.common.registry.GameRegistry; -import forestry.api.arboriculture.EnumWoodType; -import forestry.api.arboriculture.TreeManager; -import forestry.arboriculture.worldgen.BlockTypeLog; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; public interface ILogType { void placeBlock(World p0, int p1, int p2, int p3);