Fixed golem sounds not playing for flying boats

Author: Sollace

src/main/java/eu/ha3/presencefootsteps/world/Association.java

@@ -13,26 +13,27 @@ public record Association (
         BlockState state,
         BlockPos pos,
         @Nullable LivingEntity source,
+        boolean forcePlay,
 
         SoundsKey dry,
         SoundsKey wet,
         SoundsKey foliage
 ) {
-    public static final Association NOT_EMITTER = new Association(Blocks.AIR.getDefaultState(), BlockPos.ORIGIN, null, SoundsKey.NON_EMITTER, SoundsKey.NON_EMITTER, SoundsKey.NON_EMITTER);
+    public static final Association NOT_EMITTER = new Association(Blocks.AIR.getDefaultState(), BlockPos.ORIGIN, null, false, SoundsKey.NON_EMITTER, SoundsKey.NON_EMITTER, SoundsKey.NON_EMITTER);
 
-    public static Association of(BlockState state, BlockPos pos, LivingEntity source, SoundsKey dry, SoundsKey wet, SoundsKey foliage) {
+    public static Association of(BlockState state, BlockPos pos, LivingEntity source, boolean forcePlay, SoundsKey dry, SoundsKey wet, SoundsKey foliage) {
         if (dry.isSilent() && wet.isSilent() && foliage.isSilent()) {
             return NOT_EMITTER;
         }
-        return new Association(state, pos.toImmutable(), source, dry, wet, foliage);
+        return new Association(state, pos.toImmutable(), source, forcePlay, dry, wet, foliage);
     }
 
     public boolean isResult() {
         return dry.isResult() || wet.isResult() || foliage.isResult();
     }
 
     public boolean isSilent() {
-        return this == NOT_EMITTER || state.isAir();
+        return this == NOT_EMITTER || (state.isAir() && !forcePlay);
     }
 
     public boolean dataEquals(Association other) {

src/main/java/eu/ha3/presencefootsteps/world/AssociationPool.java

@@ -69,6 +69,7 @@ public SoundsKey get(BlockPos pos, BlockState state, String substrate) {
             return !e.isCollidable() || e.getBoundingBox().maxY < entity.getY() + 0.2F;
         })) {
             if ((association = engine.getIsolator().golems().getAssociation(golem.getType(), substrate)).isEmitter()) {
+                wasGolem = true;
                 return association;
             }
         }

src/main/java/eu/ha3/presencefootsteps/world/PFSolver.java

@@ -80,7 +80,7 @@ public Association findAssociation(AssociationPool associations, LivingEntity pl
 
         // we discard the normal block association, and mark the foliage as detected
         if (foliage.isEmitter() && engine.getIsolator().blocks().getAssociation(above, Substrates.MESSY) == SoundsKey.MESSY_GROUND) {
-            return Association.of(above, pos, ply, SoundsKey.NON_EMITTER, SoundsKey.NON_EMITTER, foliage);
+            return Association.of(above, pos, ply, false, SoundsKey.NON_EMITTER, SoundsKey.NON_EMITTER, foliage);
         }
 
         return Association.NOT_EMITTER;
@@ -211,9 +211,9 @@ private Association findAssociation(AssociationPool associations, LivingEntity p
 
         if (state.isLiquid()) {
             if (state.getFluidState().isIn(FluidTags.LAVA)) {
-                return Association.of(state, pos.down(), player, SoundsKey.LAVAFINE, SoundsKey.NON_EMITTER, SoundsKey.NON_EMITTER);
+                return Association.of(state, pos.down(), player, false, SoundsKey.LAVAFINE, SoundsKey.NON_EMITTER, SoundsKey.NON_EMITTER);
             }
-            return Association.of(state, pos.down(), player, SoundsKey.WATERFINE, SoundsKey.NON_EMITTER, SoundsKey.NON_EMITTER);
+            return Association.of(state, pos.down(), player, false, SoundsKey.WATERFINE, SoundsKey.NON_EMITTER, SoundsKey.NON_EMITTER);
         }
 
         return association;
@@ -291,6 +291,6 @@ private Association findAssociation(AssociationPool associations, LivingEntity e
             wetAssociation = associations.get(pos, target, Substrates.WET);
         }
 
-        return Association.of(target, pos, entity, association, wetAssociation, foliage);
+        return Association.of(target, pos, entity, associations.wasLastMatchGolem() && entity.isOnGround(), association, wetAssociation, foliage);
     }
 }