Merge pull request #502 from bloodycop6385/feat-proper-combine

Use bit.bor for KEY_BLACKLIST

Author: alexgrist

gamemode/core/hooks/sh_hooks.lua

@@ -378,7 +378,7 @@ do
 end
 
 do
-	local KEY_BLACKLIST = IN_ATTACK + IN_ATTACK2
+	local KEY_BLACKLIST = bit.bor( IN_ATTACK, IN_ATTACK2 )
 
 	function GM:StartCommand(client, command)
 		if (!client:CanShootWeapon()) then