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

8
Content.Server/GameTicking/GameTicker.Spawning.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Server.GameTicking
{
private const string ObserverPrototypeName = "MobObserver";
[ViewVariables(VVAccess.ReadWrite), Obsolete("Due for removal when observer spawning is refactored.")]
[ViewVariables(VVAccess.ReadWrite), Obsolete("Due for removal when observer spawning is refactored.")] // See also: MindComponent's OnShutdown shitcode
private EntityCoordinates _spawnPoint;
/// <summary>
@@ -280,7 +280,11 @@ namespace Content.Server.GameTicking
#region Spawn Points
public EntityCoordinates GetObserverSpawnPoint()
{
var location = _spawnPoint;
// TODO rename this to TryGetObserverSpawnPoint to make it clear that the result might be invalid. Or at
// least try try more fallback values, like randomly spawning them in any available map or just creating a
// "we fucked up" map. Its better than dumping them into the void.
var location = _spawnPoint.IsValid(EntityManager) ? _spawnPoint : EntityCoordinates.Invalid;
_possiblePositions.Clear();

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
});