From 75a8131d6d2752571da2023238c0dbf4dd18b37a Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 11 Nov 2015 00:22:46 +0000 Subject: [PATCH] Fix servers and a memory leak --- .../item/equipment/armor/manasteel/ItemManasteelArmor.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index a35f337e6..b158a104a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -51,7 +51,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan private static final String TAG_PHANTOM_INK = "phantomInk"; - protected ModelBiped[] models = new ModelBiped[4]; + protected ModelBiped[] models = null; public ItemManasteelArmor(int type, String name) { this(type, name, BotaniaAPI.manasteelArmorMaterial); @@ -123,7 +123,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { if(ConfigHandler.enableArmorModels) { ModelBiped model = getArmorModelForSlot(entityLiving, itemStack, armorSlot); -// if(model == null) + if(model == null) model = provideArmorModelForSlot(itemStack, armorSlot); if(model != null) @@ -135,6 +135,9 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan @SideOnly(Side.CLIENT) public ModelBiped getArmorModelForSlot(EntityLivingBase entity, ItemStack stack, int slot) { + if(models == null) + models = new ModelBiped[4]; + return models[slot]; }