From 23d7cd0a2956513065f35d48d1c2420c34a4121a Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Sat, 15 Mar 2025 02:06:00 -0400 Subject: [PATCH] Fix thrown item prediction weirdness (#35843) Don't predict thrown item landing/stopping --- Content.Shared/Throwing/ThrownItemSystem.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs index 3d81cc96e4..236e91aec6 100644 --- a/Content.Shared/Throwing/ThrownItemSystem.cs +++ b/Content.Shared/Throwing/ThrownItemSystem.cs @@ -145,6 +145,12 @@ namespace Content.Shared.Throwing { base.Update(frameTime); + // TODO predicted throwing - remove this check + // We don't want to predict landing or stopping, since throwing isn't actually predicted. + // If we do, the landing/stop will occur prematurely on the client. + if (_gameTiming.InPrediction) + return; + var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var thrown, out var physics)) { -- 2.51.2