Updated weapon stripping to also remove a players armour (this should…

… be handled by the allocator)

Modules/Helpers.cs

@@ -155,4 +155,16 @@ public static void GiveAndSwitchToBomb(CCSPlayerController player)
         player.GiveNamedItem(CsItem.Bomb);
         NativeAPI.IssueClientCommand((int)player.UserId!, "slot5");
     }
+
+    public static void RemoveHelmetAndHeavyArmour(CCSPlayerController player)
+    {
+        if (player.PlayerPawn.Value == null || player.PlayerPawn.Value.ItemServices == null)
+        {
+            return;
+        }
+
+        var itemServices = new CCSPlayer_ItemServices(player.PlayerPawn.Value.ItemServices.Handle);
+        itemServices.HasHelmet = false;
+        itemServices.HasHeavyArmor = false;
+    }
 }

RetakesPlugin.cs

@@ -392,10 +392,9 @@ public HookResult OnRoundPostStart(EventRoundPoststart @event, GameEventInfo inf
             }
 
             // Strip the player of all of their weapons and the bomb before any spawn / allocation occurs.
-            // TODO: Figure out why this is crashing the server / undo workaround.
-            // player.RemoveWeapons();
+            Helpers.RemoveHelmetAndHeavyArmour(player);
             Helpers.RemoveAllWeaponsAndEntities(player);
-            
+
             // Create a timer to do this as it would occasionally fire too early.
             AddTimer(0.05f, () =>
             {