From ef3660466620d0f59abb904d51ee55854f15b67a Mon Sep 17 00:00:00 2001
From: Headline <michaelwflaherty@me.com>
Date: Fri, 2 Oct 2020 16:04:30 -0700
Subject: [PATCH] datapack: remove legacy cache (#1357)

---
 core/logic/CDataPack.cpp     | 19 -------------------
 core/logic/CDataPack.h       |  3 ---
 core/logic/smn_datapacks.cpp |  4 ++--
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/core/logic/CDataPack.cpp b/core/logic/CDataPack.cpp
index 39f645ab..81363839 100644
--- a/core/logic/CDataPack.cpp
+++ b/core/logic/CDataPack.cpp
@@ -46,25 +46,6 @@ CDataPack::~CDataPack()
 	Initialize();
 }
 
-static std::vector<std::unique_ptr<CDataPack>> sDataPackCache;
-
-CDataPack *CDataPack::New()
-{
-  if (sDataPackCache.empty())
-	return new CDataPack();
-
-  CDataPack *pack = sDataPackCache.back().release();
-  sDataPackCache.pop_back();
-  pack->Initialize();
-  return pack;
-}
-
-void
-CDataPack::Free(CDataPack *pack)
-{
-  sDataPackCache.emplace_back(pack);
-}
-
 void CDataPack::Initialize()
 {
 	position = 0;
diff --git a/core/logic/CDataPack.h b/core/logic/CDataPack.h
index f8966f52..a22acf30 100644
--- a/core/logic/CDataPack.h
+++ b/core/logic/CDataPack.h
@@ -54,9 +54,6 @@ public:
 	CDataPack();
 	~CDataPack();
 
-    static CDataPack *New();
-    static void Free(CDataPack *pack);
-
 public: // Originally IDataReader
 	/**
 	 * @brief Resets the position in the data stream to the beginning.
diff --git a/core/logic/smn_datapacks.cpp b/core/logic/smn_datapacks.cpp
index 18dfdc5d..3276c300 100644
--- a/core/logic/smn_datapacks.cpp
+++ b/core/logic/smn_datapacks.cpp
@@ -61,7 +61,7 @@ public:
 	}
 	void OnHandleDestroy(HandleType_t type, void *object)
 	{
-		CDataPack::Free(reinterpret_cast<CDataPack *>(object));
+		delete reinterpret_cast<CDataPack *>(object);
 	}
 	bool GetHandleApproxSize(HandleType_t type, void *object, unsigned int *pSize)
 	{
@@ -73,7 +73,7 @@ public:
 
 static cell_t smn_CreateDataPack(IPluginContext *pContext, const cell_t *params)
 {
-	CDataPack *pDataPack = CDataPack::New();
+	CDataPack *pDataPack = new CDataPack();
 
 	if (!pDataPack)
 	{