Update FactionClothingSystem.cs (new-frontiers-14#1659)

whatston3 · Jul 12, 2024 · 27890bd · 27890bd
1 parent 361c97d
commit 27890bd
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Inventory.Events;
 using Content.Shared.NPC.Components;
 using Content.Shared.NPC.Systems;
+using Robust.Shared.Player; // Frontier - Dont edit AI factions
 
 namespace Content.Shared.Clothing.EntitySystems;
 
@@ -22,6 +23,9 @@ public override void Initialize()
 
     private void OnEquipped(Entity<FactionClothingComponent> ent, ref GotEquippedEvent args)
     {
+        if (!HasComp<ActorComponent>(args.Equipee)) // Frontier - Dont edit AI factions
+            return; // Frontier - Dont edit AI factions
+
         TryComp<NpcFactionMemberComponent>(args.Equipee, out var factionComp);
         var faction = (args.Equipee, factionComp);
         ent.Comp.AlreadyMember = _faction.IsMember(faction, ent.Comp.Faction);
@@ -31,6 +35,9 @@ private void OnEquipped(Entity<FactionClothingComponent> ent, ref GotEquippedEve
 
     private void OnUnequipped(Entity<FactionClothingComponent> ent, ref GotUnequippedEvent args)
     {
+        if (!HasComp<ActorComponent>(args.Equipee)) // Frontier - Dont edit AI factions
+            return; // Frontier - Dont edit AI factions
+
         if (ent.Comp.AlreadyMember)
         {
             ent.Comp.AlreadyMember = false;