diff --git a/Subsurface/Source/Characters/AI/EnemyAIController.cs b/Subsurface/Source/Characters/AI/EnemyAIController.cs
index 50796b1f6..25c7d4022 100644
--- a/Subsurface/Source/Characters/AI/EnemyAIController.cs
+++ b/Subsurface/Source/Characters/AI/EnemyAIController.cs
@@ -528,6 +528,8 @@ namespace Barotrauma
 
         public override void ReadNetworkData(NetIncomingMessage message)
         {
+            if (GameMain.Server != null) return;
+
             AiState newState = AiState.None;
             Vector2 newWallAttackPos = Vector2.Zero;
             float wanderAngle;
diff --git a/Subsurface/Source/Items/Components/DockingPort.cs b/Subsurface/Source/Items/Components/DockingPort.cs
index 3dac8197f..f89987ced 100644
--- a/Subsurface/Source/Items/Components/DockingPort.cs
+++ b/Subsurface/Source/Items/Components/DockingPort.cs
@@ -670,6 +670,8 @@ namespace Barotrauma.Items.Components
 
         public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message, float sendingTime)
         {
+            if (GameMain.Server != null) return;
+
             bool isDocked = message.ReadBoolean();
 
             if (isDocked)
diff --git a/Subsurface/Source/Items/Components/Door.cs b/Subsurface/Source/Items/Components/Door.cs
index 50f02411f..3181677b9 100644
--- a/Subsurface/Source/Items/Components/Door.cs
+++ b/Subsurface/Source/Items/Components/Door.cs
@@ -487,9 +487,9 @@ namespace Barotrauma.Items.Components
         public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message, float sendingTime)
         {
             if (sendingTime < lastReceivedMessage) return;
-            if (GameMain.Server != null)
-            {
-                return;
+            if (GameMain.Server != null)
+            {
+                return;
             }
 
             lastReceivedMessage = sendingTime;
diff --git a/Subsurface/Source/Networking/GameClient.cs b/Subsurface/Source/Networking/GameClient.cs
index 673e42fbd..c09e60810 100644
--- a/Subsurface/Source/Networking/GameClient.cs
+++ b/Subsurface/Source/Networking/GameClient.cs
@@ -337,8 +337,8 @@ namespace Barotrauma.Networking
 
                                 var outmsg = client.CreateMessage();
 
-                                string saltedPw = password;
-                                saltedPw = saltedPw + Convert.ToString(nonce);
+                                string saltedPw = password;
+                                saltedPw = saltedPw + Convert.ToString(nonce);
                                 saltedPw = Encoding.UTF8.GetString(NetUtility.ComputeSHAHash(Encoding.UTF8.GetBytes(saltedPw)));
                                 NetEncryption algo = new NetXtea(client, saltedPw);
                                 outmsg.Write((byte)PacketTypes.Login);
@@ -832,7 +832,7 @@ namespace Barotrauma.Networking
         }
 
         public bool HasPermission(ClientPermissions permission)
-        {
+        {
             return false;// permissions.HasFlag(permission);
         }