Merge pull request #1398 from Happyrobot33/rollback-broken-guns

Rollback

Author: Happyrobot33

.github/labeler.yml

@@ -24,7 +24,3 @@
 - changed-files:
   # Equiv to any-glob-to-all as long as this has one matcher. If ALL changed files are not C# files, then apply label.
   - all-globs-to-all-files: "!**/*.cs"
-
-"Changes: C#":
-- changed-files:
-  - any-glob-to-any-file: '**/*.cs'

.github/workflows/auto-assign.yml

@@ -19,10 +19,9 @@ jobs:
               "Changes: Sprites": ["BORTBORTBORTBORTBORT"],
               "Changes: Map": ["PubliclyExecutedPig"],
               "Changes: UI": ["ss14-Starlight"],
-              "Changes: Shaders": ["ss14-Starlight, Happyrobot33, FoxxoTrystan"],
-              "Changes: Audio": ["ss14-Starlight, Happyrobot33, FoxxoTrystan"],
-              "Changes: No C#": ["ss14-Starlight, Happyrobot33, FoxxoTrystan"],
-              "Changes: C#": ["ss14-Starlight, Happyrobot33, FoxxoTrystan"],
+              "Changes: Shaders": ["ss14-Starlight"],
+              "Changes: Audio": ["ss14-Starlight"],
+              "Changes: No C#": ["ss14-Starlight"],
             };
 
             const labels = context.payload.pull_request.labels.map(label => label.name);

.github/workflows/publish.yml

@@ -51,7 +51,7 @@ jobs:
 
   update-changelog:
     name: Publish Changelogs
-#    needs: build
+    needs: build
     runs-on: ubuntu-latest
     environment: prod
     steps:

.github/workflows/target-branch-validation.yml

@@ -334,12 +334,7 @@ private void OnWorldTargetAttempt(Entity<WorldTargetActionComponent> ent, ref Ac
 
         private void OnEntityTargetAttempt(Entity<EntityTargetActionComponent> ent, ref ActionTargetAttemptEvent args)
         {
-            if (args.Handled)
-                return;
-
-            args.Handled = true;
-
-            if (args.Input.EntityUid is not { Valid: true } entity)
+            if (args.Handled || args.Input.EntityUid is not { Valid: true } entity)
                 return;
 
             // let world target component handle it
@@ -350,6 +345,8 @@ private void OnEntityTargetAttempt(Entity<EntityTargetActionComponent> ent, ref
                 return;
             }
 
+            args.Handled = true;
+
             var action = args.Action;
             var user = args.User;