Sparks no longer emit particle beams when placed in the world, they still do when right clicked with a wand.

This commit is contained in:
Lizbeth Rika committed 2015-03-02 17:22:24 +00:00
1 parent 4ea90affc6
commit 21ebe8f971
2 files changed
+8 -16

No files matched your search

@@ -39,7 +39,6 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
List<ICorporeaSpark> 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) {
@@ -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<ISparkEntity> 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<ISparkEntity> transfers = getTransfers();
@@ -271,7 +267,9 @@ public class EntitySpark extends Entity implements ISparkEntity {
player.swingItem();
return true;
} else {
didStartupParticles = false;
List<ISparkEntity> 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) {