Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Entities/Item/ItemEnchantmentMgr.cpp src/server/game/Events/GameEventMgr.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Guilds/GuildMgr.cpp src/server/game/Loot/LootMgr.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Spells/SpellMgr.cpp src/server/worldserver/worldserver.conf.dist
This commit is contained in:
commit
4e46f7ced6
9 files changed
+144
-56
No files matched your search
@@ -2564,7 +2564,6 @@ void ObjectMgr::LoadItemTemplateAddon()
|
||||
++count;
|
||||
} while (result->NextRow());
|
||||
}
|
||||
|
||||
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u item addon templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
|
||||
}
|
||||
|
||||
@@ -2593,7 +2592,6 @@ void ObjectMgr::LoadItemScriptNames()
|
||||
|
||||
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u item script names in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
|
||||
}
|
||||
|
||||
ItemTemplate const* ObjectMgr::GetItemTemplate(uint32 entry)
|
||||
{
|
||||
ItemTemplateContainer::const_iterator itr = _itemTemplateStore.find(entry);
|
||||
@@ -8610,7 +8608,6 @@ void ObjectMgr::LoadHotfixData()
|
||||
info.Entry = fields[0].GetUInt32();
|
||||
info.Type = fields[1].GetUInt32();
|
||||
info.Timestamp = fields[2].GetUInt64();
|
||||
|
||||
_hotfixData.push_back(info);
|
||||
++count;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user