From 491cdcd59a532d25088e694751f0f9c7cf8cdec4 Mon Sep 17 00:00:00 2001
From: Mordred Admin <gogs@fake.local>
Date: Thu, 26 Oct 2017 14:40:58 +0200
Subject: [PATCH] Removed reference to database where unused

---
 src/servers/Server_Zone/Actor/BattleNpc.cpp                   | 2 --
 src/servers/Server_Zone/Actor/Player.cpp                      | 4 ----
 src/servers/Server_Zone/Actor/PlayerSql.cpp                   | 2 --
 src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp    | 4 ----
 .../Server_Zone/Network/Handlers/GMCommandHandlers.cpp        | 2 --
 src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp | 2 --
 6 files changed, 16 deletions(-)

diff --git a/src/servers/Server_Zone/Actor/BattleNpc.cpp b/src/servers/Server_Zone/Actor/BattleNpc.cpp
index 6e64015a..5a8b0c40 100644
--- a/src/servers/Server_Zone/Actor/BattleNpc.cpp
+++ b/src/servers/Server_Zone/Actor/BattleNpc.cpp
@@ -4,7 +4,6 @@
 #include <stdint.h>
 #include <cmath>
 
-#include <src/servers/Server_Common/Database/Database.h>
 #include <src/servers/Server_Common/Logging/Logger.h>
 #include <src/servers/Server_Common/Exd/ExdData.h>
 #include <src/servers/Server_Common/Util/Util.h>
@@ -23,7 +22,6 @@ using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 
 extern Core::Logger g_log;
-extern Core::Db::Database g_database;
 extern Core::Data::ExdData g_exdData;
 
 uint32_t Core::Entity::BattleNpc::m_nextID = 1149241694;
diff --git a/src/servers/Server_Zone/Actor/Player.cpp b/src/servers/Server_Zone/Actor/Player.cpp
index c1bddb39..14686b27 100644
--- a/src/servers/Server_Zone/Actor/Player.cpp
+++ b/src/servers/Server_Zone/Actor/Player.cpp
@@ -1,5 +1,4 @@
 #include <src/servers/Server_Common/Common.h>
-#include <src/servers/Server_Common/Database/Database.h>
 #include <src/servers/Server_Common/Util/Util.h>
 #include <src/servers/Server_Common/Util/UtilMath.h>
 #include <src/servers/Server_Common/Config/XMLConfig.h>
@@ -12,13 +11,11 @@
 #include "Player.h"
 #include "BattleNpc.h"
 
-
 #include "src/servers/Server_Zone/Zone/ZoneMgr.h"
 #include "src/servers/Server_Zone/Zone/Zone.h"
 
 #include "src/servers/Server_Zone/ServerZone.h"
 
-
 #include "src/servers/Server_Zone/Network/GameConnection.h"
 
 #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
@@ -48,7 +45,6 @@
 #include <boost/make_shared.hpp>
 
 extern Core::Logger g_log;
-extern Core::Db::Database g_database;
 extern Core::ServerZone g_serverZone;
 extern Core::ZoneMgr g_zoneMgr;
 extern Core::Data::ExdData g_exdData;
diff --git a/src/servers/Server_Zone/Actor/PlayerSql.cpp b/src/servers/Server_Zone/Actor/PlayerSql.cpp
index f67c076a..652423b9 100644
--- a/src/servers/Server_Zone/Actor/PlayerSql.cpp
+++ b/src/servers/Server_Zone/Actor/PlayerSql.cpp
@@ -1,6 +1,5 @@
 #include <src/servers/Server_Common/Common.h>
 #include <src/servers/Server_Common/Network/GamePacket.h>
-#include <src/servers/Server_Common/Database/Database.h>
 #include <src/servers/Server_Common/Util/Util.h>
 #include <src/servers/Server_Common/Util/UtilMath.h>
 #include <src/servers/Server_Common/Config/XMLConfig.h>
@@ -37,7 +36,6 @@
 
 
 extern Core::Logger g_log;
-extern Core::Db::Database g_database;
 extern Core::ServerZone g_serverZone;
 extern Core::ZoneMgr g_zoneMgr;
 extern Core::Data::ExdData g_exdData;
diff --git a/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp b/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp
index 3254fec7..113e5bab 100644
--- a/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp
@@ -1,6 +1,5 @@
 #include <src/servers/Server_Common/Common.h>
 #include <src/servers/Server_Common/Network/CommonNetwork.h>
-#include <src/servers/Server_Common/Database/Database.h>
 #include <src/servers/Server_Common/Network/GamePacketNew.h>
 #include <src/servers/Server_Common/Logging/Logger.h>
 #include <src/servers/Server_Common/Exd/ExdData.h>
@@ -8,7 +7,6 @@
 
 #include <boost/format.hpp>
 
-
 #include "src/servers/Server_Zone/Network/GameConnection.h"
 
 #include "src/servers/Server_Zone/Session.h"
@@ -38,7 +36,6 @@
 #include "src/servers/Server_Zone/Action/ActionTeleport.h"
 
 extern Core::Logger g_log;
-extern Core::Db::Database g_database;
 extern Core::ServerZone g_serverZone;
 extern Core::ZoneMgr g_zoneMgr;
 extern Core::Data::ExdData g_exdData;
@@ -48,7 +45,6 @@ using namespace Core::Common;
 using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 
-
 void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& inPacket,
                                                    Entity::PlayerPtr pPlayer )
 {
diff --git a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
index e2a09f87..69e6d79a 100644
--- a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
@@ -1,6 +1,5 @@
 #include <src/servers/Server_Common/Common.h>
 #include <src/servers/Server_Common/Network/CommonNetwork.h>
-#include <src/servers/Server_Common/Database/Database.h>
 #include <src/servers/Server_Common/Network/GamePacketNew.h>
 #include <src/servers/Server_Common/Logging/Logger.h>
 #include <src/servers/Server_Common/Exd/ExdData.h>
@@ -37,7 +36,6 @@
 #include "src/servers/Server_Zone/Action/ActionTeleport.h"
 
 extern Core::Logger g_log;
-extern Core::Db::Database g_database;
 extern Core::ServerZone g_serverZone;
 extern Core::ZoneMgr g_zoneMgr;
 extern Core::Data::ExdData g_exdData;
diff --git a/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp b/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp
index 43eb449c..752876a7 100644
--- a/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp
@@ -1,6 +1,5 @@
 #include <src/servers/Server_Common/Common.h>
 #include <src/servers/Server_Common/Network/CommonNetwork.h>
-#include <src/servers/Server_Common/Database/Database.h>
 #include <src/servers/Server_Common/Network/GamePacketNew.h>
 #include <src/servers/Server_Common/Logging/Logger.h>
 #include <src/servers/Server_Common/Exd/ExdData.h>
@@ -27,7 +26,6 @@
 #include "src/servers/Server_Zone/Forwards.h"
 
 extern Core::Logger g_log;
-extern Core::Db::Database g_database;
 extern Core::ServerZone g_serverZone;
 extern Core::ZoneMgr g_zoneMgr;
 extern Core::Data::ExdData g_exdData;