@@ -181,7 +181,7 @@ namespace AccountMgr
|
|||||||
PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_LOGON);
|
PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_LOGON);
|
||||||
stmt->setBinary(0, salt);
|
stmt->setBinary(0, salt);
|
||||||
stmt->setBinary(1, verifier);
|
stmt->setBinary(1, verifier);
|
||||||
stmt->setUInt32(2, accountId);;
|
stmt->setUInt32(2, accountId);
|
||||||
LoginDatabase.Execute(stmt);
|
LoginDatabase.Execute(stmt);
|
||||||
|
|
||||||
sScriptMgr->OnPasswordChange(accountId);
|
sScriptMgr->OnPasswordChange(accountId);
|
||||||
|
|||||||
@@ -235,7 +235,7 @@ bool ArenaTeam::LoadMembersFromDB(QueryResult result)
|
|||||||
//newMember.Name = fields[6].GetString();
|
//newMember.Name = fields[6].GetString();
|
||||||
newMember.Class = fields[7].GetUInt8();
|
newMember.Class = fields[7].GetUInt8();
|
||||||
newMember.PersonalRating = fields[8].GetUInt16();
|
newMember.PersonalRating = fields[8].GetUInt16();
|
||||||
newMember.MatchMakerRating = fields[9].GetUInt16() > 0 ? fields[9].GetUInt16() : sWorld->getIntConfig(CONFIG_ARENA_START_MATCHMAKER_RATING);;
|
newMember.MatchMakerRating = fields[9].GetUInt16() > 0 ? fields[9].GetUInt16() : sWorld->getIntConfig(CONFIG_ARENA_START_MATCHMAKER_RATING);
|
||||||
newMember.MaxMMR = std::max(fields[10].GetUInt16(), newMember.MatchMakerRating);
|
newMember.MaxMMR = std::max(fields[10].GetUInt16(), newMember.MatchMakerRating);
|
||||||
|
|
||||||
// Delete member if character information is missing
|
// Delete member if character information is missing
|
||||||
|
|||||||
@@ -485,7 +485,7 @@ float ThreatManager::getThreatWithoutTemp(Unit* victim, bool alsoSearchOfflineLi
|
|||||||
if (!ref && alsoSearchOfflineList)
|
if (!ref && alsoSearchOfflineList)
|
||||||
ref = iThreatOfflineContainer.getReferenceByTarget(victim);
|
ref = iThreatOfflineContainer.getReferenceByTarget(victim);
|
||||||
if (ref)
|
if (ref)
|
||||||
threat = ref->getThreat() - ref->getTempThreatModifier();;
|
threat = ref->getThreat() - ref->getTempThreatModifier();
|
||||||
return threat;
|
return threat;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -274,7 +274,6 @@ namespace lfg
|
|||||||
// Store group so we don't need to call Mgr to get it later (if it's player group will be 0 otherwise would have joined as group)
|
// Store group so we don't need to call Mgr to get it later (if it's player group will be 0 otherwise would have joined as group)
|
||||||
for (LfgRolesMap::const_iterator it2 = itQueue->second.roles.begin(); it2 != itQueue->second.roles.end(); ++it2)
|
for (LfgRolesMap::const_iterator it2 = itQueue->second.roles.begin(); it2 != itQueue->second.roles.end(); ++it2)
|
||||||
proposalGroups[it2->first] = itQueue->first.IsGroup() ? itQueue->first : ObjectGuid::Empty;
|
proposalGroups[it2->first] = itQueue->first.IsGroup() ? itQueue->first : ObjectGuid::Empty;
|
||||||
;
|
|
||||||
|
|
||||||
numPlayers += itQueue->second.roles.size();
|
numPlayers += itQueue->second.roles.size();
|
||||||
|
|
||||||
|
|||||||
@@ -2450,7 +2450,7 @@ void WorldObject::GetCreatureListWithEntryInGrid(std::list<Creature*>& creatureL
|
|||||||
{
|
{
|
||||||
Acore::AllCreaturesOfEntryInRange check(this, entry, maxSearchRange);
|
Acore::AllCreaturesOfEntryInRange check(this, entry, maxSearchRange);
|
||||||
Acore::CreatureListSearcher<Acore::AllCreaturesOfEntryInRange> searcher(this, creatureList, check);
|
Acore::CreatureListSearcher<Acore::AllCreaturesOfEntryInRange> searcher(this, creatureList, check);
|
||||||
Cell::VisitGridObjects(this, searcher, maxSearchRange);;
|
Cell::VisitGridObjects(this, searcher, maxSearchRange);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ class GameEventMgr
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
GameEventMgr();
|
GameEventMgr();
|
||||||
~GameEventMgr() = default;;
|
~GameEventMgr() = default;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static GameEventMgr* instance();
|
static GameEventMgr* instance();
|
||||||
|
|||||||
@@ -693,7 +693,7 @@ void ObjectMgr::LoadCreatureTemplateSpells()
|
|||||||
}
|
}
|
||||||
|
|
||||||
CreatureTemplate& creatureTemplate = itr->second;
|
CreatureTemplate& creatureTemplate = itr->second;
|
||||||
creatureTemplate.spells[index] = fields[2].GetUInt32();;
|
creatureTemplate.spells[index] = fields[2].GetUInt32();
|
||||||
|
|
||||||
++count;
|
++count;
|
||||||
} while (result->NextRow());
|
} while (result->NextRow());
|
||||||
|
|||||||
@@ -187,7 +187,7 @@ protected:
|
|||||||
uint8 CharCount;
|
uint8 CharCount;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
virtual ~CharacterCreateInfo() = default;;
|
virtual ~CharacterCreateInfo() = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct PacketCounter
|
struct PacketCounter
|
||||||
|
|||||||
@@ -2021,7 +2021,7 @@ void SpellMgr::LoadSpellMixology()
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
mSpellMixologyMap[entry] = fields[1].GetFloat();;
|
mSpellMixologyMap[entry] = fields[1].GetFloat();
|
||||||
++count;
|
++count;
|
||||||
} while (result->NextRow());
|
} while (result->NextRow());
|
||||||
|
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ class Weather
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Weather(uint32 zone, WeatherData const* weatherChances);
|
Weather(uint32 zone, WeatherData const* weatherChances);
|
||||||
~Weather() = default;;
|
~Weather() = default;
|
||||||
|
|
||||||
bool Update(uint32 diff);
|
bool Update(uint32 diff);
|
||||||
bool ReGenerate();
|
bool ReGenerate();
|
||||||
|
|||||||
+1
-1
@@ -173,7 +173,7 @@ public:
|
|||||||
case EVENT_SPEECH_7:
|
case EVENT_SPEECH_7:
|
||||||
me->setFaction(103);
|
me->setFaction(103);
|
||||||
if (PlayerGUID && ObjectAccessor::GetUnit(*me, PlayerGUID))
|
if (PlayerGUID && ObjectAccessor::GetUnit(*me, PlayerGUID))
|
||||||
AttackStart(ObjectAccessor::GetUnit(*me, PlayerGUID));;
|
AttackStart(ObjectAccessor::GetUnit(*me, PlayerGUID));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -679,7 +679,7 @@ public:
|
|||||||
if( Unit* c = v->GetBase() )
|
if( Unit* c = v->GetBase() )
|
||||||
if( c->GetTypeId() == TYPEID_UNIT && c->ToCreature()->GetEntry() == (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_BATTLEWORG : VEHICLE_ARGENT_WARHORSE) )
|
if( c->GetTypeId() == TYPEID_UNIT && c->ToCreature()->GetEntry() == (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_BATTLEWORG : VEHICLE_ARGENT_WARHORSE) )
|
||||||
{
|
{
|
||||||
me->GetMotionMaster()->MovementExpired();;
|
me->GetMotionMaster()->MovementExpired();
|
||||||
me->GetMotionMaster()->MoveIdle();
|
me->GetMotionMaster()->MoveIdle();
|
||||||
me->StopMoving();
|
me->StopMoving();
|
||||||
me->CastSpell(me, SPELL_TRAMPLE_STUN, false);
|
me->CastSpell(me, SPELL_TRAMPLE_STUN, false);
|
||||||
|
|||||||
@@ -232,7 +232,7 @@ public:
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
if (summoner->ToCreature())
|
if (summoner->ToCreature())
|
||||||
casterGUID = summoner->ToCreature()->GetGUID();;
|
casterGUID = summoner->ToCreature()->GetGUID();
|
||||||
}
|
}
|
||||||
|
|
||||||
void JustDied(Unit* /*killer*/) override
|
void JustDied(Unit* /*killer*/) override
|
||||||
|
|||||||
Reference in New Issue
Block a user