From fcb8b2dad690197a50bfedc121ad37e2fbbd9fca Mon Sep 17 00:00:00 2001
From: TotallyNotElite <1yourexperiment@protonmail.com>
Date: Fri, 22 Mar 2019 11:52:37 +0100
Subject: [PATCH] EffectChams: Fix crash on map join

Fixes #714
---
 src/visual/EffectChams.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/visual/EffectChams.cpp b/src/visual/EffectChams.cpp
index b7b9576c..15559593 100644
--- a/src/visual/EffectChams.cpp
+++ b/src/visual/EffectChams.cpp
@@ -200,14 +200,12 @@ rgba_t EffectChams::ChamsColor(IClientEntity *entity)
 
 bool EffectChams::ShouldRenderChams(IClientEntity *entity)
 {
-    if (!isHackActive() || !*effect_chams::enable)
-        return false;
-    if (!effect_chams::enable)
+    if (!isHackActive() || !*effect_chams::enable || CE_BAD(LOCAL_E))
         return false;
     if (entity->entindex() < 0)
         return false;
     CachedEntity *ent = ENTITY(entity->entindex());
-    if (ent->m_IDX == LOCAL_E->m_IDX && !chamsself)
+    if (!chamsself && ent->m_IDX == LOCAL_E->m_IDX)
         return false;
     switch (ent->m_Type())
     {