]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
battle royale: check for noimpact and nomarks flag in drop from sky code, matches...
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Sat, 10 Jun 2023 03:21:59 +0000 (05:21 +0200)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Sat, 10 Jun 2023 03:21:59 +0000 (05:21 +0200)
qcsrc/common/gamemodes/gamemode/br/sv_events.qc

index b5c8a46a908c90ed5c1adae835f42b0f7bd692e3..01c28f7b831d64b6cffec6fcef05bb6864d757cc 100644 (file)
@@ -67,7 +67,7 @@ bool drop_from_sky(entity this)
         move_success = true;
 
         tracebox(this.origin, this.mins, this.maxs, this.origin + '0 0 65536', MOVE_NORMAL, this);
-        if(!(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY))
+        if(!(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY | Q3SURFACEFLAG_NOIMPACT | Q3SURFACEFLAG_NOMARKS))
             continue;
 
         setorigin(this, trace_endpos);