Merge branch 'master' into changeling-master

asanetargoss · Aug 31, 2019 · 0a94099 · 0a94099
2 parents 4b64ccb + 5727d0b
commit 0a94099
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/mchorse/metamorph/api/morphs/EntityMorph.java b/src/main/java/mchorse/metamorph/api/morphs/EntityMorph.java
@@ -537,7 +537,11 @@ public void setupEntity(World world)
     {
         EntityLivingBase created = (EntityLivingBase) EntityList.createEntityByIDFromName(name, world);
 
-        created.deserializeNBT(this.entityData);
+        try {
+            created.deserializeNBT(this.entityData);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         created.deathTime = 0;
         created.hurtTime = 0;
         created.limbSwing = 0;