From e2d3ead5ad5beada2982a4bfb2dcafc13e4ca468 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Sun, 25 Dec 2016 16:55:57 +0100
Subject: [PATCH] fixed NPE #86

---
 src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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();