Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Mon, 17 Oct 2016 17:34:09 +0000 (03:34 +1000)
committerMario <mario@smbclan.net>
Mon, 17 Oct 2016 17:34:09 +0000 (03:34 +1000)
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc

index 2cad55f166da384fd9c254179b028dc5079530a6..a9bd737ca0066caff3db25d142ae2b4afa4e9a9e 100644 (file)
@@ -555,10 +555,7 @@ void SpawnBall(entity this)
        set_movetype(this, MOVETYPE_FLY);
 
        if(autocvar_g_nexball_playerclip_collisions)
-       {
                this.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_SOLID | DPCONTENTS_PLAYERCLIP;
-               this.dphitcontentsmask |= DPCONTENTS_PLAYERCLIP;
-       }
 
        if(!autocvar_g_nexball_sound_bounce)
                this.noise = "";