Protect against other mods providing bad meta values for logs (#523)

This commit is contained in:
temp1011 authored and mezz committed 2018-05-12 13:50:45 -07:00
1 parent 765dade9bd
commit 87ccfb36c4
2 files changed
+17 -10

No files matched your search

@@ -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
@@ -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);