From d101dc9315da94e0b3154a22a47cb4994dbbfc14 Mon Sep 17 00:00:00 2001
From: TotallyNotElite <1yourexperiment@protonmail.com>
Date: Tue, 24 Nov 2020 10:12:06 +0100
Subject: [PATCH] Revert "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 267dbbdd..5a6638d6 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 check_stealth = true);
+bool IsPlayerInvisible(CachedEntity *player);
 bool IsPlayerDisguised(CachedEntity *player);
 bool IsPlayerResistantToCurrentWeapon(CachedEntity *player);
 
diff --git a/src/hacks/Aimbot.cpp b/src/hacks/Aimbot.cpp
index c22ce13c..ba7da296 100644
--- a/src/hacks/Aimbot.cpp
+++ b/src/hacks/Aimbot.cpp
@@ -465,7 +465,7 @@ bool ShouldAim()
         if (HasCondition<TFCond_Taunting>(g_pLocalPlayer->entity))
             return false;
         // Is cloaked
-        if (IsPlayerInvisible(g_pLocalPlayer->entity, false))
+        if (IsPlayerInvisible(g_pLocalPlayer->entity))
             return false;
     }
 #if ENABLE_VISUALS
diff --git a/src/hacks/AutoBackstab.cpp b/src/hacks/AutoBackstab.cpp
index 36edf9fb..dd1c8aa9 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, false) || CE_BYTE(LOCAL_E, netvar.m_bFeignDeathReady))
+    if (CE_BAD(LOCAL_E) || g_pLocalPlayer->life_state || CE_BAD(LOCAL_W) || !HasKnife() || IsPlayerInvisible(LOCAL_E) || CE_BYTE(LOCAL_E, netvar.m_bFeignDeathReady))
         return;
     if (!CanShoot())
         return;
diff --git a/src/hacks/Trigger.cpp b/src/hacks/Trigger.cpp
index 9f30dd84..7b638661 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, false))
+        if (IsPlayerInvisible(g_pLocalPlayer->entity))
             return false;
 
         if (IsAmbassador(g_pLocalPlayer->weapon()))
diff --git a/src/helpers.cpp b/src/helpers.cpp
index 14c250df..1541acd9 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 check_stealth)
+bool IsPlayerInvisible(CachedEntity *player)
 {
-    return HasConditionMask<KInvisibilityMask.cond_0, KInvisibilityMask.cond_1, KInvisibilityMask.cond_2, KInvisibilityMask.cond_3>(player) || (check_stealth && HasConditionMask<KStealthedMask.cond_0, KStealthedMask.cond_1, KStealthedMask.cond_2, KStealthedMask.cond_3>(player));
+    return HasConditionMask<KInvisibilityMask.cond_0, KInvisibilityMask.cond_1, KInvisibilityMask.cond_2, KInvisibilityMask.cond_3>(player);
 }
 
 bool IsPlayerDisguised(CachedEntity *player)