Merge branch '1.20.2' into 1.20.4

Sollace · Jun 10, 2024 · 8f5fc60 · 8f5fc60
2 parents 525cd79 + 349aa05
commit 8f5fc60
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/eu/ha3/presencefootsteps/world/Association.java b/src/main/java/eu/ha3/presencefootsteps/world/Association.java
@@ -32,7 +32,7 @@ public boolean isResult() {
     }
 
     public boolean isSilent() {
-        return this == NOT_EMITTER;
+        return this == NOT_EMITTER || state.isAir();
     }
 
     public boolean dataEquals(Association other) {

diff --git a/src/main/java/eu/ha3/presencefootsteps/world/PFSolver.java b/src/main/java/eu/ha3/presencefootsteps/world/PFSolver.java
@@ -216,7 +216,7 @@ private Association findAssociation(AssociationPool associations, LivingEntity p
             return Association.of(state, pos.down(), player, SoundsKey.WATERFINE, SoundsKey.NON_EMITTER, SoundsKey.NON_EMITTER);
         }
 
-        return Association.NOT_EMITTER;
+        return association;
     }
 
     private Association findAssociation(AssociationPool associations, LivingEntity entity, BlockPos.Mutable pos, Box collider) {

diff --git a/src/main/java/eu/ha3/presencefootsteps/world/SoundsKey.java b/src/main/java/eu/ha3/presencefootsteps/world/SoundsKey.java
@@ -41,6 +41,6 @@ public boolean isSilent() {
     }
 
     public boolean isEmitter() {
-        return isResult() && !isSilent();
+        return !isSilent();
     }
 }