Merge branch '20-11-27-merge'

2020-11-27 00:54:29 +01:00
parent 060d4566c4 deafb4c23e
commit 0a488ddc4a
24 changed files with 177 additions and 144 deletions
--- a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
+++ b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
@@ -14,6 +14,7 @@ using Robust.Shared.Interfaces.Map;
 using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
+using Robust.Shared.Reflection;
 using Robust.Shared.Timing;

 namespace Content.IntegrationTests.Tests.Networking
@@ -425,6 +426,7 @@ namespace Content.IntegrationTests.Tests.Networking
            }
        }

+        [Reflect(false)]
        private sealed class PredictionTestEntitySystem : EntitySystem
        {
            public bool Allow { get; set; } = true;