From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Sat, 10 Jun 2023 03:21:59 +0000 (+0200)
Subject: battle royale: check for noimpact and nomarks flag in drop from sky code, matches... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a536adece72ceda70a802697d7d4e07d681bb0ab;p=xonotic%2Fxonotic-data.pk3dir.git

battle royale: check for noimpact and nomarks flag in drop from sky code, matches dropship code
---

diff --git a/qcsrc/common/gamemodes/gamemode/br/sv_events.qc b/qcsrc/common/gamemodes/gamemode/br/sv_events.qc
index b5c8a46a9..01c28f7b8 100644
--- a/qcsrc/common/gamemodes/gamemode/br/sv_events.qc
+++ b/qcsrc/common/gamemodes/gamemode/br/sv_events.qc
@@ -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);