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

Enable nullability in Content.Server (#3685)

Browse Source
This commit is contained in:
DrSmugleaf
2021-03-16 15:50:20 +01:00
committed by GitHub
parent 90fec0ed24
commit a5ade526b7
306 changed files with 1616 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs
View File

@@ -18,8 +18,8 @@ using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Network;
using Robust.Shared.Players;
using Robust.Shared.Timing;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Timing;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Weapon.Ranged
@@ -40,11 +40,11 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged
[DataField("clumsyExplodeChance")]
public float ClumsyExplodeChance { get; set; } = 0.5f;
public Func<bool> WeaponCanFireHandler;
public Func<IEntity, bool> UserCanFireHandler;
public Action<IEntity, Vector2> FireHandler;
public Func<bool>? WeaponCanFireHandler;
public Func<IEntity, bool>? UserCanFireHandler;
public Action<IEntity, Vector2>? FireHandler;
public ServerRangedBarrelComponent Barrel
public ServerRangedBarrelComponent? Barrel
{
get => _barrel;
set
@@ -59,7 +59,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged
Dirty();
}
}
private ServerRangedBarrelComponent _barrel;
private ServerRangedBarrelComponent? _barrel;
private FireRateSelector FireRateSelector => _barrel?.FireRateSelector ?? FireRateSelector.Safety;
@@ -74,7 +74,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged
}
/// <inheritdoc />
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession? session = null)
{
base.HandleNetworkMessage(message, channel, session);
@@ -126,12 +126,12 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged
/// <param name="targetPos">Target position on the map to shoot at.</param>
private void TryFire(IEntity user, Vector2 targetPos)
{
if (!user.TryGetComponent(out HandsComponent hands) || hands.GetActiveHand?.Owner != Owner)
if (!user.TryGetComponent(out HandsComponent? hands) || hands.GetActiveHand?.Owner != Owner)
{
return;
}
if(!user.TryGetComponent(out CombatModeComponent combat) || !combat.IsInCombatMode) {
if(!user.TryGetComponent(out CombatModeComponent? combat) || !combat.IsInCombatMode) {
return;
}
@@ -142,7 +142,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged
var curTime = _gameTiming.CurTime;
var span = curTime - _lastFireTime;
if (span.TotalSeconds < 1 / _barrel.FireRate)
if (span.TotalSeconds < 1 / _barrel?.FireRate)
{
return;
}
@@ -158,13 +158,13 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged
soundSystem.PlayAtCoords("/Audio/Weapons/Guns/Gunshots/bang.ogg",
Owner.Transform.Coordinates, AudioParams.Default, 5);
if (user.TryGetComponent(out IDamageableComponent health))
if (user.TryGetComponent(out IDamageableComponent? health))
{
health.ChangeDamage(DamageType.Blunt, 10, false, user);
health.ChangeDamage(DamageType.Heat, 5, false, user);
}
if (user.TryGetComponent(out StunnableComponent stun))
if (user.TryGetComponent(out StunnableComponent? stun))
{
stun.Paralyze(3f);
}