]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Freeze eventbus dictionaries (#22628)
authorLeon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Sat, 6 Jan 2024 09:24:42 +0000 (04:24 -0500)
committerGitHub <noreply@github.com>
Sat, 6 Jan 2024 09:24:42 +0000 (20:24 +1100)
* Freeze event bus

* Cleanup

Content.Benchmarks/EntityManagerGetAllComponents.cs
Content.Server/Afk/AfkManager.cs
Content.Server/Entry/EntryPoint.cs
Content.Server/Holiday/HolidaySystem.cs

index 14edf54643ef14ddc6c427850cb3feb5c540395e..0b9683a4abb6ce787decc230f55f8e16c67481e3 100644 (file)
@@ -48,6 +48,7 @@ namespace Content.Benchmarks
             var componentFactory = new Mock<IComponentFactory>();
             componentFactory.Setup(p => p.GetComponent<DummyComponent>()).Returns(new DummyComponent());
             componentFactory.Setup(p => p.GetRegistration(It.IsAny<DummyComponent>())).Returns(dummyReg);
+            componentFactory.Setup(p => p.GetAllRegistrations()).Returns(new[] { dummyReg });
             componentFactory.Setup(p => p.GetAllRefTypes()).Returns(new[] { CompIdx.Index<DummyComponent>() });
 
             IoCManager.RegisterInstance<IComponentFactory>(componentFactory.Object);
index 1f22f2046eb707ca5d3cba2d228bb0cb8bc18ab5..8f7090431710fb5e72afe99ddf06c1b171fd2060 100644 (file)
@@ -4,7 +4,6 @@ using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
-using Robust.Shared.Input;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
@@ -35,7 +34,6 @@ namespace Content.Server.Afk
     [UsedImplicitly]
     public sealed class AfkManager : IAfkManager
     {
-        [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
index d71225116caf189185d7c78aac0180d28de23057..bf7f3ea84abfd9fbccb38db8a0ddf529ce607128 100644 (file)
@@ -64,10 +64,7 @@ namespace Content.Server.Entry
             factory.DoAutoRegistrations();
             factory.IgnoreMissingComponents("Visuals");
 
-            foreach (var ignoreName in IgnoredComponents.List)
-            {
-                factory.RegisterIgnore(ignoreName);
-            }
+            factory.RegisterIgnore(IgnoredComponents.List);
 
             prototypes.RegisterIgnore("parallax");
             prototypes.RegisterIgnore("guideEntry");
index 4224b01491a5f03c404064e55e1bfe6ce7bbb846..865d78c8f1152f0fc832f0b626e33202bcabd12c 100644 (file)
@@ -23,8 +23,7 @@ namespace Content.Server.Holiday
 
         public override void Initialize()
         {
-            _configManager.OnValueChanged(CCVars.HolidaysEnabled, OnHolidaysEnableChange, true);
-
+            _configManager.OnValueChanged(CCVars.HolidaysEnabled, OnHolidaysEnableChange);
             SubscribeLocalEvent<GameRunLevelChangedEvent>(OnRunLevelChanged);
             SubscribeLocalEvent<HolidayVisualsComponent, ComponentInit>(OnVisualsInit);
         }