summaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorGiovanni Harting <539@idlegandalf.com>2016-12-25 16:55:57 +0100
committerGiovanni Harting <539@idlegandalf.com>2016-12-25 16:55:57 +0100
commit176e39f5e6a8b5c7cf0e551199bc159c70f68a5d (patch)
tree036b5e44a59bef4db0af94aecaa126abd439cdda /src/main/java
parenteabc1ffe8c81b57d07e3a1ef7fb07b646f032e96 (diff)
fixed NPE #86
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java
index 0db24d8..d5a5152 100644
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java
@@ -52,7 +52,8 @@ public class TraitCatcher extends AbstractTrait {
data.mobClass = target.getClass().getName();
data.mobName = target.getName();
data.write(tag);
- TagUtil.setExtraTag(p.getHeldItemMainhand(), tag);
+ if (p.getHeldItemMainhand() != null)
+ TagUtil.setExtraTag(p.getHeldItemMainhand(), tag);
p.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F);
target.setDropItemsWhenDead(false);
target.setDead();