From ba042c76c8ec6c96d124bfb865ec43cebb819f38 Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Wed, 11 Nov 2020 03:50:02 -0500
Subject: [PATCH] Only limit negative z velocity by gravity instead of total
 negative z velocity

---
 CHANGELOG.md           | 1 +
 common/src/sys/phys.rs | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccf1443f13..e1d10a4858 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,6 +80,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed a bug where the closest item would be picked up instead of a selected item.
 - Fixed a bug where camera zoom in and zoom out distance didn't match.
 - Fixed a bug where a nearby item would also be collected when collecting collectible blocks
+- Fixed a bug where firing fast projectile at a downwards angle caused them to veer off at a higher angle
 
 ## [0.7.0] - 2020-08-15
 
diff --git a/common/src/sys/phys.rs b/common/src/sys/phys.rs
index 54a1f30499..937fc66cee 100644
--- a/common/src/sys/phys.rs
+++ b/common/src/sys/phys.rs
@@ -41,7 +41,9 @@ fn integrate_forces(dt: f32, mut lv: Vec3<f32>, grav: f32, damp: f32) -> Vec3<f3
     // must be interpolated accordingly
     let linear_damp = (1.0 - damp.min(1.0)).powf(dt * 60.0);
 
-    lv.z = (lv.z - grav * dt).max(-80.0);
+    // TODO: investigate if we can have air friction provide the neccessary limits
+    // here
+    lv.z = (lv.z - grav * dt).max(-80.0).min(lv.z);
     lv * linear_damp
 }