From c298a8dc8e7afa6454d4d6749c3e91e9913bd6d3 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 27 Sep 2021 14:38:53 +1000 Subject: [PATCH] Move remqueue to engine (#4700) --- Content.Server/Voting/Managers/VoteManager.cs | 1 - Content.Shared/Collections/RemList.cs | 75 ------------------- Content.Shared/Throwing/ThrownItemSystem.cs | 1 - 3 files changed, 77 deletions(-) delete mode 100644 Content.Shared/Collections/RemList.cs diff --git a/Content.Server/Voting/Managers/VoteManager.cs b/Content.Server/Voting/Managers/VoteManager.cs index 0d1ff76f66..659bc41066 100644 --- a/Content.Server/Voting/Managers/VoteManager.cs +++ b/Content.Server/Voting/Managers/VoteManager.cs @@ -9,7 +9,6 @@ using Content.Server.Administration.Managers; using Content.Server.Afk; using Content.Server.Chat.Managers; using Content.Shared.Administration; -using Content.Shared.Collections; using Content.Shared.Voting; using Robust.Server.Player; using Robust.Shared.Configuration; diff --git a/Content.Shared/Collections/RemList.cs b/Content.Shared/Collections/RemList.cs deleted file mode 100644 index 965adb64d6..0000000000 --- a/Content.Shared/Collections/RemList.cs +++ /dev/null @@ -1,75 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; - - -namespace Content.Shared.Collections -{ - // It's a Remie Queue now. - - /// - /// Simple helper struct for "iterate collection and have a queue of things to remove when you're done", - /// to avoid concurrent iteration/modification. - /// - public struct RemQueue - { - public List? List; - - public void Add(T t) - { - List ??= new(); - List.Add(t); - } - - public Enumerator GetEnumerator() - { - return new(List); - } - - public struct Enumerator : IEnumerator - { - private readonly bool _filled; - private List.Enumerator _enumerator; - - public Enumerator(List? list) - { - if (list == null) - { - _filled = false; - _enumerator = default; - } - else - { - _filled = true; - _enumerator = list.GetEnumerator(); - } - } - - public bool MoveNext() - { - if (!_filled) - { - return false; - } - - return _enumerator.MoveNext(); - } - - void IEnumerator.Reset() - { - if (_filled) - { - ((IEnumerator) _enumerator).Reset(); - } - } - - public T Current => _enumerator.Current; - - object? IEnumerator.Current => Current; - - void IDisposable.Dispose() - { - } - } - } -} diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs index 10f5dbf391..509ed1f6af 100644 --- a/Content.Shared/Throwing/ThrownItemSystem.cs +++ b/Content.Shared/Throwing/ThrownItemSystem.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using Content.Shared.CCVar; -using Content.Shared.Collections; using Content.Shared.Hands.Components; using Content.Shared.Physics; using Content.Shared.Physics.Pull;