Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2023-10-30 12:40:09 -03:00
parent 17b304a349 a8f9c97dda
commit 759f66cf9f
39 changed files with 518 additions and 257 deletions
@@ -1,11 +1,11 @@
 #nullable enable

+using Barotrauma.Networking;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using Barotrauma.Networking;
-using Microsoft.Xna.Framework;

 namespace Barotrauma.Items.Components
 {
@@ -138,7 +138,7 @@ namespace Barotrauma.Items.Components
                        return;
                    }

-                    bool result = AddComponentInternal(id, prefab, resource.Prefab, data.Position,  it =>
+                    bool result = AddComponentInternal(id, prefab, resource.Prefab, data.Position, c.Character, it =>
                    {
                        CreateServerEvent(new CircuitBoxServerCreateComponentEvent(it.ID, resource.Prefab.UintIdentifier, id, data.Position));
                    });