Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

This commit is contained in:
Vincent_Michael committed 2013-12-18 23:48:20 +01:00
commit 2ded11354d
20 files changed
+1287 -95

No files matched your search

+2 -6
View File
@@ -68,12 +68,8 @@ Map::~Map()
Transport* transport = *itr;
++itr;
// Destroy local transports
if (transport->GetTransportTemplate()->inInstance)
{
transport->RemoveFromWorld();
delete transport;
}
transport->RemoveFromWorld();
delete transport;
}
if (!m_scriptSchedule.empty())