diff --git a/src/engine/server/vengineserver_impl.cpp b/src/engine/server/vengineserver_impl.cpp
index 6ee4bf96..75f5f6ab 100644
--- a/src/engine/server/vengineserver_impl.cpp
+++ b/src/engine/server/vengineserver_impl.cpp
@@ -9,10 +9,10 @@
 //-----------------------------------------------------------------------------
 // Purpose: sets the persistence var in the CClient instance to 'ready'
 //-----------------------------------------------------------------------------
-bool CVEngineServer::PersistenceAvailable(void* entidx, int clientidx)
+bool CVEngineServer::PersistenceAvailable(CVEngineServer* const thisptr, const int clientidx)
 {
 	///////////////////////////////////////////////////////////////////////////
-	return CVEngineServer__PersistenceAvailable(entidx, clientidx);
+	return CVEngineServer__PersistenceAvailable(thisptr, clientidx);
 }
 
 void HVEngineServer::Detour(const bool bAttach) const
diff --git a/src/engine/server/vengineserver_impl.h b/src/engine/server/vengineserver_impl.h
index 66f3008f..360537b3 100644
--- a/src/engine/server/vengineserver_impl.h
+++ b/src/engine/server/vengineserver_impl.h
@@ -2,22 +2,21 @@
 #include "public/edict.h"
 #include "public/eiface.h"
 
-/* ==== CVENGINESERVER ================================================================================================================================================== */
-inline bool(*CVEngineServer__PersistenceAvailable)(void* entidx, int clientidx);
-
-inline bool* m_bIsDedicated = nullptr;
-
-///////////////////////////////////////////////////////////////////////////////
-
 class CVEngineServer : public IVEngineServer
 {
 public:
-	static bool PersistenceAvailable(void* entidx, int clientidx);
+	static bool PersistenceAvailable(CVEngineServer* const thisptr, const int clientidx);
 	// Implementation in GameDLL.
 };
 extern CVEngineServer* g_pEngineServer;
 extern IVEngineServer* g_pEngineServerVFTable;
 
+/* ==== CVENGINESERVER ================================================================================================================================================== */
+inline bool(*CVEngineServer__PersistenceAvailable)(CVEngineServer* const thisptr, const int clientidx);
+
+///////////////////////////////////////////////////////////////////////////////
+inline bool* m_bIsDedicated = nullptr;
+
 ///////////////////////////////////////////////////////////////////////////////
 class HVEngineServer : public IDetour
 {