Merge branch 'terencehill/ForbidWeaponUse'
authorterencehill <piuntn@gmail.com>
Sun, 14 Apr 2019 15:43:39 +0000 (17:43 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 14 Apr 2019 15:43:39 +0000 (17:43 +0200)
Fix #2201 "ForbidWeaponUse mutator hook can leave the player holding a weapon they no longer possess". ForbidWeaponUse now forbids weapon use but allows switching to another weapon, while the new mutator hook LockWeapon applies both restrictions

Closes #2201

See merge request xonotic/xonotic-data.pk3dir!644


Trivial merge