From ba454c63580ed02faf77ce1606fc02caa5c27cb6 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Mon, 15 Dec 2014 12:46:14 +0000 Subject: [PATCH] Fixed the Signal Flare item crashing if an invalid color is loaded somehow. --- src/main/java/vazkii/botania/common/item/ItemSignalFlare.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index b9acb0892..6a485f1d6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -101,6 +101,10 @@ public class ItemSignalFlare extends ItemMod { if(par2 == 0) return 0xFFFFFF; + int colorv = getColor(par1ItemStack); + if(colorv >= EntitySheep.fleeceColorTable.length || colorv < 0) + return 0xFFFFFF; + float[] color = EntitySheep.fleeceColorTable[getColor(par1ItemStack)]; return new Color(color[0], color[1], color[2]).getRGB(); }