Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Entities/Creature/Creature.h src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Unit/Unit.h src/server/game/Globals/ObjectMgr.cpp src/server/game/Handlers/CharacterHandler.cpp
This commit is contained in:
commit
7ce02e7900
23 files changed
+1890
-1001
No files matched your search
@@ -7672,13 +7672,13 @@ uint32 ObjectMgr::GetAreaTriggerScriptId(uint32 trigger_id)
|
||||
return 0;
|
||||
}
|
||||
|
||||
SpellScriptsBounds ObjectMgr::GetSpellScriptsBounds(uint32 spell_id)
|
||||
SpellScriptsBounds ObjectMgr::GetSpellScriptsBounds(uint32 spellId)
|
||||
{
|
||||
return SpellScriptsBounds(_spellScriptsStore.lower_bound(spell_id), _spellScriptsStore.upper_bound(spell_id));
|
||||
return SpellScriptsBounds(_spellScriptsStore.equal_range(spellId));
|
||||
}
|
||||
|
||||
// this allows calculating base reputations to offline players, just by race and class
|
||||
int32 ObjectMgr::GetBaseReputationOff(FactionEntry const* factionEntry, uint8 race, uint8 playerClass)
|
||||
int32 ObjectMgr::GetBaseReputationOf(FactionEntry const* factionEntry, uint8 race, uint8 playerClass)
|
||||
{
|
||||
if (!factionEntry)
|
||||
return 0;
|
||||
@@ -8595,11 +8595,11 @@ void ObjectMgr::LoadFactionChangeAchievements()
|
||||
uint32 horde = fields[1].GetUInt32();
|
||||
|
||||
if (!sAchievementMgr->GetAchievement(alliance))
|
||||
sLog->outError(LOG_FILTER_SQL, "Achievement %u referenced in `player_factionchange_achievement` does not exist, pair skipped!", alliance);
|
||||
sLog->outError(LOG_FILTER_SQL, "Achievement %u (alliance_id) referenced in `player_factionchange_achievement` does not exist, pair skipped!", alliance);
|
||||
else if (!sAchievementMgr->GetAchievement(horde))
|
||||
sLog->outError(LOG_FILTER_SQL, "Achievement %u referenced in `player_factionchange_achievement` does not exist, pair skipped!", horde);
|
||||
sLog->outError(LOG_FILTER_SQL, "Achievement %u (horde_id) referenced in `player_factionchange_achievement` does not exist, pair skipped!", horde);
|
||||
else
|
||||
FactionChange_Achievements[alliance] = horde;
|
||||
FactionChangeAchievements[alliance] = horde;
|
||||
|
||||
++count;
|
||||
}
|
||||
@@ -8630,11 +8630,11 @@ void ObjectMgr::LoadFactionChangeItems()
|
||||
uint32 horde = fields[1].GetUInt32();
|
||||
|
||||
if (!GetItemTemplate(alliance))
|
||||
sLog->outError(LOG_FILTER_SQL, "Item %u referenced in `player_factionchange_items` does not exist, pair skipped!", alliance);
|
||||
sLog->outError(LOG_FILTER_SQL, "Item %u (alliance_id) referenced in `player_factionchange_items` does not exist, pair skipped!", alliance);
|
||||
else if (!GetItemTemplate(horde))
|
||||
sLog->outError(LOG_FILTER_SQL, "Item %u referenced in `player_factionchange_items` does not exist, pair skipped!", horde);
|
||||
sLog->outError(LOG_FILTER_SQL, "Item %u (horde_id) referenced in `player_factionchange_items` does not exist, pair skipped!", horde);
|
||||
else
|
||||
FactionChange_Items[alliance] = horde;
|
||||
FactionChangeItems[alliance] = horde;
|
||||
|
||||
++count;
|
||||
}
|
||||
@@ -8643,15 +8643,15 @@ void ObjectMgr::LoadFactionChangeItems()
|
||||
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u faction change item pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
|
||||
}
|
||||
|
||||
void ObjectMgr::LoadFactionChangeSpells()
|
||||
void ObjectMgr::LoadFactionChangeQuests()
|
||||
{
|
||||
uint32 oldMSTime = getMSTime();
|
||||
|
||||
QueryResult result = WorldDatabase.Query("SELECT alliance_id, horde_id FROM player_factionchange_spells");
|
||||
QueryResult result = WorldDatabase.Query("SELECT alliance_id, horde_id FROM player_factionchange_quests");
|
||||
|
||||
if (!result)
|
||||
{
|
||||
sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 faction change spell pairs. DB table `player_factionchange_spells` is empty.");
|
||||
sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 faction change quest pairs. DB table `player_factionchange_quests` is empty.");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -8664,18 +8664,18 @@ void ObjectMgr::LoadFactionChangeSpells()
|
||||
uint32 alliance = fields[0].GetUInt32();
|
||||
uint32 horde = fields[1].GetUInt32();
|
||||
|
||||
if (!sSpellMgr->GetSpellInfo(alliance))
|
||||
sLog->outError(LOG_FILTER_SQL, "Spell %u referenced in `player_factionchange_spells` does not exist, pair skipped!", alliance);
|
||||
else if (!sSpellMgr->GetSpellInfo(horde))
|
||||
sLog->outError(LOG_FILTER_SQL, "Spell %u referenced in `player_factionchange_spells` does not exist, pair skipped!", horde);
|
||||
if (!sObjectMgr->GetQuestTemplate(alliance))
|
||||
sLog->outError(LOG_FILTER_SQL, "Quest %u (alliance_id) referenced in `player_factionchange_quests` does not exist, pair skipped!", alliance);
|
||||
else if (!sObjectMgr->GetQuestTemplate(horde))
|
||||
sLog->outError(LOG_FILTER_SQL, "Quest %u (horde_id) referenced in `player_factionchange_quests` does not exist, pair skipped!", horde);
|
||||
else
|
||||
FactionChange_Spells[alliance] = horde;
|
||||
FactionChangeQuests[alliance] = horde;
|
||||
|
||||
++count;
|
||||
}
|
||||
while (result->NextRow());
|
||||
|
||||
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u faction change spell pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
|
||||
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u faction change quest pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
|
||||
}
|
||||
|
||||
void ObjectMgr::LoadFactionChangeReputations()
|
||||
@@ -8700,11 +8700,11 @@ void ObjectMgr::LoadFactionChangeReputations()
|
||||
uint32 horde = fields[1].GetUInt32();
|
||||
|
||||
if (!sFactionStore.LookupEntry(alliance))
|
||||
sLog->outError(LOG_FILTER_SQL, "Reputation %u referenced in `player_factionchange_reputations` does not exist, pair skipped!", alliance);
|
||||
sLog->outError(LOG_FILTER_SQL, "Reputation %u (alliance_id) referenced in `player_factionchange_reputations` does not exist, pair skipped!", alliance);
|
||||
else if (!sFactionStore.LookupEntry(horde))
|
||||
sLog->outError(LOG_FILTER_SQL, "Reputation %u referenced in `player_factionchange_reputations` does not exist, pair skipped!", horde);
|
||||
sLog->outError(LOG_FILTER_SQL, "Reputation %u (horde_id) referenced in `player_factionchange_reputations` does not exist, pair skipped!", horde);
|
||||
else
|
||||
FactionChange_Reputation[alliance] = horde;
|
||||
FactionChangeReputation[alliance] = horde;
|
||||
|
||||
++count;
|
||||
}
|
||||
@@ -8738,6 +8738,7 @@ void ObjectMgr::LoadHotfixData()
|
||||
info.Type = fields[1].GetUInt32();
|
||||
info.Timestamp = fields[2].GetUInt64();
|
||||
_hotfixData.push_back(info);
|
||||
|
||||
++count;
|
||||
}
|
||||
while (result->NextRow());
|
||||
@@ -8745,6 +8746,41 @@ void ObjectMgr::LoadHotfixData()
|
||||
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u hotfix info entries in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
|
||||
}
|
||||
|
||||
void ObjectMgr::LoadFactionChangeSpells()
|
||||
{
|
||||
uint32 oldMSTime = getMSTime();
|
||||
|
||||
QueryResult result = WorldDatabase.Query("SELECT alliance_id, horde_id FROM player_factionchange_spells");
|
||||
|
||||
if (!result)
|
||||
{
|
||||
sLog->outError(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 faction change spell pairs. DB table `player_factionchange_spells` is empty.");
|
||||
return;
|
||||
}
|
||||
|
||||
uint32 count = 0;
|
||||
|
||||
do
|
||||
{
|
||||
Field* fields = result->Fetch();
|
||||
|
||||
uint32 alliance = fields[0].GetUInt32();
|
||||
uint32 horde = fields[1].GetUInt32();
|
||||
|
||||
if (!sSpellMgr->GetSpellInfo(alliance))
|
||||
sLog->outError(LOG_FILTER_SQL, "Spell %u (alliance_id) referenced in `player_factionchange_spells` does not exist, pair skipped!", alliance);
|
||||
else if (!sSpellMgr->GetSpellInfo(horde))
|
||||
sLog->outError(LOG_FILTER_SQL, "Spell %u (horde_id) referenced in `player_factionchange_spells` does not exist, pair skipped!", horde);
|
||||
else
|
||||
FactionChangeSpells[alliance] = horde;
|
||||
|
||||
++count;
|
||||
}
|
||||
while (result->NextRow());
|
||||
|
||||
sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u faction change spell pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
|
||||
}
|
||||
|
||||
void ObjectMgr::LoadFactionChangeTitles()
|
||||
{
|
||||
uint32 oldMSTime = getMSTime();
|
||||
@@ -8767,11 +8803,11 @@ void ObjectMgr::LoadFactionChangeTitles()
|
||||
uint32 horde = fields[1].GetUInt32();
|
||||
|
||||
if (!sCharTitlesStore.LookupEntry(alliance))
|
||||
sLog->outError(LOG_FILTER_SQL, "Title %u referenced in `player_factionchange_title` does not exist, pair skipped!", alliance);
|
||||
sLog->outError(LOG_FILTER_SQL, "Title %u (alliance_id) referenced in `player_factionchange_title` does not exist, pair skipped!", alliance);
|
||||
else if (!sCharTitlesStore.LookupEntry(horde))
|
||||
sLog->outError(LOG_FILTER_SQL, "Title %u referenced in `player_factionchange_title` does not exist, pair skipped!", horde);
|
||||
sLog->outError(LOG_FILTER_SQL, "Title %u (horde_id) referenced in `player_factionchange_title` does not exist, pair skipped!", horde);
|
||||
else
|
||||
FactionChange_Titles[alliance] = horde;
|
||||
FactionChangeTitles[alliance] = horde;
|
||||
|
||||
++count;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user