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

Fixed the Living Armour causing a NPE under certain conditions

Browse source 
In most cases where it is pertinent, changed the LivingStats calls to check if the stats actually exist on the chestpiece.
This commit is contained in:
WayofTime 2020-12-15 18:53:33 -05:00
parent 3d0e3c696b
commit 9d18353a2e
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java
View file

@ -196,7 +196,7 @@ public class GenericHandler
PlayerEntity player = (PlayerEntity) living; PlayerEntity player = (PlayerEntity) living;
if (LivingUtil.hasFullSet(player)) if (LivingUtil.hasFullSet(player))
{ {
LivingStats stats = LivingStats.fromPlayer(player); LivingStats stats = LivingStats.fromPlayer(player, true);
double expModifier = 1 + LivingArmorRegistrar.UPGRADE_EXPERIENCE.get().getBonusValue("exp", stats.getLevel(LivingArmorRegistrar.UPGRADE_EXPERIENCE.get().getKey())).doubleValue(); double expModifier = 1 + LivingArmorRegistrar.UPGRADE_EXPERIENCE.get().getBonusValue("exp", stats.getLevel(LivingArmorRegistrar.UPGRADE_EXPERIENCE.get().getKey())).doubleValue();
System.out.println("Experience modifier: " + expModifier); System.out.println("Experience modifier: " + expModifier);
@ -316,7 +316,7 @@ public class GenericHandler
{ {
if (LivingUtil.hasFullSet(event.player)) if (LivingUtil.hasFullSet(event.player))
{ {
LivingStats stats = LivingStats.fromPlayer(event.player); LivingStats stats = LivingStats.fromPlayer(event.player, true);
double bonus = LivingArmorRegistrar.UPGRADE_SELF_SACRIFICE.get().getBonusValue("self_mod", stats.getLevel(LivingArmorRegistrar.UPGRADE_SELF_SACRIFICE.get().getKey())).doubleValue(); double bonus = LivingArmorRegistrar.UPGRADE_SELF_SACRIFICE.get().getBonusValue("self_mod", stats.getLevel(LivingArmorRegistrar.UPGRADE_SELF_SACRIFICE.get().getKey())).doubleValue();
event.lpAdded = (int) Math.round(event.lpAdded * (1 + bonus)); event.lpAdded = (int) Math.round(event.lpAdded * (1 + bonus));
LivingUtil.applyNewExperience(event.player, LivingArmorRegistrar.UPGRADE_SELF_SACRIFICE.get(), event.healthDrained); LivingUtil.applyNewExperience(event.player, LivingArmorRegistrar.UPGRADE_SELF_SACRIFICE.get(), event.healthDrained);
@ -341,7 +341,7 @@ public class GenericHandler
if (LivingUtil.hasFullSet(player)) if (LivingUtil.hasFullSet(player))
{ {
LivingStats stats = LivingStats.fromPlayer(player); LivingStats stats = LivingStats.fromPlayer(player, true);
ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST);
// percentIncrease += LivingArmorRegistrar.UPGRADE_SPEED.get().getBonusValue("speed_modifier", stats.getLevel(LivingArmorRegistrar.UPGRADE_SPEED.get().getKey())).doubleValue(); // percentIncrease += LivingArmorRegistrar.UPGRADE_SPEED.get().getBonusValue("speed_modifier", stats.getLevel(LivingArmorRegistrar.UPGRADE_SPEED.get().getKey())).doubleValue();
if (player.isSprinting()) if (player.isSprinting())
@ -450,7 +450,7 @@ public class GenericHandler
if (LivingUtil.hasFullSet(player)) if (LivingUtil.hasFullSet(player))
{ {
LivingStats stats = LivingStats.fromPlayer(player); LivingStats stats = LivingStats.fromPlayer(player, true);
percentIncrease += LivingArmorRegistrar.UPGRADE_DIGGING.get().getBonusValue("speed_modifier", stats.getLevel(LivingArmorRegistrar.UPGRADE_DIGGING.get().getKey())).doubleValue(); percentIncrease += LivingArmorRegistrar.UPGRADE_DIGGING.get().getBonusValue("speed_modifier", stats.getLevel(LivingArmorRegistrar.UPGRADE_DIGGING.get().getKey())).doubleValue();
} }
@ -465,9 +465,8 @@ public class GenericHandler
{ {
if (LivingUtil.hasFullSet(player)) if (LivingUtil.hasFullSet(player))
{ {
LivingStats stats = LivingStats.fromPlayer(player);
LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_DIGGING.get(), 1); LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_DIGGING.get(), 1);
LivingStats stats = LivingStats.fromPlayer(player);
int mineTime = LivingArmorRegistrar.UPGRADE_DIGGING.get().getBonusValue("speed_time", stats.getLevel(LivingArmorRegistrar.UPGRADE_DIGGING.get().getKey())).intValue(); int mineTime = LivingArmorRegistrar.UPGRADE_DIGGING.get().getBonusValue("speed_time", stats.getLevel(LivingArmorRegistrar.UPGRADE_DIGGING.get().getKey())).intValue();
if (mineTime > 0) if (mineTime > 0)
{ {