From 2d6a48840c3f433d3d68497b63c6218a1f348e17 Mon Sep 17 00:00:00 2001
From: joschiwald <joschiwald@online.de>
Date: Sun, 21 Jul 2013 13:37:34 +0200
Subject: Core/Spells: use SpellInfo class to get spell rank instead of
 SpellMgr helpers

---
 src/server/game/Globals/ObjectMgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/server/game/Globals/ObjectMgr.cpp')

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 8a970963c37..a93248fb9bd 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -4888,7 +4888,7 @@ void ObjectMgr::LoadSpellScriptNames()
             while (spellInfo)
             {
                 _spellScriptsStore.insert(SpellScriptsContainer::value_type(spellInfo->Id, GetScriptId(scriptName)));
-                spellInfo = sSpellMgr->GetSpellInfo(spellInfo->Id)->GetNextRankSpell();
+                spellInfo = spellInfo->GetNextRankSpell();
             }
         }
         else
-- 
cgit v1.2.3


From 3a4e3a5fa94ca7191448dbd79dee9c7a8494dde7 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Mon, 22 Jul 2013 17:12:29 +0200
Subject: 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
---
 src/server/game/Globals/ObjectMgr.cpp    | 9 ---------
 src/server/game/Handlers/ItemHandler.cpp | 5 +++--
 2 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'src/server/game/Globals/ObjectMgr.cpp')

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 8a970963c37..817aafb18dc 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -8362,15 +8362,6 @@ bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 max
         return false;
     }
 
-    if (vItems->GetItemCount() >= MAX_VENDOR_ITEMS)
-    {
-        if (player)
-            ChatHandler(player->GetSession()).SendSysMessage(LANG_COMMAND_ADDVENDORITEMITEMS);
-        else
-            TC_LOG_ERROR(LOG_FILTER_SQL, "Table `npc_vendor` has too many items (%u >= %i) for vendor (Entry: %u), ignore", vItems->GetItemCount(), MAX_VENDOR_ITEMS, vendor_entry);
-        return false;
-    }
-
     return true;
 }
 
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;
             }
         }
     }
-- 
cgit v1.2.3