From add03b6167046b503a044d20503e0da632779a07 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Mon, 17 Oct 2022 19:41:34 +0700
Subject: [PATCH] Don't predict shockwave sound

---
 .../mc/otm/android/feature/ShockwaveFeature.kt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/ShockwaveFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/ShockwaveFeature.kt
index 861c386c0..460e5f38d 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/ShockwaveFeature.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/ShockwaveFeature.kt
@@ -100,6 +100,15 @@ class ShockwaveFeature(capability: MatteryPlayerCapability) : AndroidSwitchableF
 		if (ply is ServerPlayer) {
 			ShockwaveTrigger.trigger(ply as ServerPlayer)
 			MatteryPlayerNetworkChannel.sendTrackingAndSelf(ply, ShockwaveEffectPacket(ply.position))
+
+			ply.level.playSound(
+				null,
+				ply,
+				MSoundEvents.ANDROID_SHOCKWAVE,
+				SoundSource.PLAYERS,
+				1f,
+				1f
+			)
 		}
 
 		// TODO: raycasting
@@ -195,15 +204,6 @@ class ShockwaveFeature(capability: MatteryPlayerCapability) : AndroidSwitchableF
 				} else {
 					shockwave()
 				}
-
-				ply.level.playSound(
-					ply,
-					ply,
-					MSoundEvents.ANDROID_SHOCKWAVE,
-					SoundSource.PLAYERS,
-					1f,
-					1f
-				)
 			}
 
 			if (!wasMidair) {