From 776e6391f2bee57e03b2f975095590f9d0177506 Mon Sep 17 00:00:00 2001
From: BenCat07 <BenCat07@gmail.com>
Date: Mon, 15 Feb 2021 16:13:53 +0100
Subject: [PATCH] Fix building aimbot issues

---
 src/hacks/Aimbot.cpp | 2 +-
 src/prediction.cpp   | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/hacks/Aimbot.cpp b/src/hacks/Aimbot.cpp
index 2072a156..7755dee4 100644
--- a/src/hacks/Aimbot.cpp
+++ b/src/hacks/Aimbot.cpp
@@ -1127,7 +1127,7 @@ Vector PredictEntity(CachedEntity *entity, bool vischeck)
         // Buildings
         else if (entity->m_Type() == ENTITY_BUILDING)
         {
-            if (cur_proj_grav || cur_proj_grav)
+            if (projectileAimbotRequired)
             {
                 std::pair<Vector, Vector> tmp_result;
                 tmp_result = BuildingPrediction(entity, GetBuildingPosition(entity), cur_proj_speed, cur_proj_grav, cur_proj_start_vel);
diff --git a/src/prediction.cpp b/src/prediction.cpp
index a4ba2c3b..699b0a63 100644
--- a/src/prediction.cpp
+++ b/src/prediction.cpp
@@ -402,7 +402,7 @@ std::pair<Vector, Vector> BuildingPrediction(CachedEntity *building, Vector vec,
         return { Vector(), Vector() };
 
     trace::filter_no_player.SetSelf(RAW_ENT(building));
-    float dtg = DistanceToGround(vec, RAW_ENT(building)->GetCollideable()->OBBMins(), RAW_ENT(building)->GetCollideable()->OBBMaxs());
+
     // TODO ProjAim
     float medianTime  = g_pLocalPlayer->v_Eye.DistTo(result) / speed;
     float range       = 1.5f;
@@ -415,12 +415,7 @@ std::pair<Vector, Vector> BuildingPrediction(CachedEntity *building, Vector vec,
     int maxsteps   = 300;
     for (int steps = 0; steps < maxsteps; steps++, currenttime += ((float) (2 * range) / (float) maxsteps))
     {
-        Vector curpos = result;
-        if (dtg > 0.0f)
-        {
-            if (curpos.z < result.z - dtg)
-                curpos.z = result.z - dtg;
-        }
+        Vector curpos    = result;
         float rockettime = g_pLocalPlayer->v_Eye.DistTo(curpos) / speed;
         // Compensate for ping
         rockettime += g_IEngine->GetNetChannelInfo()->GetLatency(FLOW_OUTGOING) + cl_interp->GetFloat();