diff options
| -rw-r--r-- | sql/mangos.sql | 30 | ||||
| -rw-r--r-- | src/game/LootMgr.cpp | 7 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
3 files changed, 8 insertions, 31 deletions
diff --git a/sql/mangos.sql b/sql/mangos.sql index ae9773f02ae..a753455301a 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -1472,36 +1472,6 @@ CREATE TABLE `instance_template` ( LOCK TABLES `instance_template` WRITE; /*!40000 ALTER TABLE `instance_template` DISABLE KEYS */; -INSERT INTO `instance_template` VALUES -(33,0,22,30,10,10,7200,NULL,NULL,NULL,NULL,''), -(34,0,24,32,10,10,7200,NULL,NULL,NULL,NULL,''), -(36,0,15,20,10,10,7200,NULL,NULL,NULL,NULL,''), -(43,0,15,21,10,10,7200,NULL,NULL,NULL,NULL,''), -(47,0,29,38,10,10,7200,NULL,NULL,NULL,NULL,''), -(48,0,24,32,10,10,7200,NULL,NULL,NULL,NULL,''), -(70,0,35,47,10,10,7200,NULL,NULL,NULL,NULL,''), -(90,0,29,38,10,10,7200,NULL,NULL,NULL,NULL,''), -(109,0,45,55,10,10,7200,NULL,NULL,NULL,NULL,''), -(129,0,37,46,10,10,7200,NULL,NULL,NULL,NULL,''), -(189,0,34,45,10,10,7200,NULL,NULL,NULL,NULL,''), -(209,0,44,54,10,10,7200,NULL,NULL,NULL,NULL,''), -(229,0,58,0,10,10,120000,78.5083,-225.044,49.839,5.1,''), -(230,0,52,0,5,5,7200,NULL,NULL,NULL,NULL,''), -(249,0,60,0,40,40,432000,NULL,NULL,NULL,NULL,''), -(289,0,57,0,5,5,7200,NULL,NULL,NULL,NULL,''), -(309,0,60,0,20,20,259200,NULL,NULL,NULL,NULL,''), -(329,0,58,60,5,5,7200,NULL,NULL,NULL,NULL,''), -(349,0,46,55,10,10,7200,NULL,NULL,NULL,NULL,''), -(389,0,13,18,10,10,7200,NULL,NULL,NULL,NULL,''), -(409,0,60,0,40,40,604800,NULL,NULL,NULL,NULL,''), -(429,0,55,60,5,5,7200,NULL,NULL,NULL,NULL,''), -(469,0,60,0,40,40,604800,NULL,NULL,NULL,NULL,''), -(509,0,60,0,20,20,259200,NULL,NULL,NULL,NULL,''), -(531,0,60,0,40,40,604800,NULL,NULL,NULL,NULL,''), -(533,0,80,0,10,25,0,NULL,NULL,NULL,NULL,''), -(615,0,80,0,10,25,0,NULL,NULL,NULL,NULL,''), -(616,0,80,0,10,25,0,NULL,NULL,NULL,NULL,''), -(624,0,80,0,10,25,0,NULL,NULL,NULL,NULL,''); /*!40000 ALTER TABLE `instance_template` ENABLE KEYS */; UNLOCK TABLES; diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp index 77d8c780e1e..da5b4343d24 100644 --- a/src/game/LootMgr.cpp +++ b/src/game/LootMgr.cpp @@ -278,6 +278,13 @@ bool LootStoreItem::IsValid(LootStore const& store, uint32 entry) const store.GetName(), entry, itemid, chance); return false; } + + if( maxcount < mincountOrRef) // wrong max count + { + sLog.outErrorDb("Table '%s' entry %d item %d: max count (%u) less that min count (%i) - skipped", store.GetName(), entry, itemid, uint32(maxcount), mincountOrRef); + return false; + } + } else // mincountOrRef < 0 { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index fb8ea9d9143..160925670ff 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7385" + #define REVISION_NR "7387" #endif // __REVISION_NR_H__ |