Core/Creatures: Removed vendor item check during loading, MAX_VENDOR_ITEMS should apply to filtered list of items depending on player opening the vendor, not global list size

Closes #10330

1 files changed, 3 insertions, 2 deletions

diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp
index 90c1bc4599f..5f458edbb07 100644
--- a/src/server/game/Handlers/ItemHandler.cpp
+++ b/src/server/game/Handlers/ItemHandler.cpp
@@ -784,8 +784,6 @@ void WorldSession::SendListInventory(uint64 vendorGuid)
                     continue;
                 }
 
-                ++count;
-
                 // reputation discount
                 int32 price = item->IsGoldRequired(itemTemplate) ? uint32(floor(itemTemplate->BuyPrice * discountMod)) : 0;
 
@@ -797,6 +795,9 @@ void WorldSession::SendListInventory(uint64 vendorGuid)
                 data << uint32(itemTemplate->MaxDurability);
                 data << uint32(itemTemplate->BuyCount);
                 data << uint32(item->ExtendedCost);
+
+                if (++count >= MAX_VENDOR_ITEMS)
+                    break;
             }
         }
     }