Merge branch '1.20.2' into 1.20.4

Sollace · Mar 31, 2024 · 88d2535 · 88d2535
2 parents 2cb5aec + b2a350b
commit 88d2535
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/eu/ha3/presencefootsteps/sound/generator/TerrestrialStepSoundGenerator.java b/src/main/java/eu/ha3/presencefootsteps/sound/generator/TerrestrialStepSoundGenerator.java
@@ -3,6 +3,7 @@
 import net.minecraft.client.network.OtherClientPlayerEntity;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.passive.AbstractHorseEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ArmorItem;
 import net.minecraft.util.math.BlockPos;
@@ -80,7 +81,7 @@ protected void simulateStationary() {
         if (isImmobile && (entity.isOnGround() || !entity.isSubmergedInWater()) && playbackImmobile()) {
             Association assos = associations.findAssociation(0d, isRightFoot);
 
-            if (!assos.isSilent() || !isImmobile) {
+            if (assos.isResult() && (!assos.isSilent() || !isImmobile)) {
                 playStep(assos, State.STAND);
             }
         }
@@ -177,7 +178,7 @@ protected void simulateFootsteps() {
             }
 
             // Fix high speed footsteps (i.e. horse riding)
-            if (motionTracker.getHorizontalSpeed() > 0.1) {
+            if ((entity instanceof AbstractHorseEntity) && motionTracker.getHorizontalSpeed() > 0.1) {
                 distance *= 3;
             }
 

diff --git a/...resources/resourcepacks/default_sound_pack/assets/presencefootsteps/config/acoustics.json b/...resources/resourcepacks/default_sound_pack/assets/presencefootsteps/config/acoustics.json
@@ -1881,10 +1881,10 @@
         },
         "souls": {
             "type": "events",
+            "wander": "@minecraft:block.soul_soil.step",
+            "land": "@minecraft:block.soul_soil.place",
             "walk": "@minecraft:block.soul_soil.place",
-            "run": "@minecraft:block.soul_soil.place",
-            "wander": "@minecraft:block.soul_soil.place",
-            "land": "@minecraft:block.soul_soil.place"
+            "run": "@minecraft:block.soul_soil.place"
         },
         "bone": {
             "type": "events",