From bf139c3d34c09eeabafe8f22ca64a670e203c075 Mon Sep 17 00:00:00 2001 From: yehonal Date: Mon, 27 Jun 2016 00:19:46 +0200 Subject: Removing multi-vendor Rochet2 patch It caused compilation errors too --- src/server/game/Handlers/ItemHandler.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/server/game/Handlers') diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index 153ae31079..50fcd7f025 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -724,7 +724,7 @@ void WorldSession::HandleListInventoryOpcode(WorldPacket & recvData) SendListInventory(guid); } -void WorldSession::SendListInventory(uint64 vendorGuid, uint32 vendorEntry) +void WorldSession::SendListInventory(uint64 vendorGuid) { ;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_LIST_INVENTORY"); @@ -744,9 +744,7 @@ void WorldSession::SendListInventory(uint64 vendorGuid, uint32 vendorEntry) if (vendor->HasUnitState(UNIT_STATE_MOVING)) vendor->StopMoving(); - SetCurrentVendor(vendorEntry); - - VendorItemData const* items = vendorEntry ? sObjectMgr->GetNpcVendorItemList(vendorEntry) : vendor->GetVendorItems(); + VendorItemData const* items = vendor->GetVendorItems(); if (!items) { WorldPacket data(SMSG_LIST_INVENTORY, 8 + 1 + 1); -- cgit v1.2.3