Partially re-implement the .teleport_time field in player physics to prevent getting...

diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index 1c55d3d14b58e13a02369f0ba49b9f4e9e63d2ec..24967d1c8169e547dde7fbd3e52cc8d998c65fd7 100644 (file)
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -450,6 +450,7 @@ void CheckWaterJump(entity this)
                {       // open at eye level
                        this.velocity_z = 225;
                        this.flags |= FL_WATERJUMP;
+                       this.teleport_time = time + 2; // safety net
                        SET_JUMP_HELD(this);
                }
        }

diff --git a/qcsrc/ecs/systems/physics.qc b/qcsrc/ecs/systems/physics.qc
index 38d35d4b37a9b95bd56de2f516bced5ad4f05e91..c7fc88dc93593159e524a4e9920b32481362fdf2 100644 (file)
--- a/qcsrc/ecs/systems/physics.qc
+++ b/qcsrc/ecs/systems/physics.qc
@@ -90,8 +90,9 @@ void sys_phys_update(entity this, float dt)
        if (this.flags & FL_WATERJUMP) {
                this.velocity_x = this.movedir.x;
                this.velocity_y = this.movedir.y;
-               if (this.waterlevel == WATERLEVEL_NONE) {
+               if (time > this.teleport_time || this.waterlevel == WATERLEVEL_NONE) {
                        this.flags &= ~FL_WATERJUMP;
+                       this.teleport_time = 0;
                }
        } else if (MUTATOR_CALLHOOK(PM_Physics, this, maxspeed_mod, dt)) {
                // handled