Fix double sound prediction in rare cases with hook attach (ddnet#11685)

AssassinTee · web-flow · commit 765b3919a3c9 · 2026-01-26T12:26:44.000Z
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
@@ -2626,8 +2626,6 @@ void CGameClient::OnPredict()
 
 		m_PredictedWorld.Tick();
 
-		HandlePredictedEvents(Tick);
-
 		// fetch the current characters
 		if(Tick == PredictionTick)
 		{
@@ -2689,6 +2687,8 @@ void CGameClient::OnPredict()
 				if(Events & COREEVENT_AIR_JUMP)
 					m_Effects.AirJump(Pos, 1.0f, 1.0f);
 		}
+
+		HandlePredictedEvents(Tick);
 	}
 
 	// detect mispredictions of other players and make corrections smoother when possible

Original file line number	Diff line number	Diff line change
`@@ -2626,8 +2626,6 @@ void CGameClient::OnPredict()`
`2626`	`2626`
`2627`	`2627`	`m_PredictedWorld.Tick();`
`2628`	`2628`
`2629`		`- HandlePredictedEvents(Tick);`
`2630`		`-`
`2631`	`2629`	`// fetch the current characters`
`2632`	`2630`	`if(Tick == PredictionTick)`
`2633`	`2631`	`{`
`@@ -2689,6 +2687,8 @@ void CGameClient::OnPredict()`
`2689`	`2687`	`if(Events & COREEVENT_AIR_JUMP)`
`2690`	`2688`	`m_Effects.AirJump(Pos, 1.0f, 1.0f);`
`2691`	`2689`	`}`
	`2690`	`+`
	`2691`	`+ HandlePredictedEvents(Tick);`
`2692`	`2692`	`}`
`2693`	`2693`
`2694`	`2694`	`// detect mispredictions of other players and make corrections smoother when possible`