From bcf774624ac457de69ea2f4076f12bd921256a11 Mon Sep 17 00:00:00 2001
From: NotAnUser1 <72518912+NotAnUser1@users.noreply.github.com>
Date: Sat, 31 Oct 2020 19:31:47 +0300
Subject: [PATCH] Stealth spell counts as being cloaked (#1147)

---
 include/helpers.hpp        | 2 +-
 src/hacks/Aimbot.cpp       | 2 +-
 src/hacks/AutoBackstab.cpp | 2 +-
 src/hacks/Trigger.cpp      | 2 +-
 src/helpers.cpp            | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/helpers.hpp b/include/helpers.hpp
index 5a6638d6..267dbbdd 100644
--- a/include/helpers.hpp
+++ b/include/helpers.hpp
@@ -73,7 +73,7 @@ void EndConVars();
 
 bool IsPlayerInvulnerable(CachedEntity *player);
 bool IsPlayerCritBoosted(CachedEntity *player);
-bool IsPlayerInvisible(CachedEntity *player);
+bool IsPlayerInvisible(CachedEntity *player, bool check_stealth = true);
 bool IsPlayerDisguised(CachedEntity *player);
 bool IsPlayerResistantToCurrentWeapon(CachedEntity *player);
 
diff --git a/src/hacks/Aimbot.cpp b/src/hacks/Aimbot.cpp
index ccc81799..3829a6c2 100644
--- a/src/hacks/Aimbot.cpp
+++ b/src/hacks/Aimbot.cpp
@@ -456,7 +456,7 @@ bool ShouldAim()
         if (HasCondition<TFCond_Taunting>(g_pLocalPlayer->entity))
             return false;
         // Is cloaked
-        if (IsPlayerInvisible(g_pLocalPlayer->entity))
+        if (IsPlayerInvisible(g_pLocalPlayer->entity, false))
             return false;
     }
 #if ENABLE_VISUALS
diff --git a/src/hacks/AutoBackstab.cpp b/src/hacks/AutoBackstab.cpp
index dd1c8aa9..36edf9fb 100644
--- a/src/hacks/AutoBackstab.cpp
+++ b/src/hacks/AutoBackstab.cpp
@@ -315,7 +315,7 @@ void CreateMove()
 {
     if (!enabled)
         return;
-    if (CE_BAD(LOCAL_E) || g_pLocalPlayer->life_state || CE_BAD(LOCAL_W) || !HasKnife() || IsPlayerInvisible(LOCAL_E) || CE_BYTE(LOCAL_E, netvar.m_bFeignDeathReady))
+    if (CE_BAD(LOCAL_E) || g_pLocalPlayer->life_state || CE_BAD(LOCAL_W) || !HasKnife() || IsPlayerInvisible(LOCAL_E, false) || CE_BYTE(LOCAL_E, netvar.m_bFeignDeathReady))
         return;
     if (!CanShoot())
         return;
diff --git a/src/hacks/Trigger.cpp b/src/hacks/Trigger.cpp
index 7b638661..9f30dd84 100644
--- a/src/hacks/Trigger.cpp
+++ b/src/hacks/Trigger.cpp
@@ -191,7 +191,7 @@ bool ShouldShoot()
         if (HasCondition<TFCond_Taunting>(g_pLocalPlayer->entity))
             return false;
         // Check if player is cloaked
-        if (IsPlayerInvisible(g_pLocalPlayer->entity))
+        if (IsPlayerInvisible(g_pLocalPlayer->entity, false))
             return false;
 
         if (IsAmbassador(g_pLocalPlayer->weapon()))
diff --git a/src/helpers.cpp b/src/helpers.cpp
index 730ef5b7..6d316699 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -1488,9 +1488,9 @@ bool IsPlayerCritBoosted(CachedEntity *player)
     return HasConditionMask<KCritBoostMask.cond_0, KCritBoostMask.cond_1, KCritBoostMask.cond_2, KCritBoostMask.cond_3>(player);
 }
 
-bool IsPlayerInvisible(CachedEntity *player)
+bool IsPlayerInvisible(CachedEntity *player, bool check_stealth)
 {
-    return HasConditionMask<KInvisibilityMask.cond_0, KInvisibilityMask.cond_1, KInvisibilityMask.cond_2, KInvisibilityMask.cond_3>(player);
+    return HasConditionMask<KInvisibilityMask.cond_0, KInvisibilityMask.cond_1, KInvisibilityMask.cond_2, KInvisibilityMask.cond_3>(player) || (check_stealth && HasCondition<TFCond_Stealthed>(player));
 }
 
 bool IsPlayerDisguised(CachedEntity *player)