diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs index 291e05e4c1..8ef2f8185c 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs @@ -1,8 +1,5 @@ -using System; using Content.Shared.GameObjects.Components.Weapons.Ranged; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Timing; -using Robust.Shared.IoC; using Robust.Shared.Map; namespace Content.Client.GameObjects.Components.Weapons.Ranged @@ -10,20 +7,9 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged [RegisterComponent] public sealed class ClientRangedWeaponComponent : SharedRangedWeaponComponent { - private TimeSpan _lastFireTime; - private int _tick; - - public void TryFire(GridCoordinates worldPos) + public void SyncFirePos(GridCoordinates worldPos) { - var curTime = IoCManager.Resolve().CurTime; - var span = curTime - _lastFireTime; - if (span.TotalSeconds < 1 / FireRate) - { - return; - } - - _lastFireTime = curTime; - SendNetworkMessage(new FireMessage(worldPos, _tick++)); + SendNetworkMessage(new SyncFirePosMessage(worldPos)); } } } diff --git a/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs b/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs index 8ffa35f5bd..d54056a00d 100644 --- a/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs @@ -68,7 +68,7 @@ namespace Content.Client.GameObjects.EntitySystems if (weapon.Automatic || canFireSemi) { - weapon.TryFire(worldPos); + weapon.SyncFirePos(worldPos); } } } diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs index b7df63fd0c..6b0d17dfe6 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs @@ -46,7 +46,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged switch (message) { - case FireMessage msg: + case SyncFirePosMessage msg: var playerMgr = IoCManager.Resolve(); var session = playerMgr.GetSessionByChannel(netChannel); var user = session.AttachedEntity; diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs index 475076d243..50df283ab3 100644 --- a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs +++ b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs @@ -31,15 +31,13 @@ namespace Content.Shared.GameObjects.Components.Weapons.Ranged } [Serializable, NetSerializable] - protected class FireMessage : ComponentMessage + protected class SyncFirePosMessage : ComponentMessage { public readonly GridCoordinates Target; - public readonly int Tick; - public FireMessage(GridCoordinates target, int tick) + public SyncFirePosMessage(GridCoordinates target) { Target = target; - Tick = tick; } } }