diff --git a/src/main/java/com/minelittlepony/unicopia/client/particle/SphereParticle.java b/src/main/java/com/minelittlepony/unicopia/client/particle/SphereParticle.java
index 2e7c244a..890f0be4 100644
--- a/src/main/java/com/minelittlepony/unicopia/client/particle/SphereParticle.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/particle/SphereParticle.java
@@ -121,17 +121,12 @@ public class SphereParticle extends Particle implements AttachableParticle {
     }
 
     public static class Factory implements ParticleFactory<DefaultParticleType> {
-        private final SpriteProvider provider;
-
         public Factory(SpriteProvider provider) {
-            this.provider = provider;
         }
 
         @Override
         public Particle createParticle(DefaultParticleType type, World world, double x, double y, double z, double dx, double dy, double dz) {
-            RaindropsParticle particle = new RaindropsParticle(world, x, y, z, dx, dy, dz);
-            particle.setSprite(provider);
-            return particle;
+            return new RaindropsParticle(world, x, y, z, dx, dy, dz);
         }
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/magic/spell/ShieldSpell.java b/src/main/java/com/minelittlepony/unicopia/magic/spell/ShieldSpell.java
index 3b483755..9dc76338 100644
--- a/src/main/java/com/minelittlepony/unicopia/magic/spell/ShieldSpell.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spell/ShieldSpell.java
@@ -52,12 +52,10 @@ public class ShieldSpell extends AbstractSpell.RangedAreaSpell implements Attach
             source.addParticle(new MagicParticleEffect(getTint()), pos, Vec3d.ZERO);
         });
 
-        particlEffect
-            .ifMissing(source, () -> {
-                source.addParticle(UParticles.SPHERE, source.getOriginVector(), Vec3d.ZERO);
-                return null; // XXX: Attachables
-            }) // 1, getTint(), 10
-            .ifPresent(p -> p.setAttribute(0, radius));
+        particlEffect.ifMissing(source, () -> {
+            source.addParticle(UParticles.SPHERE, source.getOriginVector(), Vec3d.ZERO);
+            return null; // XXX: Attachables
+        }).ifPresent(p -> p.setAttribute(0, radius));  // 1, getTint(), 10
     }
 
     @Override
diff --git a/src/main/java/com/minelittlepony/unicopia/particles/ParticleConnection.java b/src/main/java/com/minelittlepony/unicopia/particles/ParticleConnection.java
index fe5eec68..1ed57c0c 100644
--- a/src/main/java/com/minelittlepony/unicopia/particles/ParticleConnection.java
+++ b/src/main/java/com/minelittlepony/unicopia/particles/ParticleConnection.java
@@ -12,9 +12,9 @@ public class ParticleConnection {
 
     private Optional<AttachableParticle> particleEffect = Optional.empty();
 
-    public Optional<AttachableParticle> ifMissing(Caster<?> source, Supplier<Optional<AttachableParticle>> constructor) {
+    public Optional<AttachableParticle> ifMissing(Caster<?> source, Supplier<AttachableParticle> constructor) {
         particleEffect.filter(AttachableParticle::isStillAlive).orElseGet(() -> {
-            particleEffect = constructor.get();
+            particleEffect = Optional.ofNullable(constructor.get());
             particleEffect.ifPresent(p -> p.attachTo(source));
             return null;
         });