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

Load grid error related changes (#10817)

Browse Source
This commit is contained in:
Leon Friedrich
2022-08-26 01:33:40 +12:00
committed by GitHub
parent 561c527657
commit c65d1c51ce
11 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
View File

@@ -195,7 +195,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem
var shuttlePath = "/Maps/infiltrator.yml";
var mapId = _mapManager.CreateMap();
var (_, outpost) = _mapLoader.LoadBlueprint(mapId, "/Maps/nukieplanet.yml");
var (_, outpost) = _mapLoader.LoadGrid(mapId, "/Maps/nukieplanet.yml");
if (outpost == null)
{
@@ -204,7 +204,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem
}
// Listen I just don't want it to overlap.
var (_, shuttleId) = _mapLoader.LoadBlueprint(mapId, shuttlePath, new MapLoadOptions()
var (_, shuttleId) = _mapLoader.LoadGrid(mapId, shuttlePath, new MapLoadOptions()
{
Offset = Vector2.One * 1000f,
});

2
Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
View File

@@ -155,7 +155,7 @@ public sealed class PiratesRuleSystem : GameRuleSystem
aabb.Union(aabbs[i]);
}
var (_, gridId) = _mapLoader.LoadBlueprint(GameTicker.DefaultMap, map, new MapLoadOptions
var (_, gridId) = _mapLoader.LoadGrid(GameTicker.DefaultMap, map, new MapLoadOptions
{
Offset = aabb.Center + MathF.Max(aabb.Height / 2f, aabb.Width / 2f) * 2.5f
});