Jotunn/TAIGA-Obsidiorite-Heroic-Fixes
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

be sure dropped xp is positive/null, fixes #89

Browse Source
This commit is contained in:
Giovanni Harting
2017-01-01 03:45:39 +01:00
parent e2d3ead5ad
commit a8c066ed1b
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java
View File

@@ -25,7 +25,7 @@ public class TraitAnalysing extends AbstractTrait {
@SubscribeEvent @SubscribeEvent
public void onXpDrop(LivingExperienceDropEvent event) { public void onXpDrop(LivingExperienceDropEvent event) {
EntityPlayer player = event.getAttackingPlayer(); 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())); event.setDroppedExperience(this.getUpdateXP(event.getDroppedExperience()));
} }
@@ -34,7 +34,7 @@ public class TraitAnalysing extends AbstractTrait {
@SubscribeEvent @SubscribeEvent
public void onBlockBreak(BlockEvent.BreakEvent event) { public void onBlockBreak(BlockEvent.BreakEvent event) {
EntityPlayer player = event.getPlayer(); 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())); event.setExpToDrop(this.getUpdateXP(event.getExpToDrop()));
} }

2
src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java
View File

@@ -71,8 +71,6 @@ public class TraitCatcher extends AbstractTrait {
TagUtil.setEnchantEffect(tool, false); TagUtil.setEnchantEffect(tool, false);
} else } else
TagUtil.setEnchantEffect(tool, true); TagUtil.setEnchantEffect(tool, true);
} }
} }