Swap saving now works correctly except for cursor items which wont be reloaded correctly as we don't send cursor on login yet. Also added check for bag into another bag src bag needs to have nothing in it first.

zone/client_packet.cpp

@@ -47,6 +47,7 @@
 #include "../common/spdat.h"
 #include "../common/string_util.h"
 #include "../common/zone_numbers.h"
+#include "../common/inventory_db_data_model.h"
 #include "event_codes.h"
 #include "guild_mgr.h"
 #include "merc.h"
@@ -1289,6 +1290,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 	m_inventory.SetRace(GetBaseRace());
 	m_inventory.SetClass(GetBaseClass());
 	m_inventory.SetDeity(GetDeity());
+	m_inventory.SetDataModel(new EQEmu::InventoryDatabaseDataModel(&database, CharacterID()));
 	loaditems = database.GetInventory(cid, &m_inventory); /* Load Character Inventory */
 
 	/* Load AdventureStats */