diff options
| author | Giovanni Harting <539@idlegandalf.com> | 2017-01-01 03:45:39 +0100 |
|---|---|---|
| committer | Giovanni Harting <539@idlegandalf.com> | 2017-01-01 03:45:39 +0100 |
| commit | 1c4458481ed10712ac3137c3a8dddb805cd8eb2b (patch) | |
| tree | 661092154fb871571f47dbd70ba03ea0c9282cff | |
| parent | 2fd2bcce06e8713d092e3b215dfc5139c1d1d5a6 (diff) | |
be sure dropped xp is positive/null, fixes #89
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java index 283c431..91acf66 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java @@ -25,7 +25,7 @@ public class TraitAnalysing extends AbstractTrait { @SubscribeEvent public void onXpDrop(LivingExperienceDropEvent event) { EntityPlayer player = event.getAttackingPlayer(); - if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { + if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getDroppedExperience() >= 0) { event.setDroppedExperience(this.getUpdateXP(event.getDroppedExperience())); } @@ -34,7 +34,7 @@ public class TraitAnalysing extends AbstractTrait { @SubscribeEvent public void onBlockBreak(BlockEvent.BreakEvent event) { EntityPlayer player = event.getPlayer(); - if (!event.getWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { + if (!event.getWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getExpToDrop() >= 0) { event.setExpToDrop(this.getUpdateXP(event.getExpToDrop())); } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java index d5a5152..c0121ff 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java @@ -71,8 +71,6 @@ public class TraitCatcher extends AbstractTrait { TagUtil.setEnchantEffect(tool, false); } else TagUtil.setEnchantEffect(tool, true); - - } } |
