From 21ebe8f971552951f8c52c5271d6c831c4b0f2f7 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Mon, 2 Mar 2015 17:22:24 +0000 Subject: [PATCH] Sparks no longer emit particle beams when placed in the world, they still do when right clicked with a wand. --- .../common/entity/EntityCorporeaSpark.java | 8 +------- .../botania/common/entity/EntitySpark.java | 16 +++++++--------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 4a1f020f4..6b6ee171b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -39,7 +39,6 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { List relatives = new ArrayList(); boolean firstUpdateClient = true; boolean firstUpdateServer = true; - boolean didStartupParticles = false; public EntityCorporeaSpark(World world) { super(world); @@ -88,11 +87,6 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { else firstUpdateServer = false; } - if(!didStartupParticles) { - displayRelatives(new ArrayList(), master); - didStartupParticles = true; - } - if(master != null && master.getNetwork() != getNetwork()) master = null; @@ -264,7 +258,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { player.swingItem(); return true; } else { - didStartupParticles = false; + displayRelatives(new ArrayList(), master); return true; } } else if(stack.getItem() == ModItems.dye) { diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index d549a73db..4f6a1a912 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -48,7 +48,7 @@ public class EntitySpark extends Entity implements ISparkEntity { private static final String TAG_TRANSFER_ID = "id"; int removeTransferants = 2; - boolean didStartupParticles = false; + boolean firstTick = false; public EntitySpark(World world) { super(world); @@ -76,18 +76,14 @@ public class EntitySpark extends Entity implements ISparkEntity { return; } - boolean first = worldObj.isRemote && !didStartupParticles; + boolean first = worldObj.isRemote && !firstTick; int upgrade = getUpgrade(); List allSparks = null; if(first || upgrade == 2 || upgrade == 3) allSparks = SparkHelper.getSparksAround(worldObj, posX, posY, posZ); - if(first) { - for(ISparkEntity spark : allSparks) - particleBeam(this, (Entity) spark); - - didStartupParticles = true; - } + if(first) + first = true; Collection transfers = getTransfers(); @@ -271,7 +267,9 @@ public class EntitySpark extends Entity implements ISparkEntity { player.swingItem(); return true; } else { - didStartupParticles = false; + List allSparks = SparkHelper.getSparksAround(worldObj, posX, posY, posZ); + for(ISparkEntity spark : allSparks) + particleBeam(this, (Entity) spark); return true; } } else if(stack.getItem() == ModItems.sparkUpgrade && upgrade == 0) {