From 7cedbb0b16b02f73492c6843866e0260b95d7dc0 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Sat, 15 Apr 2017 14:31:36 -0400 Subject: [PATCH] Take into account world object's item if it has one for TS This might break some pre-existing combines ... --- zone/tradeskills.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index ab9167a4b..262f46234 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -272,6 +272,12 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob c_type = worldo->m_type; inst = worldo->m_inst; 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 { inst = user_inv.GetItem(in_combine->container_slot);