From 890063b8bbd63022c9d71ff786f4d24d7481f884 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 14 Sep 2026 22:30:40 +0200 Subject: [PATCH] Remove an unequipped weapon from its weapon groups (Cut 10 fix) TryUnequip removed a weapon from _weapons but left it in WeaponGroups, so an unequipped weapon could still be fired from its action-bar group and EntitySerializer.Pack wrote -1 for it. The removal mirrors the group toggle in WeaponGroupAssignment. Co-Authored-By: Claude Opus 5 --- Assets/Scripts/ServerShared/Entity.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/Scripts/ServerShared/Entity.cs b/Assets/Scripts/ServerShared/Entity.cs index 016b2bd4f..a3be9bed3 100644 --- a/Assets/Scripts/ServerShared/Entity.cs +++ b/Assets/Scripts/ServerShared/Entity.cs @@ -504,7 +504,10 @@ public abstract class Entity foreach (var b in item.Behaviors) { if (b is Weapon weapon) + { _weapons.Remove(weapon); + foreach (var group in WeaponGroups) { group.items.Remove(item); group.weapons.Remove(weapon); } + } if (b is Capacitor capacitor) _capacitors.Remove(capacitor); if (b is Reactor reactor)