From 24f63c78cb2d8f4599f8213b0da905455eff9160 Mon Sep 17 00:00:00 2001
From: Evil Factory <36804725+evilfactory@users.noreply.github.com>
Date: Wed, 15 Dec 2021 15:35:10 -0300
Subject: [PATCH] fix errors
---
Barotrauma/BarotraumaClient/LinuxClient.csproj | 2 +-
Barotrauma/BarotraumaClient/MacClient.csproj | 2 +-
Barotrauma/BarotraumaClient/WindowsClient.csproj | 2 +-
Barotrauma/BarotraumaServer/LinuxServer.csproj | 2 ++
Barotrauma/BarotraumaServer/MacServer.csproj | 2 ++
.../ServerSource/Networking/GameServer.cs | 6 +++---
Barotrauma/BarotraumaServer/WindowsServer.csproj | 8 ++++++++
.../SharedSource/Items/Components/ItemComponent.cs | 2 +-
8 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/Barotrauma/BarotraumaClient/LinuxClient.csproj b/Barotrauma/BarotraumaClient/LinuxClient.csproj
index e765c91b8..2627dc964 100644
--- a/Barotrauma/BarotraumaClient/LinuxClient.csproj
+++ b/Barotrauma/BarotraumaClient/LinuxClient.csproj
@@ -120,7 +120,7 @@
-
+
diff --git a/Barotrauma/BarotraumaClient/MacClient.csproj b/Barotrauma/BarotraumaClient/MacClient.csproj
index d69b669ed..83cf0dbf7 100644
--- a/Barotrauma/BarotraumaClient/MacClient.csproj
+++ b/Barotrauma/BarotraumaClient/MacClient.csproj
@@ -121,7 +121,7 @@
-
+
diff --git a/Barotrauma/BarotraumaClient/WindowsClient.csproj b/Barotrauma/BarotraumaClient/WindowsClient.csproj
index 52d7a6d1e..14c32c1cf 100644
--- a/Barotrauma/BarotraumaClient/WindowsClient.csproj
+++ b/Barotrauma/BarotraumaClient/WindowsClient.csproj
@@ -124,7 +124,7 @@
-
+
diff --git a/Barotrauma/BarotraumaServer/LinuxServer.csproj b/Barotrauma/BarotraumaServer/LinuxServer.csproj
index c891813ed..ee64876dd 100644
--- a/Barotrauma/BarotraumaServer/LinuxServer.csproj
+++ b/Barotrauma/BarotraumaServer/LinuxServer.csproj
@@ -74,6 +74,8 @@
+
+
diff --git a/Barotrauma/BarotraumaServer/MacServer.csproj b/Barotrauma/BarotraumaServer/MacServer.csproj
index 64cd14bfc..fb072d14e 100644
--- a/Barotrauma/BarotraumaServer/MacServer.csproj
+++ b/Barotrauma/BarotraumaServer/MacServer.csproj
@@ -81,6 +81,8 @@
+
+
diff --git a/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs b/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs
index daf732cf4..38e001a02 100644
--- a/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs
+++ b/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs
@@ -2395,10 +2395,10 @@ namespace Barotrauma.Networking
spawnedCharacter.GiveIdCardTags(mainSubWaypoints[i]);
// talents are only avilable for players in online sessions, but modders or someone else might want to have them loaded anyway
spawnedCharacter.LoadTalents();
- }
- spawnedCharacter.OwnerClientEndPoint = teamClients[i].Connection.EndPointString;
- spawnedCharacter.OwnerClientName = teamClients[i].Name;
+ spawnedCharacter.OwnerClientEndPoint = teamClients[i].Connection.EndPointString;
+ spawnedCharacter.OwnerClientName = teamClients[i].Name;
+ }
}
for (int i = teamClients.Count; i < teamClients.Count + bots.Count; i++)
diff --git a/Barotrauma/BarotraumaServer/WindowsServer.csproj b/Barotrauma/BarotraumaServer/WindowsServer.csproj
index 0d6117ecf..e920b2466 100644
--- a/Barotrauma/BarotraumaServer/WindowsServer.csproj
+++ b/Barotrauma/BarotraumaServer/WindowsServer.csproj
@@ -82,8 +82,16 @@
+
+
+
+
+
+ ..\..\Libraries\0Harmony.dll
+
+
diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs
index 85f129123..e140b3cd5 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs
@@ -820,7 +820,7 @@ namespace Barotrauma.Items.Components
HintManager.OnStatusEffectApplied(this, type, character);
#endif
}
-
+ [MoonSharpHidden]
public virtual void Load(XElement componentElement, bool usePrefabValues, IdRemap idRemap)
{
if (componentElement != null)