From 7ae83fa3225b3d28cf7eaa2e17c6964b4dc43f6c Mon Sep 17 00:00:00 2001 From: Hantonik Date: Mon, 17 Jun 2024 15:11:28 +0200 Subject: [PATCH] Fix a crash on Freeze effect --- .../java/hantonik/fbp/particle/FBPFlameParticle.java | 10 +++++----- update.json | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Common/src/main/java/hantonik/fbp/particle/FBPFlameParticle.java b/Common/src/main/java/hantonik/fbp/particle/FBPFlameParticle.java index def26bf..4965acf 100644 --- a/Common/src/main/java/hantonik/fbp/particle/FBPFlameParticle.java +++ b/Common/src/main/java/hantonik/fbp/particle/FBPFlameParticle.java @@ -81,7 +81,7 @@ public FBPFlameParticle(ClientLevel level, double x, double y, double z, double } @Override - public Particle scale(float scale) { + public FBPFlameParticle scale(float scale) { super.scale(scale); this.startSize = this.quadSize; @@ -287,7 +287,7 @@ private void addVertex(VertexConsumer buffer, Vector3d pos, float u, float v, in } @Nullable - private static FBPFlameParticle create(ClientLevel level, double x, double y, double z, double xd, double zd, boolean isSoulFire) { + private static FBPFlameParticle create(ClientLevel level, double x, double y, double z, double xd, double zd, float scale, boolean isSoulFire) { if (FancyBlockParticles.CONFIG.global.isFreezeEffect()) return null; @@ -296,7 +296,7 @@ private static FBPFlameParticle create(ClientLevel level, double x, double y, do if (state.getBlock() instanceof TorchBlock || state.getBlock() instanceof CandleBlock) y += 0.04D; - return new FBPFlameParticle(level, x, y - 0.06D, z, xd, FBPConstants.RANDOM.nextDouble() * 0.025D, zd, isSoulFire, !(state.getBlock() instanceof TorchBlock) && !(state.getBlock() instanceof CandleBlock)); + return new FBPFlameParticle(level, x, y - 0.06D, z, xd, FBPConstants.RANDOM.nextDouble() * 0.025D, zd, isSoulFire, !(state.getBlock() instanceof TorchBlock) && !(state.getBlock() instanceof CandleBlock)).scale(scale); } @RequiredArgsConstructor @@ -306,7 +306,7 @@ public static class Provider implements ParticleProvider { @Nullable @Override public Particle createParticle(SimpleParticleType type, ClientLevel level, double x, double y, double z, double xd, double yd, double zd) { - return create(level, x, y, z, xd, zd, this.isSoulFire); + return create(level, x, y, z, xd, zd, 1.0F, this.isSoulFire); } } @@ -315,7 +315,7 @@ public static class SmallFlameProvider implements ParticleProvider