Merge changes from feffb85845c8c0b85e38e7d270ea43e8c1133027

nerf weapon checker distance and eliminate rightclick spam