Merge branch 'LegendaryGuard/avoid_spam_map_custom_fields' into 'master'

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

diff --git a/qcsrc/common/mapobjects/func/ladder.qc b/qcsrc/common/mapobjects/func/ladder.qc
index 23cdf1d49f4ac454c8d6901070e9d90ab9df3199..0d4e253f091ce3cb83788bb39cf95b78171dd45d 100644 (file)
--- a/qcsrc/common/mapobjects/func/ladder.qc
+++ b/qcsrc/common/mapobjects/func/ladder.qc
@@ -64,7 +64,8 @@ void func_ladder_link(entity this)
 
 void func_ladder_init(entity this)
 {
-       trigger_init(this);
+       EXACTTRIGGER_INIT;
+       BITSET_ASSIGN(this.effects, EF_NODEPTHTEST);
        func_ladder_link(this);
        setthink(this, func_ladder_think);
        this.nextthink = time;
@@ -121,9 +122,9 @@ void func_ladder_init(entity this)
                        }
                }
        }
+       delete(tracetest_ent);
        if(trace_startsolid || trace_endpos.z < this.absmax.z)
        {
-               delete(tracetest_ent);
                return;
        }