fix: 一些伪装缺少部分声音

fix: 一些伪装的闲置音效音量不正确
NiFeather · Feb 23, 2024 · 835376a · 835376a
1 parent e5dda99
commit 835376a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...momc/morph/backends/server/renderer/network/datawatcher/watchers/types/EntityWatcher.java b/...momc/morph/backends/server/renderer/network/datawatcher/watchers/types/EntityWatcher.java
@@ -58,7 +58,7 @@ protected void doSync()
             bitMask |= (byte) 0x80;
 
         write(values.GENERAL, bitMask);
-        write(values.SILENT, true);
+        //write(values.SILENT, true);
         write(values.NO_GRAVITY, !player.hasGravity());
         write(values.POSE, nmsPlayer.getPose());
         write(values.FROZEN_TICKS, nmsPlayer.getTicksFrozen());

diff --git a/src/main/java/xiamomc/morph/misc/DisguiseState.java b/src/main/java/xiamomc/morph/misc/DisguiseState.java
@@ -599,6 +599,7 @@ public static class SoundHandler
         public Sound ambientSoundSecondary;
         private int soundTime;
         private double soundFrequency = 0D;
+        private float soundVolume = 1f;
 
         public void resetSoundTime()
         {
@@ -657,7 +658,12 @@ public void update()
                 else if (sound != null && random.nextInt((int)(1000 * frequencyScale)) < soundTime)
                 {
                     soundTime = -(int)(ambientInterval * frequencyScale);
-                    bindingPlayer.getWorld().playSound(bindingPlayer.getLocation(), sound.name().asString(), soundCategory, 1f, 1f);
+                    bindingPlayer.getWorld().playSound(
+                            bindingPlayer.getLocation(),
+                            sound.name().asString(),
+                            soundCategory,
+                            soundVolume,
+                            1f);
                 }
             }
         }
@@ -687,6 +693,7 @@ public void refreshSounds(EntityType entityType, boolean isBaby)
             var sound = soundEvent.sound();
             if (sound == null) return;
 
+            this.soundVolume = soundEvent.volume();
             this.ambientInterval = soundEvent.interval();
             var pitch = isBaby ? 1.5F : 1F;