Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

RangedWeaponSystem doesn't send updates on past prediction.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-05-28 14:32:36 +02:00
parent 785ecacb32
commit 7573eb7863
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs
View File

@@ -1,13 +1,14 @@
using Content.Client.GameObjects.Components.Weapons.Ranged; using Content.Client.GameObjects.Components.Weapons.Ranged;
using Content.Client.Interfaces.GameObjects; using Content.Client.Interfaces.GameObjects;
using Content.Shared.Input;
using Robust.Client.GameObjects.EntitySystems; using Robust.Client.GameObjects.EntitySystems;
using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Interfaces.Graphics.ClientEye;
using Robust.Client.Interfaces.Input; using Robust.Client.Interfaces.Input;
using Robust.Client.Player; using Robust.Client.Player;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Input; using Robust.Shared.Input;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Log;
namespace Content.Client.GameObjects.EntitySystems namespace Content.Client.GameObjects.EntitySystems
{ {
@@ -18,6 +19,7 @@ namespace Content.Client.GameObjects.EntitySystems
[Dependency] private readonly IPlayerManager _playerManager; [Dependency] private readonly IPlayerManager _playerManager;
[Dependency] private readonly IEyeManager _eyeManager; [Dependency] private readonly IEyeManager _eyeManager;
[Dependency] private readonly IInputManager _inputManager; [Dependency] private readonly IInputManager _inputManager;
[Dependency] private readonly IGameTiming _gameTiming;
#pragma warning restore 649 #pragma warning restore 649
private InputSystem _inputSystem; private InputSystem _inputSystem;
@@ -38,6 +40,11 @@ namespace Content.Client.GameObjects.EntitySystems
{ {
base.Update(frameTime); base.Update(frameTime);
if (!_gameTiming.IsFirstTimePredicted)
{
return;
}
var canFireSemi = _isFirstShot; var canFireSemi = _isFirstShot;
var state = _inputSystem.CmdStates.GetState(EngineKeyFunctions.Use); var state = _inputSystem.CmdStates.GetState(EngineKeyFunctions.Use);
if (!_combatModeSystem.IsInCombatMode() || state != BoundKeyState.Down) if (!_combatModeSystem.IsInCombatMode() || state != BoundKeyState.Down)
@@ -71,6 +78,7 @@ namespace Content.Client.GameObjects.EntitySystems
if (weapon.Automatic || canFireSemi) if (weapon.Automatic || canFireSemi)
{ {
Logger.Debug(IoCManager.Resolve<IGameTiming>().CurTick.ToString());
weapon.SyncFirePos(worldPos); weapon.SyncFirePos(worldPos);
} }
} }