Merge pull request #1988 from darkevilmac/6.1.x

Fixed a crash on dedicated servers with EnumColor
This commit is contained in:
SpaceToad 2014-08-18 20:08:42 +02:00
commit a2247bf315

View file

@ -107,7 +107,7 @@ public enum EnumColor {
0xe4e4e4};
@SideOnly(Side.CLIENT)
private static IIcon[] brushIcons = new IIcon[16];
private static IIcon[] brushIcons;
public int getDarkHex() {
return DARK_HEX[ordinal()];
@ -193,6 +193,7 @@ public enum EnumColor {
@SideOnly(Side.CLIENT)
public static void registerIcons(IIconRegister iconRegister) {
brushIcons = new IIcon[16];
for (EnumColor c : values()) {
brushIcons[c.ordinal()] = iconRegister.registerIcon("buildcraft:triggers/color_"
+ c.name().toLowerCase(Locale.ENGLISH));