From 27fe6512595e4f2bc1d2ed9d8ea79bcbd142043c Mon Sep 17 00:00:00 2001 From: Mordred Admin Date: Mon, 17 Sep 2018 14:15:08 +0200 Subject: [PATCH] Merge error fix --- src/servers/sapphire_zone/Actor/PlayerInventory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/servers/sapphire_zone/Actor/PlayerInventory.cpp b/src/servers/sapphire_zone/Actor/PlayerInventory.cpp index d77c5523..5b5164df 100644 --- a/src/servers/sapphire_zone/Actor/PlayerInventory.cpp +++ b/src/servers/sapphire_zone/Actor/PlayerInventory.cpp @@ -428,7 +428,7 @@ void Core::Entity::Player::writeInventory( InventoryType type ) void Core::Entity::Player::writeItem( Core::ItemPtr pItem ) const { - auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >(); + auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto stmt = pDb->getPreparedStatement( Db::CHARA_ITEMGLOBAL_UP ); // todo: add more fields @@ -443,7 +443,7 @@ void Core::Entity::Player::writeItem( Core::ItemPtr pItem ) const void Core::Entity::Player::deleteItemDb( Core::ItemPtr item ) const { - auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >(); + auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto stmt = pDb->getPreparedStatement( Db::CHARA_ITEMGLOBAL_DELETE ); stmt->setInt64( 1, item->getUId() );