pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 10:31:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Take into account world object's item if it has one for TS

Browse Source 
This might break some pre-existing combines ...
This commit is contained in:
Michael Cook (mackal) 2017-04-15 14:31:36 -04:00
parent 1f065d7d3d
commit 7cedbb0b16
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zone/tradeskills.cpp
View File

@ -272,6 +272,12 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
c_type = worldo->m_type; c_type = worldo->m_type;
inst = worldo->m_inst; inst = worldo->m_inst;
worldcontainer=true; worldcontainer=true;
// if we're a world container with an item, use that too
if (inst) {
const EQEmu::ItemData* item = inst->GetItem();
if (item)
some_id = item->ID;
}
} }
else { else {
inst = user_inv.GetItem(in_combine->container_slot); inst = user_inv.GetItem(in_combine->container_slot);