From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Thu, 27 Jan 2022 03:25:26 +0000 (+0100)
Subject: stop dropping when hitting water
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=867782e5cfccd99d9cfd869a256efa2c826cec7e;p=xonotic%2Fxonotic-data.pk3dir.git

stop dropping when hitting water
---

diff --git a/qcsrc/common/gamemodes/gamemode/br/sv_br.qc b/qcsrc/common/gamemodes/gamemode/br/sv_br.qc
index bb69ed700..29e914bf1 100644
--- a/qcsrc/common/gamemodes/gamemode/br/sv_br.qc
+++ b/qcsrc/common/gamemodes/gamemode/br/sv_br.qc
@@ -481,7 +481,7 @@ MUTATOR_HOOKFUNCTION(br, PM_Physics)
 
     // TODO: improve dropping physics
     if(STAT(DROP, player) == DROP_FALLING){
-        if(!IS_ONGROUND(player) && ((tracebox(player.origin, player.mins, player.maxs, player.origin - '0 0 1', MOVE_NOMONSTERS, player), trace_fraction) >= 1)) // IS_ONGROUND doesn't work if jump is held (jump is theoretically blocked until landed)
+        if(!IS_ONGROUND(player) && (player.waterlevel < WATERLEVEL_SWIMMING) && ((tracebox(player.origin, player.mins, player.maxs, player.origin - '0 0 1', MOVE_NOMONSTERS, player), trace_fraction) >= 1)) // IS_ONGROUND doesn't work if jump is held (jump is theoretically blocked until landed)
         {
             ITEMS_STAT(player) |= IT_USING_JETPACK;
             bool has_drop_leader = IN_SQUAD(player) && (player.br_drop_detached != 2) && (player.br_squad.br_squad_drop_leader && (STAT(DROP, player.br_squad.br_squad_drop_leader) == DROP_FALLING));