Allow picking up items in combat mode (#20431)

* Allow picking up items in combat mode

* dont hardcode that
This commit is contained in:
Kara
2023-09-24 12:47:42 -07:00
committed by GitHub
parent 9e1bf43242
commit 657e4d861e
4 changed files with 60 additions and 6 deletions

View File

@@ -152,6 +152,10 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem
target = screen.GetClickedEntity(mousePos);
}
// Don't light-attack if interaction will be handling this instead
if (Interaction.CombatModeCanHandInteract(entity, target))
return;
RaisePredictiveEvent(new LightAttackEvent(GetNetEntity(target), GetNetEntity(weaponUid), GetNetCoordinates(coordinates)));
}
}