|
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp |
|
index f30c989..8bce7fa 100644 |
|
--- a/src/server/game/Entities/Player/Player.cpp |
|
+++ b/src/server/game/Entities/Player/Player.cpp |
|
@@ -14380,7 +14380,7 @@ void Player::PrepareGossipMenu(WorldObject* source, uint32 menuId /*= 0*/, bool |
|
break; |
|
case GOSSIP_OPTION_VENDOR: |
|
{ |
|
- VendorItemData const* vendorItems = creature->GetVendorItems(); |
|
+ VendorItemData const* vendorItems = itr->second.ActionMenuId ? sObjectMgr->GetNpcVendorItemList(itr->second.ActionMenuId) : creature->GetVendorItems(); |
|
if (!vendorItems || vendorItems->Empty()) |
|
{ |
|
TC_LOG_ERROR("sql.sql", "Creature %s (Entry: %u GUID: %u DB GUID: %u) has UNIT_NPC_FLAG_VENDOR set but has an empty trading item list.", creature->GetName().c_str(), creature->GetEntry(), creature->GetGUIDLow(), creature->GetDBTableGUIDLow()); |
|
@@ -14591,7 +14591,7 @@ void Player::OnGossipSelect(WorldObject* source, uint32 gossipListId, uint32 men |
|
break; |
|
case GOSSIP_OPTION_VENDOR: |
|
case GOSSIP_OPTION_ARMORER: |
|
- GetSession()->SendListInventory(guid); |
|
+ GetSession()->SendListInventory(guid, menuItemData->GossipActionMenuId); |
|
break; |
|
case GOSSIP_OPTION_STABLEPET: |
|
GetSession()->SendStablePet(guid); |
|
@@ -21682,7 +21682,10 @@ bool Player::BuyItemFromVendorSlot(uint64 vendorguid, uint32 vendorslot, uint32 |
|
return false; |
|
} |
|
|
|
- VendorItemData const* vItems = creature->GetVendorItems(); |
|
+ uint32 currentVendor = GetSession()->GetCurrentVendor(); |
|
+ if (currentVendor && vendorguid != PlayerTalkClass->GetGossipMenu().GetSenderGUID()) |
|
+ return false; // Cheating |
|
+ VendorItemData const* vItems = currentVendor ? sObjectMgr->GetNpcVendorItemList(currentVendor) : creature->GetVendorItems(); |
|
if (!vItems || vItems->Empty()) |
|
{ |
|
SendBuyError(BUY_ERR_CANT_FIND_ITEM, creature, item, 0); |
|
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp |
|
index 207f80e..70b0516 100644 |
|
--- a/src/server/game/Globals/ObjectMgr.cpp |
|
+++ b/src/server/game/Globals/ObjectMgr.cpp |
|
@@ -8428,6 +8428,7 @@ bool ObjectMgr::RemoveVendorItem(uint32 entry, uint32 item, bool persist /*= tru |
|
|
|
bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 maxcount, uint32 incrtime, uint32 ExtendedCost, Player* player, std::set<uint32>* skip_vendors, uint32 ORnpcflag) const |
|
{ |
|
+ /* |
|
CreatureTemplate const* cInfo = sObjectMgr->GetCreatureTemplate(vendor_entry); |
|
if (!cInfo) |
|
{ |
|
@@ -8452,6 +8453,7 @@ bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 max |
|
} |
|
return false; |
|
} |
|
+ */ |
|
|
|
if (!sObjectMgr->GetItemTemplate(item_id)) |
|
{ |
|
diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp |
|
index c4b4b35..4b29be9 100644 |
|
--- a/src/server/game/Handlers/ItemHandler.cpp |
|
+++ b/src/server/game/Handlers/ItemHandler.cpp |
|
@@ -717,7 +717,7 @@ void WorldSession::HandleListInventoryOpcode(WorldPacket& recvData) |
|
SendListInventory(guid); |
|
} |
|
|
|
-void WorldSession::SendListInventory(uint64 vendorGuid) |
|
+void WorldSession::SendListInventory(uint64 vendorGuid, uint32 vendorEntry) |
|
{ |
|
TC_LOG_DEBUG("network", "WORLD: Sent SMSG_LIST_INVENTORY"); |
|
|
|
@@ -737,7 +737,7 @@ void WorldSession::SendListInventory(uint64 vendorGuid) |
|
if (vendor->HasUnitState(UNIT_STATE_MOVING)) |
|
vendor->StopMoving(); |
|
|
|
- VendorItemData const* items = vendor->GetVendorItems(); |
|
+ VendorItemData const* items = vendorEntry ? sObjectMgr->GetNpcVendorItemList(vendorEntry) : vendor->GetVendorItems(); |
|
if (!items) |
|
{ |
|
WorldPacket data(SMSG_LIST_INVENTORY, 8 + 1 + 1); |
|
@@ -748,6 +748,8 @@ void WorldSession::SendListInventory(uint64 vendorGuid) |
|
return; |
|
} |
|
|
|
+ SetCurrentVendor(vendorEntry); |
|
+ |
|
uint8 itemCount = items->GetItemCount(); |
|
uint8 count = 0; |
|
|
|
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp |
|
index 098cc6a..c8c7719 100644 |
|
--- a/src/server/game/Server/WorldSession.cpp |
|
+++ b/src/server/game/Server/WorldSession.cpp |
|
@@ -121,6 +121,7 @@ WorldSession::WorldSession(uint32 id, WorldSocket* sock, AccountTypes sec, uint8 |
|
m_TutorialsChanged(false), |
|
recruiterId(recruiter), |
|
isRecruiter(isARecruiter), |
|
+ m_CurrentVendor(0), |
|
_RBACData(NULL) |
|
{ |
|
memset(m_Tutorials, 0, sizeof(m_Tutorials)); |
|
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h |
|
index 1b16ce8..2f812d7 100644 |
|
--- a/src/server/game/Server/WorldSession.h |
|
+++ b/src/server/game/Server/WorldSession.h |
|
@@ -244,6 +244,9 @@ class WorldSession |
|
std::string const& GetPlayerName() const; |
|
std::string GetPlayerInfo() const; |
|
|
|
+ uint32 GetCurrentVendor() const { return m_CurrentVendor; } |
|
+ void SetCurrentVendor(uint32 vendorEntry) { m_CurrentVendor = vendorEntry; } |
|
+ |
|
uint32 GetGuidLow() const; |
|
void SetSecurity(AccountTypes security) { _security = security; } |
|
std::string const& GetRemoteAddress() { return m_Address; } |
|
@@ -284,7 +287,7 @@ class WorldSession |
|
|
|
void SendTrainerList(uint64 guid); |
|
void SendTrainerList(uint64 guid, std::string const& strTitle); |
|
- void SendListInventory(uint64 guid); |
|
+ void SendListInventory(uint64 guid, uint32 vendorEntry = 0); |
|
void SendShowBank(uint64 guid); |
|
bool CanOpenMailBox(uint64 guid); |
|
void SendShowMailBox(uint64 guid); |
|
@@ -993,6 +996,7 @@ class WorldSession |
|
Player* _player; |
|
WorldSocket* m_Socket; |
|
std::string m_Address; |
|
+ uint32 m_CurrentVendor; |
|
|
|
AccountTypes _security; |
|
uint32 _accountId; |
|
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp |
|
index 28d49fe..3b58aeb 100644 |
|
--- a/src/server/scripts/Commands/cs_npc.cpp |
|
+++ b/src/server/scripts/Commands/cs_npc.cpp |
|
@@ -322,7 +322,8 @@ public: |
|
return false; |
|
} |
|
|
|
- uint32 vendor_entry = vendor->GetEntry(); |
|
+ char* addMulti = strtok(NULL, " "); |
|
+ uint32 vendor_entry = addMulti ? handler->GetSession()->GetCurrentVendor() : vendor ? vendor->GetEntry() : 0; |
|
|
|
if (!sObjectMgr->IsVendorItemValid(vendor_entry, itemId, maxcount, incrtime, extendedcost, handler->GetSession()->GetPlayer())) |
|
{ |
|
@@ -545,7 +546,8 @@ public: |
|
} |
|
uint32 itemId = atol(pitem); |
|
|
|
- if (!sObjectMgr->RemoveVendorItem(vendor->GetEntry(), itemId)) |
|
+ char* addMulti = strtok(NULL, " "); |
|
+ if (!sObjectMgr->RemoveVendorItem(addMulti ? handler->GetSession()->GetCurrentVendor() : vendor->GetEntry(), itemId)) |
|
{ |
|
handler->PSendSysMessage(LANG_ITEM_NOT_IN_LIST, itemId); |
|
handler->SetSentErrorMessage(true); |