Merge branch 'master' into develop

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapobjects / func / conveyor.qc

diff --git a/qcsrc/common/mapobjects/func/conveyor.qc b/qcsrc/common/mapobjects/func/conveyor.qc
index 4c40598d35339676829c7f1de7f69a92de7f5545..3666dd337b2c56ffed1b03ca54d1339dfe98d4e8 100644 (file)
--- a/qcsrc/common/mapobjects/func/conveyor.qc
+++ b/qcsrc/common/mapobjects/func/conveyor.qc
@@ -98,7 +98,7 @@ void conveyor_init(entity this)
        setthink(this, conveyor_think);
        this.nextthink = time;
        this.setactive = generic_netlinked_setactive;
-       IFTARGETED
+       if(this.targetname && this.targetname != "")
        {
                // backwards compatibility
                this.use = generic_netlinked_legacy_use;