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

Replace pragma warning 649 disable/restore with default!

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

36
Content.Server/GameObjects/EntitySystems/StationEvents/StationEventSystem.cs
View File

@@ -21,11 +21,9 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
// Somewhat based off of TG's implementation of events
public sealed class StationEventSystem : EntitySystem
{
#pragma warning disable 649
[Dependency] private readonly IServerNetManager _netManager;
[Dependency] private readonly IPlayerManager _playerManager;
[Dependency] private readonly IGameTicker _gameTicker;
#pragma warning restore 649
[Dependency] private readonly IServerNetManager _netManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IGameTicker _gameTicker = default!;
public StationEvent CurrentEvent { get; private set; }
public IReadOnlyCollection<StationEvent> StationEvents => _stationEvents;
@@ -33,7 +31,7 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
private List<StationEvent> _stationEvents = new List<StationEvent>();
private const float MinimumTimeUntilFirstEvent = 600;
/// <summary>
/// How long until the next check for an event runs
/// </summary>
@@ -77,7 +75,7 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
return result.ToString();
}
/// <summary>
/// Admins can forcibly run events by passing in the Name
/// </summary>
@@ -88,14 +86,14 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
// Could use a dictionary but it's such a minor thing, eh.
// Wasn't sure on whether to localize this given it's a command
var upperName = name.ToUpperInvariant();
foreach (var stationEvent in _stationEvents)
{
if (stationEvent.Name.ToUpperInvariant() != upperName)
{
continue;
}
CurrentEvent?.Shutdown();
CurrentEvent = stationEvent;
stationEvent.Startup();
@@ -114,12 +112,12 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
{
var availableEvents = AvailableEvents(true);
var randomEvent = FindEvent(availableEvents);
if (randomEvent == null)
{
return Loc.GetString("No valid events available");
}
CurrentEvent?.Shutdown();
CurrentEvent = randomEvent;
CurrentEvent.Startup();
@@ -134,7 +132,7 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
public string StopEvent()
{
string resultText;
if (CurrentEvent == null)
{
resultText = Loc.GetString("No event running currently");
@@ -145,11 +143,11 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
CurrentEvent.Shutdown();
CurrentEvent = null;
}
ResetTimer();
return resultText;
}
public override void Initialize()
{
base.Initialize();
@@ -212,7 +210,7 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
if (CurrentEvent != null)
{
CurrentEvent.Update(frameTime);
// Shutdown the event and set the timer for the next event
if (!CurrentEvent.Running)
{
@@ -262,14 +260,14 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
{
return null;
}
var sumOfWeights = 0;
foreach (var stationEvent in availableEvents)
{
sumOfWeights += (int) stationEvent.Weight;
}
var robustRandom = IoCManager.Resolve<IRobustRandom>();
sumOfWeights = robustRandom.Next(sumOfWeights);
@@ -295,7 +293,7 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
{
TimeSpan currentTime;
var playerCount = IoCManager.Resolve<IPlayerManager>().PlayerCount;
// playerCount does a lock so we'll just keep the variable here
if (!ignoreEarliestStart)
{
@@ -346,7 +344,7 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
CurrentEvent.Shutdown();
CurrentEvent = null;
}
foreach (var stationEvent in _stationEvents)
{
stationEvent.Occurrences = 0;