From eb158e1847d41fa32378f4b98947ec5a88dbd1ae Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 8 Mar 2015 16:29:13 +0100 Subject: Core/DataStores: Fixed a crash happening when TaxiNodes.db2 fails to load Closes #14313 --- src/server/game/DataStores/DB2Stores.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/server') diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp index 3efb2297c93..df7496e4d94 100644 --- a/src/server/game/DataStores/DB2Stores.cpp +++ b/src/server/game/DataStores/DB2Stores.cpp @@ -242,9 +242,12 @@ void DB2Manager::LoadStores(std::string const& dataPath) // Initialize global taxinodes mask // include existed nodes that have at least single not spell base (scripted) path { - ASSERT(TaxiMaskSize >= ((sTaxiNodesStore.GetNumRows() - 1) / 8) + 1, - "TaxiMaskSize is not large enough to contain all taxi nodes! (current value %d, required %d)", - TaxiMaskSize, (((sTaxiNodesStore.GetNumRows() - 1) / 8) + 1)); + if (sTaxiNodesStore.GetNumRows()) + { + ASSERT(TaxiMaskSize >= ((sTaxiNodesStore.GetNumRows() - 1) / 8) + 1, + "TaxiMaskSize is not large enough to contain all taxi nodes! (current value %d, required %d)", + TaxiMaskSize, (((sTaxiNodesStore.GetNumRows() - 1) / 8) + 1)); + } std::set spellPaths; for (SpellEffectEntry const* sInfo : sSpellEffectStore) -- cgit v1.2.3