Fix shrink sounds

WenXin20 · Jan 1, 2025 · 48c2187 · 48c2187
1 parent 1dd88d2
commit 48c2187
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/src/main/java/com/wenxin2/marioverse/event_handlers/MarioverseEventHandlers.java b/src/main/java/com/wenxin2/marioverse/event_handlers/MarioverseEventHandlers.java
@@ -129,6 +129,14 @@ public static void onEntityDamaged(LivingIncomingDamageEvent event) {
                     AttributeInstance heightScale = player.getAttribute(AttributesRegistry.HEIGHT_SCALE);
                     AttributeInstance widthScale = player.getAttribute(AttributesRegistry.WIDTH_SCALE);
 
+                    if (eyeHeightScale != null && heightScale != null && widthScale != null) {
+                        if (!eyeHeightScale.hasModifier(AttributesRegistry.EYE_HEIGHT_SCALE_DAMAGE_MODIFIER.id())
+                                && !heightScale.hasModifier(AttributesRegistry.HEIGHT_SCALE_DAMAGE_MODIFIER.id())
+                                && !widthScale.hasModifier(AttributesRegistry.WIDTH_SCALE_DAMAGE_MODIFIER.id()))
+                            world.playSound(null, player.blockPosition(), SoundRegistry.DAMAGE_TAKEN.get(),
+                                    SoundSource.PLAYERS, 1.0F, 1.0F);
+                    }
+
                     if (eyeHeightScale != null) {
                         if (!eyeHeightScale.hasModifier(AttributesRegistry.EYE_HEIGHT_SCALE_DAMAGE_MODIFIER.id()))
                             eyeHeightScale.addTransientModifier(AttributesRegistry.EYE_HEIGHT_SCALE_DAMAGE_MODIFIER);
@@ -141,8 +149,6 @@ public static void onEntityDamaged(LivingIncomingDamageEvent event) {
                         if (!widthScale.hasModifier(AttributesRegistry.WIDTH_SCALE_DAMAGE_MODIFIER.id()))
                             widthScale.addTransientModifier(AttributesRegistry.WIDTH_SCALE_DAMAGE_MODIFIER);
                     }
-                    world.playSound(null, player.blockPosition(), SoundRegistry.DAMAGE_TAKEN.get(),
-                            SoundSource.PLAYERS, 1.0F, 1.0F);
                 }
             }
 
@@ -203,6 +209,14 @@ public static void onEntityDamaged(LivingIncomingDamageEvent event) {
                     AttributeInstance heightScale = entity.getAttribute(AttributesRegistry.HEIGHT_SCALE);
                     AttributeInstance widthScale = entity.getAttribute(AttributesRegistry.WIDTH_SCALE);
 
+                    if (eyeHeightScale != null && heightScale != null && widthScale != null) {
+                        if (!eyeHeightScale.hasModifier(AttributesRegistry.EYE_HEIGHT_SCALE_DAMAGE_MODIFIER.id())
+                                && !heightScale.hasModifier(AttributesRegistry.HEIGHT_SCALE_DAMAGE_MODIFIER.id())
+                                && !widthScale.hasModifier(AttributesRegistry.WIDTH_SCALE_DAMAGE_MODIFIER.id()))
+                            world.playSound(null, entity.blockPosition(), SoundRegistry.DAMAGE_TAKEN.get(),
+                                    SoundSource.HOSTILE, 1.0F, 1.0F);
+                    }
+
                     if (eyeHeightScale != null) {
                         if (!eyeHeightScale.hasModifier(AttributesRegistry.EYE_HEIGHT_SCALE_DAMAGE_MODIFIER.id()))
                             eyeHeightScale.addTransientModifier(AttributesRegistry.EYE_HEIGHT_SCALE_DAMAGE_MODIFIER);
@@ -215,8 +229,6 @@ public static void onEntityDamaged(LivingIncomingDamageEvent event) {
                         if (!widthScale.hasModifier(AttributesRegistry.WIDTH_SCALE_DAMAGE_MODIFIER.id()))
                             widthScale.addTransientModifier(AttributesRegistry.WIDTH_SCALE_DAMAGE_MODIFIER);
                     }
-                    world.playSound(null, entity.blockPosition(), SoundRegistry.DAMAGE_TAKEN.get(),
-                            SoundSource.HOSTILE, 1.0F, 1.0F);
                 }
             }