Fix error while adding FBPTerrainParticle, closes #32

Hantonik · Sep 20, 2024 · c95a232 · c95a232
1 parent 29d09c9
commit c95a232
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/Common/src/main/java/hantonik/fbp/mixin/MixinParticleEngine.java b/Common/src/main/java/hantonik/fbp/mixin/MixinParticleEngine.java
@@ -81,13 +81,13 @@ private <T extends ParticleOptions> void makeParticle(T particleData, double x,
 
         if (FancyBlockParticles.CONFIG.terrain.isFancyBreakingParticles() && !(callback.getReturnValue() instanceof FBPTerrainParticle)) {
             if (particleData.getType() == ParticleTypes.BLOCK) {
-                var original = (TerrainParticle) callback.getReturnValue();
+                if (callback.getReturnValue() instanceof TerrainParticle original) {
+                    callback.setReturnValue(null);
 
-                callback.setReturnValue(null);
-
-                if (this.level.getFluidState(original.pos).isEmpty())
-                    if (FancyBlockParticles.CONFIG.isBlockParticlesEnabled(((BlockParticleOption) particleData).getState().getBlock()) && !(FancyBlockParticles.CONFIG.global.isFreezeEffect() && !FancyBlockParticles.CONFIG.terrain.isSpawnWhileFrozen()))
-                        callback.setReturnValue(new FBPTerrainParticle.Provider(original.pos, original.getQuadSize(1) * 5.0F, null, original.sprite, original.rCol, original.gCol, original.bCol).createParticle((BlockParticleOption) particleData, this.level, x, y, z, 0, 0, 0));
+                    if (this.level.getFluidState(original.pos).isEmpty())
+                        if (FancyBlockParticles.CONFIG.isBlockParticlesEnabled(((BlockParticleOption) particleData).getState().getBlock()) && !(FancyBlockParticles.CONFIG.global.isFreezeEffect() && !FancyBlockParticles.CONFIG.terrain.isSpawnWhileFrozen()))
+                            callback.setReturnValue(new FBPTerrainParticle.Provider(original.pos, original.getQuadSize(1) * 5.0F, null, original.sprite, original.rCol, original.gCol, original.bCol).createParticle((BlockParticleOption) particleData, this.level, x, y, z, 0, 0, 0));
+                }
             }
         }
     }

diff --git a/update.json b/update.json
@@ -2,10 +2,11 @@
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/fbp-renewed",
 
   "promos": {
-    "1.19.2-latest": "19.2.0.2-beta"
+    "1.19.2-latest": "19.2.0.3-beta"
   },
 
   "1.19.2": {
+    "19.2.0.3-beta": "Fix error while adding FBPTerrainParticle",
     "19.2.0.2-beta": "Fix particles becoming dark",
     "19.2.0.1-beta": "Fix snow particles not melting properly",
     "19.2.0.0-beta": "Backport to Minecraft 1.19.2"