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

Merge remote-tracking branch 'origin/18-06-09-gridentities'

Browse Source
This commit is contained in:
PJB3005
2018-06-13 04:26:04 +02:00
parent e4c378cb8f 10999dc905
commit 86e600bec7
8 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/EntryPoint.cs
View File

@@ -111,21 +111,15 @@ namespace Content.Server
{
case ServerRunLevel.PreGame:
var timing = IoCManager.Resolve<IGameTiming>();
var mainMap = new MapId(1);
var mainGrid = new GridId(1);
IoCManager.Resolve<IPlayerManager>().FallbackSpawnPoint = new LocalCoordinates(0, 0, mainGrid, mainMap);
var mapLoader = IoCManager.Resolve<IMapLoader>();
var mapMan = IoCManager.Resolve<IMapManager>();
var startTime = timing.RealTime;
{
var newMap = mapMan.CreateMap(mainMap);
var newMap = mapMan.CreateMap();
var grid = mapLoader.LoadBlueprint(newMap, "Maps/stationstation.yml");
mapLoader.LoadBlueprint(newMap, mainGrid, "Maps/stationstation.yml");
}
IoCManager.Resolve<IPlayerManager>().FallbackSpawnPoint = new GridLocalCoordinates(Vector2.Zero, grid);
var startTime = timing.RealTime;
var timeSpan = timing.RealTime - startTime;
Logger.Info($"Loaded map in {timeSpan.TotalMilliseconds:N2}ms.");