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

Fixed GluedComponent interactions with metamorphic glasses (#24943)

Browse Source 
* Only rename if name matches reconstructed

* Rearranged query

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Okay

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Krunklehorn
2024-02-07 18:43:44 -05:00
committed by GitHub
parent d4434dbb5e
commit 6e91190478
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Glue/GlueSystem.cs
View File

@@ -77,13 +77,16 @@ public sealed class GlueSystem : SharedGlueSystem
{ {
base.Update(frameTime); base.Update(frameTime);
var query = EntityQueryEnumerator<GluedComponent, UnremoveableComponent>(); var query = EntityQueryEnumerator<GluedComponent, UnremoveableComponent, MetaDataComponent>();
while (query.MoveNext(out var uid, out var glue, out _)) while (query.MoveNext(out var uid, out var glue, out var _, out var meta))
{ {
if (_timing.CurTime < glue.Until) if (_timing.CurTime < glue.Until)
continue; continue;
_metaData.SetEntityName(uid, glue.BeforeGluedEntityName); // Instead of string matching, just reconstruct the expected name and compare
if (meta.EntityName == Loc.GetString("glued-name-prefix", ("target", glue.BeforeGluedEntityName)))
_metaData.SetEntityName(uid, glue.BeforeGluedEntityName);
RemComp<UnremoveableComponent>(uid); RemComp<UnremoveableComponent>(uid);
RemComp<GluedComponent>(uid); RemComp<GluedComponent>(uid);
} }