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

Fix Living Armor check NPE. Again. (#584)

Browse source 
I reversed some logic. don't code when tired, kids.
This commit is contained in:
Nick 2016-01-30 12:17:52 -08:00
parent 4bb7faabb1
commit 2220cc1819
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.txt
View file

@ -5,6 +5,7 @@ Version 2.0.0-12
- Tweaked the Incense altar and added its recipe. - Tweaked the Incense altar and added its recipe.
- Fixed Blood Light sigil not providing the right coloured particles - Fixed Blood Light sigil not providing the right coloured particles
- Added the ability for the divination sigil to look up information about the incense altar. - Added the ability for the divination sigil to look up information about the incense altar.
- Fix another NPE when checking of a player has a full set of Living Armor
------------------------------------------------------ ------------------------------------------------------
Version 2.0.0-11 Version 2.0.0-11

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

@ -244,7 +244,7 @@ public class LivingArmour implements ILivingArmour
public static boolean hasFullSet(EntityPlayer player) { public static boolean hasFullSet(EntityPlayer player) {
for (int slot = 0; slot < player.inventory.armorInventory.length; slot++) { for (int slot = 0; slot < player.inventory.armorInventory.length; slot++) {
ItemStack slotStack = player.inventory.armorItemInSlot(slot); ItemStack slotStack = player.inventory.armorItemInSlot(slot);
if (slotStack != null && !(slotStack.getItem() instanceof ItemLivingArmour)) if (slotStack == null || !(slotStack.getItem() instanceof ItemLivingArmour))
return false; return false;
} }