fix: return & continue on separate line (#1504)

* fix: return & continue on separate line * Update Assets/Mirror/Runtime/Transport/Telepathy/Server.cs
MirageNet · Feb 17, 2020 · 61fdd89 · 61fdd89
1 parent c70a43b
commit 61fdd89
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 23 deletions.
diff --git a/Assets/Mirror/Components/NetworkAnimator.cs b/Assets/Mirror/Components/NetworkAnimator.cs
@@ -451,7 +451,8 @@ public void ResetTrigger(int hash)
         void CmdOnAnimationServerMessage(int stateHash, float normalizedTime, int layerId, byte[] parameters)
         {
             // Ignore messages from client if not in client authority mode
-            if (!clientAuthority) return;
+            if (!clientAuthority)
+                return;
 
             if (LogFilter.Debug) Debug.Log("OnAnimationMessage for netId=" + netId);
 
@@ -467,7 +468,8 @@ void CmdOnAnimationServerMessage(int stateHash, float normalizedTime, int layerI
         void CmdOnAnimationParametersServerMessage(byte[] parameters)
         {
             // Ignore messages from client if not in client authority mode
-            if (!clientAuthority) return;
+            if (!clientAuthority)
+                return;
 
             // handle and broadcast
             using (PooledNetworkReader networkReader = NetworkReaderPool.GetReader(parameters))
@@ -481,7 +483,8 @@ void CmdOnAnimationParametersServerMessage(byte[] parameters)
         void CmdOnAnimationTriggerServerMessage(int hash)
         {
             // Ignore messages from client if not in client authority mode
-            if (!clientAuthority) return;
+            if (!clientAuthority)
+                return;
 
             // handle and broadcast
             HandleAnimTriggerMsg(hash);
@@ -492,7 +495,8 @@ void CmdOnAnimationTriggerServerMessage(int hash)
         void CmdOnAnimationResetTriggerServerMessage(int hash)
         {
             // Ignore messages from client if not in client authority mode
-            if (!clientAuthority) return;
+            if (!clientAuthority)
+                return;
 
             // handle and broadcast
             HandleAnimResetTriggerMsg(hash);

diff --git a/Assets/Mirror/Components/NetworkRoomManager.cs b/Assets/Mirror/Components/NetworkRoomManager.cs
@@ -172,7 +172,8 @@ void SceneLoadedForPlayer(NetworkConnection conn, GameObject roomPlayer)
         /// </summary>
         public void CheckReadyToBegin()
         {
-            if (SceneManager.GetActiveScene().name != RoomScene) return;
+            if (SceneManager.GetActiveScene().name != RoomScene)
+                return;
 
             if (minPlayers > 0 && NetworkServer.connections.Count(conn => conn.Value != null && conn.Value.identity.gameObject.GetComponent<NetworkRoomPlayer>().readyToBegin) < minPlayers)
             {
@@ -270,7 +271,8 @@ public override void OnServerAddPlayer(NetworkConnection conn)
         {
             if (SceneManager.GetActiveScene().name == RoomScene)
             {
-                if (roomSlots.Count == maxConnections) return;
+                if (roomSlots.Count == maxConnections)
+                    return;
 
                 allPlayersReady = false;
 
@@ -308,7 +310,8 @@ public override void ServerChangeScene(string sceneName)
             {
                 foreach (NetworkRoomPlayer roomPlayer in roomSlots)
                 {
-                    if (roomPlayer == null) continue;
+                    if (roomPlayer == null)
+                        continue;
 
                     // find the game-player object for this connection, and destroy it
                     NetworkIdentity identity = roomPlayer.GetComponent<NetworkIdentity>();

diff --git a/Assets/Mirror/Components/NetworkTransformBase.cs b/Assets/Mirror/Components/NetworkTransformBase.cs
@@ -253,7 +253,8 @@ public override void OnDeserialize(NetworkReader reader, bool initialState)
         void CmdClientToServerSync(byte[] payload)
         {
             // Ignore messages from client if not in client authority mode
-            if (!clientAuthority) return;
+            if (!clientAuthority)
+                return;
 
             // deserialize payload
             using (PooledNetworkReader networkReader = NetworkReaderPool.GetReader(payload))

diff --git a/Assets/Mirror/Editor/Weaver/CompilationFinishedHook.cs b/Assets/Mirror/Editor/Weaver/CompilationFinishedHook.cs
@@ -148,7 +148,8 @@ static void OnCompilationFinished(string assemblyPath, CompilerMessage[] message
             dependencyPaths.Add(Path.GetDirectoryName(assemblyPath));
             foreach (UnityAssembly unityAsm in CompilationPipeline.GetAssemblies())
             {
-                if (unityAsm.outputPath != assemblyPath) continue;
+                if (unityAsm.outputPath != assemblyPath)
+                    continue;
 
                 foreach (string unityAsmRef in unityAsm.compiledAssemblyReferences)
                 {

diff --git a/Assets/Mirror/Examples/AdditiveScenes/Scripts/PlayerController.cs b/Assets/Mirror/Examples/AdditiveScenes/Scripts/PlayerController.cs
@@ -51,7 +51,8 @@ void OnDisable()
 
         void Update()
         {
-            if (!isLocalPlayer) return;
+            if (!isLocalPlayer)
+                return;
 
             horizontal = Input.GetAxis("Horizontal");
             vertical = Input.GetAxis("Vertical");
@@ -80,7 +81,8 @@ void Update()
 
         void FixedUpdate()
         {
-            if (!isLocalPlayer || characterController == null) return;
+            if (!isLocalPlayer || characterController == null)
+                return;
 
             transform.Rotate(0f, turn * Time.fixedDeltaTime, 0f);
 

diff --git a/Assets/Mirror/Examples/Chat/Scripts/ChatWindow.cs b/Assets/Mirror/Examples/Chat/Scripts/ChatWindow.cs
@@ -27,7 +27,8 @@ private void OnPlayerMessage(Player player, string message)
 
         public void OnSend()
         {
-            if (chatMessage.text.Trim() == "") return;
+            if (chatMessage.text.Trim() == "")
+                return;
 
             // get our player
             Player player = NetworkClient.connection.identity.GetComponent<Player>();

diff --git a/Assets/Mirror/Examples/Room/Scripts/PlayerController.cs b/Assets/Mirror/Examples/Room/Scripts/PlayerController.cs
@@ -51,7 +51,8 @@ void OnDisable()
 
         void Update()
         {
-            if (!isLocalPlayer) return;
+            if (!isLocalPlayer)
+                return;
 
             horizontal = Input.GetAxis("Horizontal");
             vertical = Input.GetAxis("Vertical");
@@ -80,7 +81,8 @@ void Update()
 
         void FixedUpdate()
         {
-            if (!isLocalPlayer || characterController == null) return;
+            if (!isLocalPlayer || characterController == null)
+                return;
 
             transform.Rotate(0f, turn * Time.fixedDeltaTime, 0f);
 

diff --git a/Assets/Mirror/Examples/Tanks/Scripts/Tank.cs b/Assets/Mirror/Examples/Tanks/Scripts/Tank.cs
@@ -20,7 +20,8 @@ public class Tank : NetworkBehaviour
         void Update()
         {
             // movement for local player
-            if (!isLocalPlayer) return;
+            if (!isLocalPlayer)
+                return;
 
             // rotate
             float horizontal = Input.GetAxis("Horizontal");

diff --git a/Assets/Mirror/Runtime/NetworkReader.cs b/Assets/Mirror/Runtime/NetworkReader.cs
@@ -340,7 +340,8 @@ public static byte[] ReadBytes(this NetworkReader reader, int count)
         public static NetworkIdentity ReadNetworkIdentity(this NetworkReader reader)
         {
             uint netId = reader.ReadPackedUInt32();
-            if (netId == 0) return null;
+            if (netId == 0)
+                return null;
 
             if (NetworkIdentity.spawned.TryGetValue(netId, out NetworkIdentity identity))
             {

diff --git a/Assets/Mirror/Runtime/Transport/LLAPITransport.cs b/Assets/Mirror/Runtime/Transport/LLAPITransport.cs
@@ -168,7 +168,8 @@ public override bool ClientSend(int channelId, ArraySegment<byte> segment)
 
         public bool ProcessClientMessage()
         {
-            if (clientId == -1) return false;
+            if (clientId == -1)
+                return false;
 
             NetworkEventType networkEvent = NetworkTransport.ReceiveFromHost(clientId, out int connectionId, out int channel, clientReceiveBuffer, clientReceiveBuffer.Length, out int receivedSize, out error);
 
@@ -280,7 +281,8 @@ public override bool ServerSend(List<int> connectionIds, int channelId, ArraySeg
 
         public bool ProcessServerMessage()
         {
-            if (serverHostId == -1) return false;
+            if (serverHostId == -1)
+                return false;
 
             NetworkEventType networkEvent = NetworkTransport.ReceiveFromHost(serverHostId, out int connectionId, out int channel, serverReceiveBuffer, serverReceiveBuffer.Length, out int receivedSize, out error);
 

diff --git a/Assets/Mirror/Runtime/Transport/Telepathy/Client.cs b/Assets/Mirror/Runtime/Transport/Telepathy/Client.cs
@@ -112,7 +112,8 @@ void ReceiveThreadFunction(string ip, int port)
         public void Connect(string ip, int port)
         {
             // not if already started
-            if (Connecting || Connected) return;
+            if (Connecting || Connected)
+                return;
 
             // We are connecting from now until Connect succeeds or fails
             _Connecting = true;

diff --git a/Assets/Mirror/Runtime/Transport/Telepathy/Server.cs b/Assets/Mirror/Runtime/Transport/Telepathy/Server.cs
@@ -180,7 +180,8 @@ void Listen(int port)
         public bool Start(int port)
         {
             // not if already started
-            if (Active) return false;
+            if (Active)
+                return false;
 
             // clear old messages in queue, just to be sure that the caller
             // doesn't receive data from last time and gets out of sync.
@@ -202,7 +203,8 @@ public bool Start(int port)
         public void Stop()
         {
             // only if started
-            if (!Active) return;
+            if (!Active)
+                return;
 
             Logger.Log("Server: stopping...");
 

diff --git a/Assets/Mirror/Runtime/Transport/Websocket/Server.cs b/Assets/Mirror/Runtime/Transport/Websocket/Server.cs
@@ -253,7 +253,8 @@ async Task<ArraySegment<byte>> ReadFrames(int connectionId, WebSocketReceiveResu
         public void Stop()
         {
             // only if started
-            if (!Active) return;
+            if (!Active)
+                return;
 
             Debug.Log("Server: stopping...");
             cancellation.Cancel();

diff --git a/Assets/Mirror/Tests/Editor/WeaverAssembler.cs b/Assets/Mirror/Tests/Editor/WeaverAssembler.cs
@@ -86,7 +86,9 @@ public static void ClearReferences()
         // Delete output dll / pdb / mdb
         public static void DeleteOutput()
         {
-            if (OutputFile.Length < 5) return; // "x.dll" shortest possible dll name
+            // "x.dll" shortest possible dll name
+            if (OutputFile.Length < 5)
+                return;
 
             string projPathFile = OutputDirectory + OutputFile;