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

Fixed NPE when attacking mobs when you don't have a set of Living Armour. Oops. Fixes #934

Browse source
This commit is contained in:
WayofTime 2016-09-29 19:53:28 -04:00
parent 006cbeaa83
commit 7a42968633
2 changed files with 17 additions and 3 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.1.0-65
------------------------------------------------------
- Fixed NPE when attacking mobs when you don't have a set of Living Armour. Oops.
------------------------------------------------------
Version 2.1.0-64
------------------------------------------------------

15
src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java
View file

@ -155,10 +155,19 @@ public class GenericHandler
ItemHelper.LPContainer.addLPToItem(player.getItemStackFromSlot(EntityEquipmentSlot.CHEST), totalLP, pack.CAPACITY);
}
LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.battleHunger", player.getItemStackFromSlot(EntityEquipmentSlot.CHEST));
if (upgrade instanceof LivingArmourUpgradeBattleHungry)
if (LivingArmour.hasFullSet(player))
{
((LivingArmourUpgradeBattleHungry) upgrade).resetTimer();
ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack);
if (armour != null)
{
LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.battleHunger", chestStack);
if (upgrade instanceof LivingArmourUpgradeBattleHungry)
{
((LivingArmourUpgradeBattleHungry) upgrade).resetTimer();
}
}
}
}
}