From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Thu, 27 Jan 2022 03:07:45 +0000 (+0100)
Subject: improve collision handling when dropping in battle royale
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c3ee6630ebcd65bbe337c961b0884546fba35096;p=xonotic%2Fxonotic-data.pk3dir.git

improve collision handling when dropping in battle royale
---

diff --git a/qcsrc/common/gamemodes/gamemode/br/sv_br.qc b/qcsrc/common/gamemodes/gamemode/br/sv_br.qc
index 3d0839437..bb69ed700 100644
--- a/qcsrc/common/gamemodes/gamemode/br/sv_br.qc
+++ b/qcsrc/common/gamemodes/gamemode/br/sv_br.qc
@@ -488,6 +488,8 @@ MUTATOR_HOOKFUNCTION(br, PM_Physics)
             bool player_is_drop_leader = has_drop_leader && (player == player.br_squad.br_squad_drop_leader);
             if(player_is_drop_leader || !has_drop_leader)
             {
+                player.br_drop_velocity = eZ * player.br_drop_velocity.z + vec2(player.velocity); // use real horizontal velocity in case of collisions
+
                 const float vertical_max = 0.9;
                 float maxairspeed = PHYS_MAXAIRSPEED(player) * max(maxspeed_mod, 1);
                 float maxdropspeed = maxairspeed * max(autocvar_g_br_drop_speed_max, 0);