diff --git a/src/main/java/electroblob/wizardry/entity/construct/EntityForcefield.java b/src/main/java/electroblob/wizardry/entity/construct/EntityForcefield.java index 1a77659d..7ad68328 100644 --- a/src/main/java/electroblob/wizardry/entity/construct/EntityForcefield.java +++ b/src/main/java/electroblob/wizardry/entity/construct/EntityForcefield.java @@ -67,7 +67,7 @@ public class EntityForcefield extends EntityMagicConstruct { .pos(this.posX + radius * Math.cos(yaw) * Math.cos(pitch), this.posY + 3 + radius * Math.sin(pitch), this.posZ + radius * Math.sin(yaw) * Math.cos(pitch)) .lifetime(48 + this.rand.nextInt(12)) - .colour(brightness, brightness, 1.0f); + .colour(brightness, brightness, 1.0f).spawn(world); } } } diff --git a/src/main/java/electroblob/wizardry/entity/projectile/EntityDart.java b/src/main/java/electroblob/wizardry/entity/projectile/EntityDart.java index cec42cf3..1ab9c0f0 100644 --- a/src/main/java/electroblob/wizardry/entity/projectile/EntityDart.java +++ b/src/main/java/electroblob/wizardry/entity/projectile/EntityDart.java @@ -36,7 +36,7 @@ public class EntityDart extends EntityMagicArrow { @Override public void tickInAir(){ if(this.world.isRemote){ - ParticleBuilder.create(Type.LEAF).pos(this.posX, this.posY, this.posZ).lifetime(10 + rand.nextInt(5)); + ParticleBuilder.create(Type.LEAF, this).lifetime(10 + rand.nextInt(5)).spawn(world); } } diff --git a/src/main/java/electroblob/wizardry/entity/projectile/EntityIceLance.java b/src/main/java/electroblob/wizardry/entity/projectile/EntityIceLance.java index 2a6094c0..5666ca18 100644 --- a/src/main/java/electroblob/wizardry/entity/projectile/EntityIceLance.java +++ b/src/main/java/electroblob/wizardry/entity/projectile/EntityIceLance.java @@ -46,7 +46,7 @@ public class EntityIceLance extends EntityMagicArrow { if(this.world.isRemote){ for(int j = 0; j < 10; j++){ ParticleBuilder.create(Type.ICE, this.rand, this.posX, this.posY, this.posZ, 0.5, true) - .lifetime(20 + rand.nextInt(10)).spawn(world); + .lifetime(20 + rand.nextInt(10)).gravity(true).spawn(world); } } // Parameters for sound: sound event name, volume, pitch. diff --git a/src/main/java/electroblob/wizardry/spell/LightningRay.java b/src/main/java/electroblob/wizardry/spell/LightningRay.java index c2eb74a6..de680000 100644 --- a/src/main/java/electroblob/wizardry/spell/LightningRay.java +++ b/src/main/java/electroblob/wizardry/spell/LightningRay.java @@ -85,7 +85,7 @@ public class LightningRay extends SpellRay { }else{ // Particle effect for(int i=0; i<5; i++){ - ParticleBuilder.create(Type.SPARK, target); + ParticleBuilder.create(Type.SPARK, target).spawn(world); } } } diff --git a/src/main/java/electroblob/wizardry/spell/LightningWeb.java b/src/main/java/electroblob/wizardry/spell/LightningWeb.java index 548bec0e..72b2cc67 100644 --- a/src/main/java/electroblob/wizardry/spell/LightningWeb.java +++ b/src/main/java/electroblob/wizardry/spell/LightningWeb.java @@ -163,7 +163,7 @@ public class LightningWeb extends SpellRay { }else{ // Particle effect for(int i=0; i<5; i++){ - ParticleBuilder.create(Type.SPARK, target); + ParticleBuilder.create(Type.SPARK, target).spawn(world); } } } diff --git a/src/main/java/electroblob/wizardry/util/ParticleBuilder.java b/src/main/java/electroblob/wizardry/util/ParticleBuilder.java index d88cd00f..24bbae18 100644 --- a/src/main/java/electroblob/wizardry/util/ParticleBuilder.java +++ b/src/main/java/electroblob/wizardry/util/ParticleBuilder.java @@ -355,7 +355,11 @@ public final class ParticleBuilder { particle.multipleParticleScaleBy(scale); if(!Double.isNaN(vx) && !Double.isNaN(vy) && !Double.isNaN(vz)) particle.setVelocity(vx, vy, vz); if(r >= 0 && g >= 0 && b >= 0) particle.setRBGColorF(r, g, b); - if(fr >= 0 && fg >= 0 && fb >= 0) particle.setFadeColour(fr, fg, fb); + if(fr >= 0 && fg >= 0 && fb >= 0){ + particle.setFadeColour(fr, fg, fb); + }else{ + particle.setFadeColour(r, g, b); // If fade colour was unspecified, it defaults to the main colour + } if(lifetime >= 0) particle.setLifetime(lifetime); particle.setGravity(gravity); particle.setShaded(shaded);