Misc/Vendor:

- Fix more vendors without maxcount
- Add log/skip for type currency with missing maxcount

2 files changed, 8 insertions, 0 deletions

diff --git a/sql/updates/world/2013_08_03_01_world_npc_vendor_434.sql b/sql/updates/world/2013_08_03_01_world_npc_vendor_434.sql
new file mode 100644
index 00000000000..7359f10c31d
--- /dev/null
+++ b/sql/updates/world/2013_08_03_01_world_npc_vendor_434.sql
@@ -0,0 +1,2 @@
+UPDATE `npc_vendor` SET `maxcount`=25000 WHERE `item`=390 AND `ExtendedCost`=3411 AND `type`=2;
+UPDATE `npc_vendor` SET `maxcount`=25000 WHERE `item`=395 AND `ExtendedCost`=3410 AND `type`=2;
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index c0fc7a7b681..6195f250aee 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -8388,6 +8388,12 @@ bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 id, int32 maxcount
         return false;
     }
 
+    if (type == ITEM_VENDOR_TYPE_CURRENCY && maxcount == 0)
+    {
+        TC_LOG_ERROR(LOG_FILTER_SQL, "Table `(game_event_)npc_vendor` have Item (Entry: %u, type: %u) with missing maxcount for vendor (%u), ignore", id, type, ExtendedCost, vendor_entry);
+        return false;
+    }
+
     return true;
 }