diff --git a/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs b/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs index 5002dfc89..63dfb2859 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs @@ -1254,10 +1254,7 @@ namespace Barotrauma.Networking if (bannedClient != null) { Log("Client \"" + ClientLogName(sender) + "\" banned \"" + ClientLogName(bannedClient) + "\".", ServerLog.MessageType.ServerMessage); - if (durationSeconds > 0) - { - BanClient(bannedClient, string.IsNullOrEmpty(banReason) ? $"ServerMessage.BannedBy~[initiator]={sender.Name}" : banReason, range, banDuration); - } + BanClient(bannedClient, string.IsNullOrEmpty(banReason) ? $"ServerMessage.BannedBy~[initiator]={sender.Name}" : banReason, range, banDuration); } else { diff --git a/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/BeaconMission.cs b/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/BeaconMission.cs index ebe2d27c0..c337b56a6 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/BeaconMission.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/BeaconMission.cs @@ -46,7 +46,11 @@ namespace Barotrauma { get { - yield return level.BeaconStation.WorldPosition; + if (level.BeaconStation == null) + { + yield break; + } + yield return level.BeaconStation.WorldPosition; } } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Turret.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Turret.cs index 8566b7331..e80bd9c66 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Turret.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Turret.cs @@ -812,10 +812,12 @@ namespace Barotrauma.Items.Components if (e is Item projectileContainer) { var container = projectileContainer.GetComponent(); - maxProjectileCount += container.Capacity; - - int projectiles = projectileContainer.ContainedItems.Count(it => it.Condition > 0.0f); - usableProjectileCount += projectiles; + if (container != null) + { + maxProjectileCount += container.Capacity; + int projectiles = projectileContainer.ContainedItems.Count(it => it.Condition > 0.0f); + usableProjectileCount += projectiles; + } } } diff --git a/Barotrauma/BarotraumaShared/changelog.txt b/Barotrauma/BarotraumaShared/changelog.txt index ef885bf34..0c799d62e 100644 --- a/Barotrauma/BarotraumaShared/changelog.txt +++ b/Barotrauma/BarotraumaShared/changelog.txt @@ -1,3 +1,12 @@ +--------------------------------------------------------------------------------------------------------- +v0.12.0.3 +--------------------------------------------------------------------------------------------------------- + +- Fixed inability to permanently ban players who are currently in the server. +- Fixed scrap items failing to load in saves done prior to v0.12. +- Fixed bandage/plastiseal crafting exploit. +- Fixed crashing if a bot tries to operate a turret that's linked to some other item than a loader. + --------------------------------------------------------------------------------------------------------- v0.12.0.2 ---------------------------------------------------------------------------------------------------------