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

Added nullable to most Content.Shared files (#3238)

Browse Source 
* Add nullable to some Content.Shared files.

* Use [NotNullWhen(true)]

* Undo adding now redundant !'s

* Forgot one

* Add a ton more nullable

* You can guess

* Fix some issues

* It actually compiles now

* Auto stash before merge of "null2" and "origin/master"

* I lied

* enable annotations -> enable

* Revert ActionBlockerSystem.cs to original

* Fix ActionBlockerSystem.cs

* More nullable

* Undo some added exclamation marks

* Fix issues

* Update Content.Shared/Maps/ContentTileDefinition.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Resolve some issues

* Remove unused method

* Fix more issues

* Fix more issues

* Fix more issues

* Fix more issues

* Fix issue, rollback SharedGhostComponent.cs

* Update submodule

* Fix issue, invert some if-statements to reduce nesting

* Revert RobustToolbox

* FIx things broken by merge

* Some fixes

- Replaced with string.Empty
- Remove some exclamation marks
- Revert file

* Some fixes

* Trivial #nullable enable

* Fix null ables

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
Visne
2021-02-27 04:12:09 +01:00
committed by GitHub
parent 2f45e5e044
commit 9b94d5c195
377 changed files with 1048 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Network/NetMessages/MsgDeleteCharacter.cs
View File

@@ -1,4 +1,5 @@
using Lidgren.Network;
#nullable enable
using Lidgren.Network;
using Robust.Shared.Network;
namespace Content.Shared.Network.NetMessages

5
Content.Shared/Network/NetMessages/MsgEuiCtl.cs
View File

@@ -1,4 +1,5 @@
using Lidgren.Network;
#nullable enable
using Lidgren.Network;
using Robust.Shared.Network;
namespace Content.Shared.Network.NetMessages
@@ -18,7 +19,7 @@ namespace Content.Shared.Network.NetMessages
#endregion
public CtlType Type;
public string OpenType;
public string OpenType = string.Empty;
public uint Id;
public override void ReadFromBuffer(NetIncomingMessage buffer)

5
Content.Shared/Network/NetMessages/MsgEuiMessage.cs
View File

@@ -1,4 +1,5 @@
using System;
#nullable enable
using System;
using System.IO;
using Content.Shared.Eui;
using Lidgren.Network;
@@ -20,7 +21,7 @@ namespace Content.Shared.Network.NetMessages
#endregion
public uint Id;
public EuiMessageBase Message;
public EuiMessageBase Message = default!;
public override void ReadFromBuffer(NetIncomingMessage buffer)
{

5
Content.Shared/Network/NetMessages/MsgEuiState.cs
View File

@@ -1,4 +1,5 @@
using System;
#nullable enable
using System;
using System.IO;
using Content.Shared.Eui;
using Lidgren.Network;
@@ -20,7 +21,7 @@ namespace Content.Shared.Network.NetMessages
#endregion
public uint Id;
public EuiStateBase State;
public EuiStateBase State = default!;
public override void ReadFromBuffer(NetIncomingMessage buffer)
{

7
Content.Shared/Network/NetMessages/MsgPreferencesAndSettings.cs
View File

@@ -1,4 +1,5 @@
using System.IO;
#nullable enable
using System.IO;
using Content.Shared.Preferences;
using Lidgren.Network;
using Robust.Shared.IoC;
@@ -21,8 +22,8 @@ namespace Content.Shared.Network.NetMessages
#endregion
public PlayerPreferences Preferences;
public GameSettings Settings;
public PlayerPreferences Preferences = default!;
public GameSettings Settings = default!;
public override void ReadFromBuffer(NetIncomingMessage buffer)
{

3
Content.Shared/Network/NetMessages/MsgRequestStationEvents.cs
View File

@@ -1,4 +1,5 @@
using Lidgren.Network;
#nullable enable
using Lidgren.Network;
using Robust.Shared.Network;
namespace Content.Shared.Network.NetMessages

3
Content.Shared/Network/NetMessages/MsgRequestWindowAttention.cs
View File

@@ -1,4 +1,5 @@
using Lidgren.Network;
#nullable enable
using Lidgren.Network;
using Robust.Shared.Network;
namespace Content.Shared.Network.NetMessages

3
Content.Shared/Network/NetMessages/MsgSelectCharacter.cs
View File

@@ -1,4 +1,5 @@
using Lidgren.Network;
#nullable enable
using Lidgren.Network;
using Robust.Shared.Network;
namespace Content.Shared.Network.NetMessages

6
Content.Shared/Network/NetMessages/MsgStationEvents.cs
View File

@@ -1,4 +1,6 @@
using System.IO;
#nullable enable
using System;
using System.IO;
using Lidgren.Network;
using Robust.Shared.IoC;
using Robust.Shared.Network;
@@ -16,7 +18,7 @@ namespace Content.Shared.Network.NetMessages
#endregion
public string[] Events;
public string[] Events = Array.Empty<string>();
public override void ReadFromBuffer(NetIncomingMessage buffer)
{

24
Content.Shared/Network/NetMessages/MsgUpdateAdminStatus.cs
View File

@@ -1,4 +1,6 @@
using Content.Shared.Administration;
#nullable enable
using System;
using Content.Shared.Administration;
using Lidgren.Network;
using Robust.Shared.Network;
@@ -15,8 +17,8 @@ namespace Content.Shared.Network.NetMessages
#endregion
public AdminData Admin;
public string[] AvailableCommands;
public AdminData? Admin;
public string[] AvailableCommands = Array.Empty<string>();
public override void ReadFromBuffer(NetIncomingMessage buffer)
{
@@ -55,16 +57,14 @@ namespace Content.Shared.Network.NetMessages
buffer.Write(cmd);
}
var isAdmin = Admin != null;
buffer.Write(isAdmin);
buffer.Write(Admin != null);
if (isAdmin)
{
buffer.Write(Admin.Active);
buffer.WritePadBits();
buffer.Write((uint) Admin.Flags);
buffer.Write(Admin.Title);
}
if (Admin == null) return;
buffer.Write(Admin.Active);
buffer.WritePadBits();
buffer.Write((uint) Admin.Flags);
buffer.Write(Admin.Title);
}
public override NetDeliveryMethod DeliveryMethod => NetDeliveryMethod.ReliableOrdered;

5
Content.Shared/Network/NetMessages/MsgUpdateCharacter.cs
View File

@@ -1,4 +1,5 @@
using System.IO;
#nullable enable
using System.IO;
using Content.Shared.Preferences;
using Lidgren.Network;
using Robust.Shared.IoC;
@@ -22,7 +23,7 @@ namespace Content.Shared.Network.NetMessages
#endregion
public int Slot;
public ICharacterProfile Profile;
public ICharacterProfile Profile = default!;
public override void ReadFromBuffer(NetIncomingMessage buffer)
{

3
Content.Shared/Network/NetMessages/MsgVoteCanCall.cs
View File

@@ -1,4 +1,5 @@
using Lidgren.Network;
#nullable enable
using Lidgren.Network;
using Robust.Shared.Network;
namespace Content.Shared.Network.NetMessages

9
Content.Shared/Network/NetMessages/MsgVoteData.cs
View File

@@ -1,4 +1,5 @@
using System;
#nullable enable
using System;
using Lidgren.Network;
using Robust.Shared.Network;
@@ -17,11 +18,11 @@ namespace Content.Shared.Network.NetMessages
public int VoteId;
public bool VoteActive;
public string VoteTitle;
public string VoteInitiator;
public string VoteTitle = string.Empty;
public string VoteInitiator = string.Empty;
public TimeSpan StartTime; // Server RealTime.
public TimeSpan EndTime; // Server RealTime.
public (ushort votes, string name)[] Options;
public (ushort votes, string name)[] Options = default!;
public bool IsYourVoteDirty;
public byte? YourVote;