Fix GetDataDescMap not returning a valid ptr on entity deletion (#26)

Co-authored-by: Kenzzer <[email protected]>
TF2-DMB · Jul 7, 2022 · 904a492 · 904a492
1 parent 09ea2e4
commit 904a492
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 21 deletions.
diff --git a/extension/cbasenpc_behavior.h b/extension/cbasenpc_behavior.h
@@ -160,6 +160,7 @@ class CBaseNPCIntention : public IIntention
 	void InitBehavior();
 	void DestroyBehavior();
 
+
 private:
 	Behavior< INextBot > * m_pBehavior;
 };

diff --git a/extension/pluginentityfactory.cpp b/extension/pluginentityfactory.cpp
@@ -467,24 +467,6 @@ void CPluginEntityFactories::NotifyEntityDestruction( CBaseEntity* pEntity )
 	}
 }
 
-datamap_t* CPluginEntityFactories::Hook_GetDataDescMap()
-{
-	CBaseEntity *pEntity = META_IFACEPTR(CBaseEntity);
-	if (!pEntity) RETURN_META_VALUE(MRES_IGNORED, nullptr);
-
-	PluginFactoryEntityRecord_t* pEntityRecord = FindRecord(pEntity);
-	if (!pEntityRecord)
-		RETURN_META_VALUE(MRES_IGNORED, nullptr);
-
-	datamap_t* pDataMap = pEntityRecord->m_pDataMap;
-	if (pDataMap)
-	{
-		RETURN_META_VALUE(MRES_SUPERCEDE, pDataMap);
-	}
-
-	RETURN_META_VALUE(MRES_IGNORED, nullptr);
-}
-
 void CPluginEntityFactories::Hook_UpdateOnRemove()
 {
 	CBaseEntity *pEntity = META_IFACEPTR(CBaseEntity);
@@ -523,7 +505,7 @@ void PluginFactoryEntityRecord_t::Hook(bool bHookDestructor)
 	}
 	m_bHooked = true;
 
-	m_pHookIds.push_back( SH_ADD_MANUALHOOK(FactoryEntity_GetDataDescMap, pEntity, SH_MEMBER(g_pPluginEntityFactories, &CPluginEntityFactories::Hook_GetDataDescMap), false) );
+	m_pHookIds.push_back( SH_ADD_MANUALHOOK(FactoryEntity_GetDataDescMap, pEntity, SH_MEMBER(this, &PluginFactoryEntityRecord_t::Hook_GetDataDescMap), false) );
 	m_pHookIds.push_back( SH_ADD_MANUALHOOK(FactoryEntity_UpdateOnRemove, pEntity, SH_MEMBER(g_pPluginEntityFactories, &CPluginEntityFactories::Hook_UpdateOnRemove), false) );
 
 	if (bHookDestructor)
@@ -583,6 +565,22 @@ PluginFactoryEntityRecord_t::~PluginFactoryEntityRecord_t()
 	}
 }
 
+datamap_t* PluginFactoryEntityRecord_t::Hook_GetDataDescMap()
+{
+	CBaseEntity *pEntity = META_IFACEPTR(CBaseEntity);
+	if (!pEntity)
+	{
+		RETURN_META_VALUE(MRES_IGNORED, nullptr);
+	}
+
+	if (m_pDataMap)
+	{
+		RETURN_META_VALUE(MRES_SUPERCEDE, m_pDataMap);
+	}
+
+	RETURN_META_VALUE(MRES_IGNORED, nullptr);
+}
+
 INextBot* PluginFactoryEntityRecord_t::Hook_MyNextBotPointer()
 {
 	RETURN_META_VALUE(MRES_SUPERCEDE, m_pNextBot);

diff --git a/extension/pluginentityfactory.h b/extension/pluginentityfactory.h
@@ -42,6 +42,7 @@ class PluginFactoryEntityRecord_t
 	PluginFactoryEntityRecord_t( CBaseEntityHack* pEnt ) : pEntity(pEnt) { }
 	~PluginFactoryEntityRecord_t();
 
+	datamap_t* Hook_GetDataDescMap();
 	INextBot* Hook_MyNextBotPointer();
 	IIntention* Hook_GetIntentionInterface();
 
@@ -87,7 +88,6 @@ class CPluginEntityFactories : public IPluginsListener,
 
 	void NotifyEntityDestruction( CBaseEntity* pEntity );
 
-	datamap_t* Hook_GetDataDescMap();
 	void Hook_UpdateOnRemove();
 #ifdef __linux__
 	void Hook_EntityDestructor( void );

diff --git a/product.version b/product.version
@@ -1 +1 @@
-1.6.0
+1.6.1