lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite

Browse source
This commit is contained in:
WayofTime 2016-01-30 06:46:01 -05:00
parent 6575c97aa5 608cc3d2b8
commit 8d854a5b69
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelog.txt
View file

@ -1,3 +1,8 @@
------------------------------------------------------
Version 2.0.0-11
------------------------------------------------------
- Fix NPE when checking if a player has a full Living Armor set
------------------------------------------------------
Version 2.0.0-10
------------------------------------------------------

4
src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java
View file

@ -8,6 +8,7 @@ import java.util.Map.Entry;
import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.world.World;
@ -242,7 +243,8 @@ public class LivingArmour implements ILivingArmour
public static boolean hasFullSet(EntityPlayer player) {
for (int slot = 0; slot < player.inventory.armorInventory.length; slot++) {
if (!(player.inventory.armorItemInSlot(slot).getItem() instanceof ItemLivingArmour))
ItemStack slotStack = player.inventory.armorItemInSlot(slot);
if (slotStack != null && !(slotStack.getItem() instanceof ItemLivingArmour))
return false;
}