tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix auto-emote bug (#14883)

Browse Source
This commit is contained in:
Leon Friedrich
2023-03-27 13:47:46 +13:00
committed by GitHub
parent ef29436347
commit 87185d019c
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Chat/Systems/AutoEmoteSystem.cs
View File

@@ -83,6 +83,8 @@ public sealed class AutoEmoteSystem : EntitySystem
if (!Resolve(uid, ref autoEmote, logMissing: false))
return false;
DebugTools.Assert(autoEmote.LifeStage <= ComponentLifeStage.Running);
if (autoEmote.Emotes.Contains(autoEmotePrototypeId))
return false;
@@ -93,9 +95,9 @@ public sealed class AutoEmoteSystem : EntitySystem
}
/// <summary>
/// Stop preforming an emote.
/// Stop preforming an emote. Note that by default this will queue empty components for removal.
/// </summary>
public bool RemoveEmote(EntityUid uid, string autoEmotePrototypeId, AutoEmoteComponent? autoEmote = null)
public bool RemoveEmote(EntityUid uid, string autoEmotePrototypeId, AutoEmoteComponent? autoEmote = null, bool removeEmpty = true)
{
if (!Resolve(uid, ref autoEmote, logMissing: false))
return false;
@@ -105,7 +107,13 @@ public sealed class AutoEmoteSystem : EntitySystem
if (!autoEmote.EmoteTimers.Remove(autoEmotePrototypeId))
return false;
autoEmote.NextEmoteTime = autoEmote.EmoteTimers.Values.Min();
if (autoEmote.EmoteTimers.Count > 0)
autoEmote.NextEmoteTime = autoEmote.EmoteTimers.Values.Min();
else if (removeEmpty)
RemCompDeferred(uid, autoEmote);
else
autoEmote.NextEmoteTime = TimeSpan.MaxValue;
return true;
}