Unstable 1.2.1.0

This commit is contained in:
Markus Isberg
2023-11-10 17:45:19 +02:00
parent 2ea58c58a7
commit 8a2e2ea0ae
268 changed files with 4076 additions and 1843 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));
});
@@ -304,7 +304,8 @@ namespace Barotrauma.Items.Components
private void ThrowError(string message, Client c)
{
DebugConsole.ThrowError(message);
DebugConsole.ThrowError(message,
contentPackage: item.Prefab.ContentPackage);
SendToClient(CircuitBoxOpcode.Error, new CircuitBoxErrorEvent(message), c);
}