fixed fishing bobbers ceasing to work in non-water blocks (reported b…

…y Quarx)
DaFuqs · Oct 30, 2023 · df71cfe · df71cfe
1 parent a4566e2
commit df71cfe
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/SpectrumFishingBobberEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/SpectrumFishingBobberEntity.java
@@ -359,23 +359,25 @@ public void tickFishingLogic(BlockPos pos) {
 				blockState = serverWorld.getBlockState(new BlockPos(d, e - 1.0D, j));
 
 				Pair<DefaultParticleType, DefaultParticleType> particles = getFluidParticles(blockState);
-				if (particles != null) {
-					if (this.fishTravelCountdown > 0) {
+				if (this.fishTravelCountdown > 0) {
+					float k = g * 0.04F;
+					float l = h * 0.04F;
+					if (particles != null) {
 						if (this.random.nextFloat() < 0.15F) {
 							serverWorld.spawnParticles(particles.getLeft(), d, e - 0.10000000149011612D, j, 1, g, 0.1D, h, 0.0D);
 						}
-						float k = g * 0.04F;
-						float l = h * 0.04F;
 						serverWorld.spawnParticles(particles.getRight(), d, e, j, 0, l, 0.01D, (-k), 1.0D);
 						serverWorld.spawnParticles(particles.getRight(), d, e, j, 0, (-l), 0.01D, k, 1.0D);
-					} else {
-						this.playSound(SoundEvents.ENTITY_FISHING_BOBBER_SPLASH, 0.25F, 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.4F);
+					}
+				} else {
+					this.playSound(SoundEvents.ENTITY_FISHING_BOBBER_SPLASH, 0.25F, 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.4F);
+					if (particles != null) {
 						double m = this.getY() + 0.5D;
 						serverWorld.spawnParticles(particles.getLeft(), this.getX(), m, this.getZ(), (int) (1.0F + this.getWidth() * 20.0F), this.getWidth(), 0.0D, this.getWidth(), 0.20000000298023224D);
 						serverWorld.spawnParticles(particles.getRight(), this.getX(), m, this.getZ(), (int) (1.0F + this.getWidth() * 20.0F), this.getWidth(), 0.0D, this.getWidth(), 0.20000000298023224D);
-						this.hookCountdown = MathHelper.nextInt(this.random, 20, 40);
-						this.getDataTracker().set(CAUGHT_FISH, true);
 					}
+					this.hookCountdown = MathHelper.nextInt(this.random, 20, 40);
+					this.getDataTracker().set(CAUGHT_FISH, true);
 				}
 			} else if (this.waitCountdown > 0) {
 				this.waitCountdown -= i;