From f350e58361ef38c08a70c21fb13259372ead77a7 Mon Sep 17 00:00:00 2001
From: DarthArgus <darg.us@yandex.com>
Date: Tue, 13 Dec 2016 16:20:05 +0000
Subject: [PATCH] DIE BEOTCH! - DB Bug fixed.

---
 .../SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.cpp    | 5 ++---
 .../SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h      | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.cpp b/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.cpp
index 5fdd99e5..e30a8f0a 100755
--- a/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.cpp
+++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.cpp
@@ -39,7 +39,6 @@ ObjvarBuffer::ObjvarBuffer(DB::ModeQuery::Mode mode, ObjectTableBuffer *objectTa
 ObjvarBuffer::~ObjvarBuffer()
 {
 	m_data.clear();
-	m_overrides.clear();
 }
 
 bool ObjvarBuffer::load(DB::Session *session,const DB::TagSet &tags, const std::string &schema, bool usingGoldDatabase)
@@ -109,7 +108,7 @@ bool ObjvarBuffer::load(DB::Session *session,const DB::TagSet &tags, const std::
 
 				value.m_detached=false;
 		
-				m_overrides.insert(std::make_pair(key,value));
+				m_data.insert(std::make_pair(key,value));
 			}
 		}
 	
@@ -234,7 +233,7 @@ void ObjvarBuffer::getObjvarsForObject(const NetworkId &objectId, std::vector<Dy
 	// The last objvar sent to the game takes precedence, so we want to send the overrides after the values read in through the regular process
 
 	{
-		for (DataType::const_iterator i= m_overrides.lower_bound(IndexKey(objectId,0)); (i!=m_overrides.end()) && (i->first.m_objectId==objectId); ++i)
+		for (DataType::const_iterator i= m_data.lower_bound(IndexKey(objectId,0)); (i!=m_data.end()) && (i->first.m_objectId==objectId); ++i)
 		{
 			std::string name;
 			bool foundName = false;
diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h b/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h
index 86592fa7..7e5ba082 100755
--- a/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h
+++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/ObjvarBuffer.h
@@ -16,7 +16,7 @@
 #include "sharedFoundation/DynamicVariableList.h"
 #include <map>
 #include <string>
-#include <memory>
+
 // ======================================================================
 
 class ObjectTableBuffer;
@@ -78,7 +78,6 @@ public:
 
 	DB::ModeQuery::Mode m_mode;
 	DataType m_data;
-	DataType m_overrides;
 	ObjectTableBuffer *m_objectTableBuffer;
 	bool m_useGoldNames;