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

Fix some build warnings (#6832)

Browse Source 
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2022-02-21 14:41:50 +11:00
committed by GitHub
parent f9c853f100
commit b87806f7ed
36 changed files with 53 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/GameTicking/Commands/MappingCommand.cs
View File

@@ -88,9 +88,8 @@ namespace Content.Server.GameTicking.Commands
shell.RemoteExecuteCommand("showmarkers");
var newGrid = mapManager.GetAllGrids().OrderByDescending(g => (int) g.Index).First();
var pauseManager = IoCManager.Resolve<IPauseManager>();
pauseManager.SetMapPaused(newGrid.ParentMapId, true);
mapManager.SetMapPaused(newGrid.ParentMapId, true);
shell.WriteLine($"Created unloaded map from file {mapName} with id {mapId}. Use \"savebp {newGrid.Index} foo.yml\" to save the new grid as a map.");
}

6
Content.Server/GameTicking/GameTicker.RoundFlow.cs
View File

@@ -74,7 +74,7 @@ namespace Content.Server.GameTicking
AddGamePresetRules();
DefaultMap = _mapManager.CreateMap();
_pauseManager.AddUninitializedMap(DefaultMap);
_mapManager.AddUninitializedMap(DefaultMap);
_startingRound = false;
var startTime = _gameTiming.RealTime;
var maps = new List<GameMapPrototype>() { _gameMapManager.GetSelectedMapChecked(true) };
@@ -89,7 +89,7 @@ namespace Content.Server.GameTicking
{
// Create other maps for the others since we need to.
toLoad = _mapManager.CreateMap();
_pauseManager.AddUninitializedMap(toLoad);
_mapManager.AddUninitializedMap(toLoad);
}
_mapLoader.LoadMap(toLoad, map.MapPath.ToString());
@@ -273,7 +273,7 @@ namespace Content.Server.GameTicking
}
// MapInitialize *before* spawning players, our codebase is too shit to do it afterwards...
_pauseManager.DoMapInitialize(DefaultMap);
_mapManager.DoMapInitialize(DefaultMap);
// Allow game rules to spawn players by themselves if needed. (For example, nuke ops or wizard)
RaiseLocalEvent(new RulePlayerSpawningEvent(readyPlayers, profiles, force));

1
Content.Server/GameTicking/GameTicker.cs
View File

@@ -90,7 +90,6 @@ namespace Content.Server.GameTicking
[Dependency] private readonly IBaseServer _baseServer = default!;
[Dependency] private readonly IWatchdogApi _watchdogApi = default!;
[Dependency] private readonly IGameMapManager _gameMapManager = default!;
[Dependency] private readonly IPauseManager _pauseManager = default!;
#if EXCEPTION_TOLERANCE
[Dependency] private readonly IRuntimeLog _runtimeLog = default!;
#endif