Be coherent about what's armor and what's a weapon

Newly added assertions in the server caught this.