Fix grid fixtures using locale dependent ids (#5887)

This commit is contained in:
Leon Friedrich
2025-04-24 20:49:04 +10:00
committed by GitHub
parent 93bb7b1532
commit 4cbce064b8
2 changed files with 4 additions and 3 deletions

View File

@@ -47,6 +47,7 @@ END TEMPLATE-->
* Fix `EntityDeserializer` improperly setting entity lifestages when loading a post-mapinit map.
* Fix `EntityManager.PredictedDeleteEntity()` not deleting pure client-side entities.
* Fix grid fixtures using a locale dependent id. This could case some clients to crash/freeze when connected to a server with a different locale.
### Other

View File

@@ -1,11 +1,11 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Numerics;
using Robust.Shared.Collections;
using Robust.Shared.Configuration;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Map.Events;
@@ -16,7 +16,6 @@ using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Dynamics;
using Robust.Shared.Physics.Systems;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
namespace Robust.Shared.GameObjects
{
@@ -150,7 +149,8 @@ namespace Robust.Shared.GameObjects
};
#pragma warning restore CS0618
newFixtures.Add(($"grid_chunk-{bounds.Left}-{bounds.Bottom}", newFixture));
var key = string.Create(CultureInfo.InvariantCulture, $"grid_chunk-{bounds.Left}-{bounds.Bottom}");
newFixtures.Add((key, newFixture));
}
// Check if we even need to issue an eventbus event