Enable nullability in Content.Client (#3257)
* Enable nullability in Content.Client * Remove #nullable enable * Merge fixes * Remove Debug.Assert * Merge fixes * Fix build * Fix build
This commit is contained in:
@@ -36,11 +36,11 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
|
||||
KeyFrames =
|
||||
{
|
||||
new AnimationTrackProperty.KeyFrame(Color.Red, 0.1f),
|
||||
new AnimationTrackProperty.KeyFrame(null, 0.3f),
|
||||
new AnimationTrackProperty.KeyFrame(null!, 0.3f),
|
||||
new AnimationTrackProperty.KeyFrame(Color.Red, 0.2f),
|
||||
new AnimationTrackProperty.KeyFrame(null, 0.3f),
|
||||
new AnimationTrackProperty.KeyFrame(null!, 0.3f),
|
||||
new AnimationTrackProperty.KeyFrame(Color.Red, 0.2f),
|
||||
new AnimationTrackProperty.KeyFrame(null, 0.3f),
|
||||
new AnimationTrackProperty.KeyFrame(null!, 0.3f),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -59,11 +59,11 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
|
||||
KeyFrames =
|
||||
{
|
||||
new AnimationTrackProperty.KeyFrame(Color.Red, 0.0f),
|
||||
new AnimationTrackProperty.KeyFrame(null, 0.15f),
|
||||
new AnimationTrackProperty.KeyFrame(null!, 0.15f),
|
||||
new AnimationTrackProperty.KeyFrame(Color.Red, 0.15f),
|
||||
new AnimationTrackProperty.KeyFrame(null, 0.15f),
|
||||
new AnimationTrackProperty.KeyFrame(null!, 0.15f),
|
||||
new AnimationTrackProperty.KeyFrame(Color.Red, 0.15f),
|
||||
new AnimationTrackProperty.KeyFrame(null, 0.15f),
|
||||
new AnimationTrackProperty.KeyFrame(null!, 0.15f),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -72,7 +72,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
|
||||
public override string Name => "MagazineBarrel";
|
||||
public override uint? NetID => ContentNetIDs.MAGAZINE_BARREL;
|
||||
|
||||
private StatusControl _statusControl;
|
||||
private StatusControl? _statusControl;
|
||||
|
||||
/// <summary>
|
||||
/// True if a bullet is chambered.
|
||||
@@ -91,7 +91,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
|
||||
|
||||
[ViewVariables(VVAccess.ReadWrite)] [DataField("lmg_alarm_animation")] private bool _isLmgAlarmAnimation = default;
|
||||
|
||||
public override void HandleComponentState(ComponentState curState, ComponentState nextState)
|
||||
public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
|
||||
{
|
||||
base.HandleComponentState(curState, nextState);
|
||||
|
||||
@@ -103,7 +103,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
|
||||
_statusControl?.Update();
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user