aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/master/2019_06_16_01_world.sql2
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/updates/world/master/2019_06_16_01_world.sql b/sql/updates/world/master/2019_06_16_01_world.sql
new file mode 100644
index 00000000000..74a9fcdbdad
--- /dev/null
+++ b/sql/updates/world/master/2019_06_16_01_world.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `creature_template_model` DROP PRIMARY KEY;
+ALTER TABLE `creature_template_model` ADD PRIMARY KEY (`CreatureID`, `Idx`);
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index b8da6bd12dc..a3112f45956 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -947,8 +947,6 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo)
if (!cInfo->Models.size())
TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) does not have any existing display id in creature_template_model.", cInfo->Entry);
- else if (std::accumulate(cInfo->Models.begin(), cInfo->Models.end(), 0.0f, [](float sum, CreatureModel const& model) { return sum + model.Probability; }) <= 0.0f)
- TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has zero total chance for all models in creature_template_model.", cInfo->Entry);
if (!cInfo->unit_class || ((1 << (cInfo->unit_class-1)) & CLASSMASK_ALL_CREATURES) == 0)
{