lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix crash when meteor hits (#1088)

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-03-11 16:09:57 -08:00
parent 9cea8e8b73
commit 0208d5412c
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java
View file

@ -25,7 +25,7 @@ public class EntityMeteor extends EntityThrowable implements IThrowableEntity
protected double fillerChance = 0; protected double fillerChance = 0;
@Setter @Setter
public ItemStack meteorStack; public ItemStack meteorStack = ItemStack.EMPTY;
public EntityMeteor(World world) public EntityMeteor(World world)
{ {
@ -112,10 +112,10 @@ public class EntityMeteor extends EntityThrowable implements IThrowableEntity
nbt.setDouble("radiusModifier", radiusModifier); nbt.setDouble("radiusModifier", radiusModifier);
nbt.setDouble("explosionModifier", explosionModifier); nbt.setDouble("explosionModifier", explosionModifier);
nbt.setDouble("fillerChance", fillerChance); nbt.setDouble("fillerChance", fillerChance);
if (meteorStack != null) if (!meteorStack.isEmpty())
{
meteorStack.writeToNBT(nbt); meteorStack.writeToNBT(nbt);
} else
nbt.setBoolean("noItem", true);
} }
@Override @Override
@ -127,7 +127,10 @@ public class EntityMeteor extends EntityThrowable implements IThrowableEntity
radiusModifier = nbt.getDouble("radiusModifier"); radiusModifier = nbt.getDouble("radiusModifier");
explosionModifier = nbt.getDouble("explosionModifier"); explosionModifier = nbt.getDouble("explosionModifier");
fillerChance = nbt.getDouble("fillerChance"); fillerChance = nbt.getDouble("fillerChance");
meteorStack = new ItemStack(nbt); if (!nbt.hasKey("noItem"))
meteorStack = new ItemStack(nbt);
else
meteorStack = ItemStack.EMPTY;
} }
@Override @Override