Merge branch 'martin-t/settings' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / nexball / nexball.qc

diff --git a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
index f9885fefd45321c42987a5ff192fa7c9faf539df..c841079fb775016d7828964bc25c0142261f76f0 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
+++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
@@ -306,7 +306,7 @@ void football_touch(entity this, entity toucher)
                        this.nextthink = time + autocvar_g_nexball_delay_idle;
                return;
        }
-       if (!IS_PLAYER(toucher))
+       if (!IS_PLAYER(toucher) && !IS_VEHICLE(toucher))
                return;
        if(GetResource(toucher, RES_HEALTH) < 1)
                return;