Null check pActivator

Source2ZE · Dec 6, 2024 · 3e15f50 · 3e15f50
1 parent d889b90
commit 3e15f50
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/buttonwatch.cpp b/src/buttonwatch.cpp
@@ -97,8 +97,8 @@ std::map <int, bool> mapRecentEnts;
 void ButtonWatch(const CEntityIOOutput* pThis, CEntityInstance* pActivator, CEntityInstance* pCaller, const CVariant* value, float flDelay)
 {
     if (!IsButtonWatchEnabled() || V_stricmp(pThis->m_pDesc->m_pName, "OnPressed") ||
-        !((CBaseEntity*)pActivator)->IsPawn() || !pCaller ||
-        mapRecentEnts.contains(pCaller->GetEntityIndex().Get()))
+        !pActivator || !((CBaseEntity*)pActivator)->IsPawn() ||
+        !pCaller || mapRecentEnts.contains(pCaller->GetEntityIndex().Get()))
         return;
 
     CCSPlayerController* ccsPlayer = CCSPlayerController::FromPawn(static_cast<CCSPlayerPawn*>(pActivator));