From 0208d5412cf3f3b3efb5d2a762ffb971d03b65f7 Mon Sep 17 00:00:00 2001
From: Nicholas Ignoffo <speedynutty68@gmail.com>
Date: Sat, 11 Mar 2017 16:09:57 -0800
Subject: [PATCH] Fix crash when meteor hits (#1088)

---
 .../bloodmagic/entity/projectile/EntityMeteor.java  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java
index 5170be8c..d9c0096a 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java
@@ -25,7 +25,7 @@ public class EntityMeteor extends EntityThrowable implements IThrowableEntity
     protected double fillerChance = 0;
 
     @Setter
-    public ItemStack meteorStack;
+    public ItemStack meteorStack = ItemStack.EMPTY;
 
     public EntityMeteor(World world)
     {
@@ -112,10 +112,10 @@ public class EntityMeteor extends EntityThrowable implements IThrowableEntity
         nbt.setDouble("radiusModifier", radiusModifier);
         nbt.setDouble("explosionModifier", explosionModifier);
         nbt.setDouble("fillerChance", fillerChance);
-        if (meteorStack != null)
-        {
+        if (!meteorStack.isEmpty())
             meteorStack.writeToNBT(nbt);
-        }
+        else
+            nbt.setBoolean("noItem", true);
     }
 
     @Override
@@ -127,7 +127,10 @@ public class EntityMeteor extends EntityThrowable implements IThrowableEntity
         radiusModifier = nbt.getDouble("radiusModifier");
         explosionModifier = nbt.getDouble("explosionModifier");
         fillerChance = nbt.getDouble("fillerChance");
-        meteorStack = new ItemStack(nbt);
+        if (!nbt.hasKey("noItem"))
+            meteorStack = new ItemStack(nbt);
+        else
+            meteorStack = ItemStack.EMPTY;
     }
 
     @Override