Replace pragma warning 649 disable/restore with default!

This commit is contained in:
DrSmugleaf
2020-08-24 14:10:28 +02:00
parent 9e6459ac79
commit 8a27a5322a
147 changed files with 435 additions and 724 deletions

View File

@@ -8,9 +8,7 @@ namespace Content.Server.GameTicking.GamePresets
{
public sealed class PresetDeathMatch : GamePreset
{
#pragma warning disable 649
[Dependency] private readonly IGameTicker _gameTicker;
#pragma warning restore 649
[Dependency] private readonly IGameTicker _gameTicker = default!;
public override bool Start(IReadOnlyList<IPlayerSession> readyPlayers, bool force = false)
{

View File

@@ -7,9 +7,7 @@ namespace Content.Server.GameTicking.GamePresets
{
public sealed class PresetSandbox : GamePreset
{
#pragma warning disable 649
[Dependency] private readonly ISandboxManager _sandboxManager;
#pragma warning restore 649
[Dependency] private readonly ISandboxManager _sandboxManager = default!;
public override bool Start(IReadOnlyList<IPlayerSession> readyPlayers, bool force = false)
{

View File

@@ -21,13 +21,11 @@ namespace Content.Server.GameTicking.GamePresets
{
public class PresetSuspicion : GamePreset
{
#pragma warning disable 649
[Dependency] private readonly IChatManager _chatManager;
[Dependency] private readonly IGameTicker _gameTicker;
[Dependency] private readonly IRobustRandom _random;
[Dependency] private readonly IConfigurationManager _cfg;
[Dependency] private IPrototypeManager _prototypeManager;
#pragma warning restore 649
[Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly IGameTicker _gameTicker = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
public int MinPlayers { get; set; }
public int MinTraitors { get; set; }

View File

@@ -21,12 +21,10 @@ namespace Content.Server.GameTicking.GameRules
{
private static readonly TimeSpan DeadCheckDelay = TimeSpan.FromSeconds(5);
#pragma warning disable 649
[Dependency] private readonly IPlayerManager _playerManager;
[Dependency] private readonly IEntityManager _entityManager;
[Dependency] private readonly IChatManager _chatManager;
[Dependency] private readonly IGameTicker _gameTicker;
#pragma warning restore 649
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly IGameTicker _gameTicker = default!;
private CancellationTokenSource _checkTimerCancel;

View File

@@ -25,11 +25,9 @@ namespace Content.Server.GameTicking.GameRules
{
private static readonly TimeSpan DeadCheckDelay = TimeSpan.FromSeconds(1);
#pragma warning disable 649
[Dependency] private readonly IPlayerManager _playerManager;
[Dependency] private readonly IChatManager _chatManager;
[Dependency] private readonly IGameTicker _gameTicker;
#pragma warning restore 649
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly IGameTicker _gameTicker = default!;
private readonly CancellationTokenSource _checkTimerCancel = new CancellationTokenSource();

View File

@@ -980,22 +980,20 @@ The current game mode is: [color=white]{0}[/color].
return preset;
}
#pragma warning disable 649
[Dependency] private IEntityManager _entityManager;
[Dependency] private IMapManager _mapManager;
[Dependency] private IMapLoader _mapLoader;
[Dependency] private IGameTiming _gameTiming;
[Dependency] private IConfigurationManager _configurationManager;
[Dependency] private IChatManager _chatManager;
[Dependency] private IServerNetManager _netManager;
[Dependency] private IDynamicTypeFactory _dynamicTypeFactory;
[Dependency] private IPrototypeManager _prototypeManager;
[Dependency] private readonly ILocalizationManager _localization;
[Dependency] private readonly IRobustRandom _robustRandom;
[Dependency] private readonly IServerPreferencesManager _prefsManager;
[Dependency] private readonly IBaseServer _baseServer;
[Dependency] private readonly IWatchdogApi _watchdogApi;
#pragma warning restore 649
[Dependency] private IEntityManager _entityManager = default!;
[Dependency] private IMapManager _mapManager = default!;
[Dependency] private IMapLoader _mapLoader = default!;
[Dependency] private IGameTiming _gameTiming = default!;
[Dependency] private IConfigurationManager _configurationManager = default!;
[Dependency] private IChatManager _chatManager = default!;
[Dependency] private IServerNetManager _netManager = default!;
[Dependency] private IDynamicTypeFactory _dynamicTypeFactory = default!;
[Dependency] private IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly ILocalizationManager _localization = default!;
[Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private readonly IServerPreferencesManager _prefsManager = default!;
[Dependency] private readonly IBaseServer _baseServer = default!;
[Dependency] private readonly IWatchdogApi _watchdogApi = default!;
}
public enum GameRunLevel

View File

@@ -183,9 +183,8 @@ namespace Content.Server.GameTicking
class JoinGameCommand : IClientCommand
{
#pragma warning disable 649
[Dependency] private IPrototypeManager _prototypeManager;
#pragma warning restore 649
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
public string Command => "joingame";
public string Description => "";
public string Help => "";