Hotfix 1.10.7.1
This commit is contained in:
+7
-1
@@ -1319,7 +1319,13 @@ namespace Barotrauma
|
|||||||
const float MinSimilarityPercentage = 0.8f;
|
const float MinSimilarityPercentage = 0.8f;
|
||||||
|
|
||||||
if (string.IsNullOrWhiteSpace(serverInfo.ServerName)) { return; }
|
if (string.IsNullOrWhiteSpace(serverInfo.ServerName)) { return; }
|
||||||
if (serverInfo.PlayerCount > serverInfo.MaxPlayers) { return; }
|
|
||||||
|
if (serverInfo.ServerName.Length > NetConfig.ServerNameMaxLength) { return; }
|
||||||
|
/*no newline symbols in server names!*/
|
||||||
|
if (serverInfo.ServerName.Contains('\n') || serverInfo.ServerName.Contains('\r')) { return; }
|
||||||
|
if (serverInfo.ServerMessage.Length > NetConfig.ServerMessageMaxLength) { return; }
|
||||||
|
//+1 because it seems the count can sometimes be slightly off (something to do with steam lobbies not immediately refreshing?)
|
||||||
|
if (serverInfo.PlayerCount > serverInfo.MaxPlayers + 1) { return; }
|
||||||
if (serverInfo.PlayerCount < 0) { return; }
|
if (serverInfo.PlayerCount < 0) { return; }
|
||||||
if (serverInfo.MaxPlayers <= 0) { return; }
|
if (serverInfo.MaxPlayers <= 0) { return; }
|
||||||
//no way a legit server can have this many players
|
//no way a legit server can have this many players
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<RootNamespace>Barotrauma</RootNamespace>
|
<RootNamespace>Barotrauma</RootNamespace>
|
||||||
<Authors>FakeFish, Undertow Games</Authors>
|
<Authors>FakeFish, Undertow Games</Authors>
|
||||||
<Product>Barotrauma</Product>
|
<Product>Barotrauma</Product>
|
||||||
<Version>1.10.7.0</Version>
|
<Version>1.10.7.1</Version>
|
||||||
<Copyright>Copyright © FakeFish 2018-2024</Copyright>
|
<Copyright>Copyright © FakeFish 2018-2024</Copyright>
|
||||||
<Platforms>AnyCPU;x64</Platforms>
|
<Platforms>AnyCPU;x64</Platforms>
|
||||||
<AssemblyName>Barotrauma</AssemblyName>
|
<AssemblyName>Barotrauma</AssemblyName>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<RootNamespace>Barotrauma</RootNamespace>
|
<RootNamespace>Barotrauma</RootNamespace>
|
||||||
<Authors>FakeFish, Undertow Games</Authors>
|
<Authors>FakeFish, Undertow Games</Authors>
|
||||||
<Product>Barotrauma</Product>
|
<Product>Barotrauma</Product>
|
||||||
<Version>1.10.7.0</Version>
|
<Version>1.10.7.1</Version>
|
||||||
<Copyright>Copyright © FakeFish 2018-2024</Copyright>
|
<Copyright>Copyright © FakeFish 2018-2024</Copyright>
|
||||||
<Platforms>AnyCPU;x64</Platforms>
|
<Platforms>AnyCPU;x64</Platforms>
|
||||||
<AssemblyName>Barotrauma</AssemblyName>
|
<AssemblyName>Barotrauma</AssemblyName>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<RootNamespace>Barotrauma</RootNamespace>
|
<RootNamespace>Barotrauma</RootNamespace>
|
||||||
<Authors>FakeFish, Undertow Games</Authors>
|
<Authors>FakeFish, Undertow Games</Authors>
|
||||||
<Product>Barotrauma</Product>
|
<Product>Barotrauma</Product>
|
||||||
<Version>1.10.7.0</Version>
|
<Version>1.10.7.1</Version>
|
||||||
<Copyright>Copyright © FakeFish 2018-2024</Copyright>
|
<Copyright>Copyright © FakeFish 2018-2024</Copyright>
|
||||||
<Platforms>AnyCPU;x64</Platforms>
|
<Platforms>AnyCPU;x64</Platforms>
|
||||||
<AssemblyName>Barotrauma</AssemblyName>
|
<AssemblyName>Barotrauma</AssemblyName>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<RootNamespace>Barotrauma</RootNamespace>
|
<RootNamespace>Barotrauma</RootNamespace>
|
||||||
<Authors>FakeFish, Undertow Games</Authors>
|
<Authors>FakeFish, Undertow Games</Authors>
|
||||||
<Product>Barotrauma Dedicated Server</Product>
|
<Product>Barotrauma Dedicated Server</Product>
|
||||||
<Version>1.10.7.0</Version>
|
<Version>1.10.7.1</Version>
|
||||||
<Copyright>Copyright © FakeFish 2018-2023</Copyright>
|
<Copyright>Copyright © FakeFish 2018-2023</Copyright>
|
||||||
<Platforms>AnyCPU;x64</Platforms>
|
<Platforms>AnyCPU;x64</Platforms>
|
||||||
<AssemblyName>DedicatedServer</AssemblyName>
|
<AssemblyName>DedicatedServer</AssemblyName>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<RootNamespace>Barotrauma</RootNamespace>
|
<RootNamespace>Barotrauma</RootNamespace>
|
||||||
<Authors>FakeFish, Undertow Games</Authors>
|
<Authors>FakeFish, Undertow Games</Authors>
|
||||||
<Product>Barotrauma Dedicated Server</Product>
|
<Product>Barotrauma Dedicated Server</Product>
|
||||||
<Version>1.10.7.0</Version>
|
<Version>1.10.7.1</Version>
|
||||||
<Copyright>Copyright © FakeFish 2018-2023</Copyright>
|
<Copyright>Copyright © FakeFish 2018-2023</Copyright>
|
||||||
<Platforms>AnyCPU;x64</Platforms>
|
<Platforms>AnyCPU;x64</Platforms>
|
||||||
<AssemblyName>DedicatedServer</AssemblyName>
|
<AssemblyName>DedicatedServer</AssemblyName>
|
||||||
|
|||||||
+17
-8
@@ -1293,9 +1293,9 @@ namespace Barotrauma
|
|||||||
CharacterInfo firedCharacter = null;
|
CharacterInfo firedCharacter = null;
|
||||||
(ushort id, string newName) appliedRename = (Entity.NullEntityID, string.Empty);
|
(ushort id, string newName) appliedRename = (Entity.NullEntityID, string.Empty);
|
||||||
|
|
||||||
if (location != null && HasCampaignInteractionAvailable(sender, InteractionType.Crew))
|
if (location != null)
|
||||||
{
|
{
|
||||||
if (fireCharacter && AllowedToManageCampaign(sender, ClientPermissions.ManageHires))
|
if (fireCharacter && AllowedToManageCampaign(sender, ClientPermissions.ManageHires) && HasCampaignInteractionAvailable(sender, InteractionType.Crew))
|
||||||
{
|
{
|
||||||
firedCharacter = CrewManager.GetCharacterInfos(includeReserveBench: true).FirstOrDefault(info => info.ID == firedIdentifier);
|
firedCharacter = CrewManager.GetCharacterInfos(includeReserveBench: true).FirstOrDefault(info => info.ID == firedIdentifier);
|
||||||
if (firedCharacter != null && (firedCharacter.Character?.IsBot ?? true))
|
if (firedCharacter != null && (firedCharacter.Character?.IsBot ?? true))
|
||||||
@@ -1307,6 +1307,10 @@ namespace Barotrauma
|
|||||||
DebugConsole.ThrowError($"Tried to fire an invalid character ({firedIdentifier})");
|
DebugConsole.ThrowError($"Tried to fire an invalid character ({firedIdentifier})");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
GameServer.Log($"{sender.Name} attempted to fire a character without having access to an appropriate NPC.", ServerLog.MessageType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
if (renameCharacter)
|
if (renameCharacter)
|
||||||
{
|
{
|
||||||
@@ -1321,8 +1325,13 @@ namespace Barotrauma
|
|||||||
{
|
{
|
||||||
characterInfo = location.HireManager.AvailableCharacters.FirstOrDefault(info => info.ID == renamedIdentifier);
|
characterInfo = location.HireManager.AvailableCharacters.FirstOrDefault(info => info.ID == renamedIdentifier);
|
||||||
}
|
}
|
||||||
|
if (characterInfo != null && characterInfo != sender.CharacterInfo && !HasCampaignInteractionAvailable(sender, InteractionType.Crew))
|
||||||
|
{
|
||||||
|
GameServer.Log($"{sender.Name} attempted to rename a character without having access to an appropriate NPC.", ServerLog.MessageType.Error);
|
||||||
|
characterInfo = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (characterInfo == null && renamedIdentifier == sender.CharacterInfo?.ID)
|
else if (characterInfo == null && renamedIdentifier == sender.CharacterInfo?.ID)
|
||||||
{
|
{
|
||||||
characterInfo = sender.CharacterInfo;
|
characterInfo = sender.CharacterInfo;
|
||||||
}
|
}
|
||||||
@@ -1353,7 +1362,7 @@ namespace Barotrauma
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (location.HireManager != null)
|
if (location.HireManager != null && HasCampaignInteractionAvailable(sender, InteractionType.Crew))
|
||||||
{
|
{
|
||||||
if (validateHires)
|
if (validateHires)
|
||||||
{
|
{
|
||||||
@@ -1396,10 +1405,10 @@ namespace Barotrauma
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
else
|
||||||
else
|
{
|
||||||
{
|
GameServer.Log($"{sender.Name} attempted to hire characters without having access to an appropriate NPC.", ServerLog.MessageType.Error);
|
||||||
GameServer.Log($"{sender.Name} attempted to manage hires without having access to an appropriate NPC.", ServerLog.MessageType.Error);
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// bounce back
|
// bounce back
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<RootNamespace>Barotrauma</RootNamespace>
|
<RootNamespace>Barotrauma</RootNamespace>
|
||||||
<Authors>FakeFish, Undertow Games</Authors>
|
<Authors>FakeFish, Undertow Games</Authors>
|
||||||
<Product>Barotrauma Dedicated Server</Product>
|
<Product>Barotrauma Dedicated Server</Product>
|
||||||
<Version>1.10.7.0</Version>
|
<Version>1.10.7.1</Version>
|
||||||
<Copyright>Copyright © FakeFish 2018-2023</Copyright>
|
<Copyright>Copyright © FakeFish 2018-2023</Copyright>
|
||||||
<Platforms>AnyCPU;x64</Platforms>
|
<Platforms>AnyCPU;x64</Platforms>
|
||||||
<AssemblyName>DedicatedServer</AssemblyName>
|
<AssemblyName>DedicatedServer</AssemblyName>
|
||||||
|
|||||||
@@ -1,4 +1,11 @@
|
|||||||
-------------------------------------------------------------------------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
v1.10.7.1
|
||||||
|
-------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
- Additional fixes to multiplayer exploits.
|
||||||
|
- Fixed inability to rename a bot you've taken over in permadeath mode.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
v1.10.7.0
|
v1.10.7.0
|
||||||
-------------------------------------------------------------------------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user