From a061983d00a7a683149083e0eb1eea96dfbe03ec Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 6 Sep 2015 23:12:53 +0100 Subject: [PATCH] Fixed removing a Master Corporea Spark not properly resetting the corporea network. Closes #1353 --- .../vazkii/botania/common/entity/EntityCorporeaSpark.java | 6 ++++-- 1 file changed, 4 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 7deb9089c..c1c277a70 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -87,7 +87,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { else firstUpdateServer = false; } - if(master != null && master.getNetwork() != getNetwork()) + if(master != null && (((Entity) master).isDead || master.getNetwork() != getNetwork())) master = null; int displayTicks = getItemDisplayTicks(); @@ -148,7 +148,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { List sparks = getNearbySparks(); if(sparks.size() > 0) { for(ICorporeaSpark spark : sparks) - if(spark.getNetwork() == getNetwork()) { + if(spark.getNetwork() == getNetwork() && !((Entity) spark).isDead) { ICorporeaSpark master = spark.getMaster(); if(master != null) { this.master = master; @@ -254,6 +254,8 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { if(stack.getItem() == ModItems.twigWand) { if(player.isSneaking()) { setDead(); + if(isMaster()) + restartNetwork(); if(player.worldObj.isRemote) player.swingItem(); return true;