From 9ff67ffd7d710b9cdde4752432ef370ae064d528 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 6 Dec 2015 14:23:56 +0000 Subject: [PATCH] Fixed a crash when right clicking a spark with an empty hand. Closes #1621 --- .../java/vazkii/botania/common/entity/EntityCorporeaSpark.java | 2 +- src/main/java/vazkii/botania/common/entity/EntitySpark.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 4378c7df2..62f89441b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -286,7 +286,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } public boolean doPhantomInk(ItemStack stack) { - if(stack.getItem() == ModItems.phantomInk && !worldObj.isRemote) { + if(stack != null && stack.getItem() == ModItems.phantomInk && !worldObj.isRemote) { int invis = dataWatcher.getWatchableObjectInt(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY); dataWatcher.updateObject(EntitySpark.INVISIBILITY_DATA_WATCHER_KEY, ~invis & 1); return true; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 7c011888d..e89206d3e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -285,7 +285,7 @@ public class EntitySpark extends Entity implements ISparkEntity { } public boolean doPhantomInk(ItemStack stack) { - if(stack.getItem() == ModItems.phantomInk && !worldObj.isRemote) { + if(stack != null && stack.getItem() == ModItems.phantomInk && !worldObj.isRemote) { int invis = dataWatcher.getWatchableObjectInt(INVISIBILITY_DATA_WATCHER_KEY); dataWatcher.updateObject(INVISIBILITY_DATA_WATCHER_KEY, ~invis & 1); return true;