Add checks to fix weapon selection in multiplayer #30