Fix multiple research consoles exploit

space-wizards · Jan 9, 2025 · ab58ea6 · ab58ea6
1 parent 66810ef
commit ab58ea6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/Content.Server/Research/Systems/ResearchSystem.Console.cs b/Content.Server/Research/Systems/ResearchSystem.Console.cs
@@ -97,6 +97,7 @@ private void OnConsoleRegistrationChanged(EntityUid uid, ResearchConsoleComponen
 
     private void OnConsoleDatabaseModified(EntityUid uid, ResearchConsoleComponent component, ref TechnologyDatabaseModifiedEvent args)
     {
+        SyncClientWithServer(uid, raiseEvents: false);
         UpdateConsoleInterface(uid, component);
     }
 

diff --git a/Content.Server/Research/Systems/ResearchSystem.Technology.cs b/Content.Server/Research/Systems/ResearchSystem.Technology.cs
@@ -10,7 +10,7 @@ public sealed partial class ResearchSystem
     /// <summary>
     /// Syncs the primary entity's database to that of the secondary entity's database.
     /// </summary>
-    public void Sync(EntityUid primaryUid, EntityUid otherUid, TechnologyDatabaseComponent? primaryDb = null, TechnologyDatabaseComponent? otherDb = null)
+    public void Sync(EntityUid primaryUid, EntityUid otherUid, TechnologyDatabaseComponent? primaryDb = null, TechnologyDatabaseComponent? otherDb = null, bool raiseEvents = true)
     {
         if (!Resolve(primaryUid, ref primaryDb) || !Resolve(otherUid, ref otherDb))
             return;
@@ -23,8 +23,11 @@ public void Sync(EntityUid primaryUid, EntityUid otherUid, TechnologyDatabaseCom
 
         Dirty(primaryUid, primaryDb);
 
-        var ev = new TechnologyDatabaseModifiedEvent();
-        RaiseLocalEvent(primaryUid, ref ev);
+        if (raiseEvents)
+        {
+            var ev = new TechnologyDatabaseModifiedEvent();
+            RaiseLocalEvent(primaryUid, ref ev);
+        }
     }
 
     /// <summary>
@@ -33,15 +36,15 @@ public void Sync(EntityUid primaryUid, EntityUid otherUid, TechnologyDatabaseCom
     ///     syncs against the research server, and the server against the local database.
     /// </summary>
     /// <returns>Whether it could sync or not</returns>
-    public void SyncClientWithServer(EntityUid uid, TechnologyDatabaseComponent? databaseComponent = null, ResearchClientComponent? clientComponent = null)
+    public void SyncClientWithServer(EntityUid uid, TechnologyDatabaseComponent? databaseComponent = null, ResearchClientComponent? clientComponent = null, bool raiseEvents = true)
     {
         if (!Resolve(uid, ref databaseComponent, ref clientComponent, false))
             return;
 
         if (!TryComp<TechnologyDatabaseComponent>(clientComponent.Server, out var serverDatabase))
             return;
 
-        Sync(uid, clientComponent.Server.Value, databaseComponent, serverDatabase);
+        Sync(uid, clientComponent.Server.Value, databaseComponent, serverDatabase, raiseEvents);
     }
 
     /// <summary>

diff --git a/Content.Shared/Research/Systems/SharedResearchSystem.cs b/Content.Shared/Research/Systems/SharedResearchSystem.cs
@@ -227,6 +227,9 @@ public void TrySetMainDiscipline(TechnologyPrototype prototype, EntityUid uid, T
             return;
         component.MainDiscipline = prototype.Discipline;
         Dirty(uid, component);
+
+        var ev = new TechnologyDatabaseModifiedEvent();
+        RaiseLocalEvent(uid, ref ev);
     }
 
     /// <summary>
-Original file line number
+Diff line change
@@ Expand Up @@
         private void OnConsoleDatabaseModified(EntityUid uid, ResearchConsoleComponent component, ref TechnologyDatabaseModifiedEvent args)
         {
+            SyncClientWithServer(uid, raiseEvents: false);
             UpdateConsoleInterface(uid, component);
         }
@@ Expand Down @@