From 6e91190478ec03e038ff1c3a10ecd632808f281e Mon Sep 17 00:00:00 2001 From: Krunklehorn <42424291+Krunklehorn@users.noreply.github.com> Date: Wed, 7 Feb 2024 18:43:44 -0500 Subject: [PATCH] Fixed GluedComponent interactions with metamorphic glasses (#24943) * 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> --- Content.Server/Glue/GlueSystem.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Content.Server/Glue/GlueSystem.cs b/Content.Server/Glue/GlueSystem.cs index 9409a423c4..6bb6aca3ad 100644 --- a/Content.Server/Glue/GlueSystem.cs +++ b/Content.Server/Glue/GlueSystem.cs @@ -77,13 +77,16 @@ public sealed class GlueSystem : SharedGlueSystem { base.Update(frameTime); - var query = EntityQueryEnumerator(); - while (query.MoveNext(out var uid, out var glue, out _)) + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var glue, out var _, out var meta)) { if (_timing.CurTime < glue.Until) 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(uid); RemComp(uid); } -- 2.52.0