From c63788b6869deb0c7e30aabf1ce21050448d2b47 Mon Sep 17 00:00:00 2001
From: RoosterDragon <RoosterDragon@outlook.com>
Date: Sat, 18 Mar 2023 12:51:42 +0000
Subject: [PATCH] Fix RCS1099

---
 .editorconfig                |  3 +++
 OpenRA.Game/Sync.cs          |  2 +-
 OpenRA.Game/Traits/Target.cs | 12 ++++++------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index f3edc3d70b..e03d91d20c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1004,6 +1004,9 @@ dotnet_diagnostic.RCS1084.severity = warning
 # Remove empty region.
 dotnet_diagnostic.RCS1091.severity = warning
 
+# Default label should be the last label in a switch section.
+dotnet_diagnostic.RCS1099.severity = warning
+
 # Unnecessary interpolation.
 dotnet_diagnostic.RCS1105.severity = warning
 
diff --git a/OpenRA.Game/Sync.cs b/OpenRA.Game/Sync.cs
index b93166fa49..ae8db21c1e 100644
--- a/OpenRA.Game/Sync.cs
+++ b/OpenRA.Game/Sync.cs
@@ -151,8 +151,8 @@ namespace OpenRA
 				case TargetType.Terrain:
 					return HashUsingHashCode(t.CenterPosition);
 
-				default:
 				case TargetType.Invalid:
+				default:
 					return 0;
 			}
 		}
diff --git a/OpenRA.Game/Traits/Target.cs b/OpenRA.Game/Traits/Target.cs
index 74741b0677..c021bcf1e5 100644
--- a/OpenRA.Game/Traits/Target.cs
+++ b/OpenRA.Game/Traits/Target.cs
@@ -120,8 +120,8 @@ namespace OpenRA.Traits
 					return FrozenActor.IsValid && FrozenActor.Visible && !FrozenActor.Hidden;
 				case TargetType.Invalid:
 					return false;
-				default:
 				case TargetType.Terrain:
+				default:
 					return true;
 			}
 		}
@@ -164,8 +164,8 @@ namespace OpenRA.Traits
 						return FrozenActor.CenterPosition;
 					case TargetType.Terrain:
 						return terrainCenterPosition;
-					default:
 					case TargetType.Invalid:
+					default:
 						throw new InvalidOperationException("Attempting to query the position of an invalid Target");
 				}
 			}
@@ -186,8 +186,8 @@ namespace OpenRA.Traits
 						return FrozenActor.TargetablePositions ?? NoPositions;
 					case TargetType.Terrain:
 						return terrainPositions;
-					default:
 					case TargetType.Invalid:
+					default:
 						return NoPositions;
 				}
 			}
@@ -215,8 +215,8 @@ namespace OpenRA.Traits
 				case TargetType.Terrain:
 					return terrainCenterPosition.ToString();
 
-				default:
 				case TargetType.Invalid:
+				default:
 					return "Invalid";
 			}
 		}
@@ -239,8 +239,8 @@ namespace OpenRA.Traits
 				case TargetType.FrozenActor:
 					return me.FrozenActor == other.FrozenActor;
 
-				default:
 				case TargetType.Invalid:
+				default:
 					return false;
 			}
 		}
@@ -270,8 +270,8 @@ namespace OpenRA.Traits
 				case TargetType.FrozenActor:
 					return FrozenActor.GetHashCode();
 
-				default:
 				case TargetType.Invalid:
+				default:
 					return 0;
 			}
 		}