mirror of
https://github.com/EQEmu/Server.git
synced 2026-09-02 12:36:36 +00:00
[Repositories] Cleanup and Convert Character Creation to Repositories (#4053)
* [Repositories] Cleanup and Convert Character Creation to Repositories # Notes - Converts `Database::GetCharacterID()`, `Database::SaveCharacterCreate()`, and `Client::OPCharCreate` to repositories. - Cleanup a spot we were doing a queries in a loop. * Cleanup * Update database.cpp * Update database.cpp
This commit is contained in:
+3
-3
@@ -1161,7 +1161,7 @@ void Expedition::AddLockoutByCharacterName(
|
||||
{
|
||||
if (!character_name.empty())
|
||||
{
|
||||
uint32_t character_id = database.GetCharacterID(character_name.c_str());
|
||||
uint32_t character_id = database.GetCharacterID(character_name);
|
||||
AddLockoutByCharacterID(character_id, expedition_name, event_name, seconds, uuid);
|
||||
}
|
||||
}
|
||||
@@ -1180,7 +1180,7 @@ bool Expedition::HasLockoutByCharacterName(
|
||||
{
|
||||
if (!character_name.empty())
|
||||
{
|
||||
uint32_t character_id = database.GetCharacterID(character_name.c_str());
|
||||
uint32_t character_id = database.GetCharacterID(character_name);
|
||||
return HasLockoutByCharacterID(character_id, expedition_name, event_name);
|
||||
}
|
||||
return false;
|
||||
@@ -1214,7 +1214,7 @@ void Expedition::RemoveLockoutsByCharacterName(
|
||||
{
|
||||
if (!character_name.empty())
|
||||
{
|
||||
uint32_t character_id = database.GetCharacterID(character_name.c_str());
|
||||
uint32_t character_id = database.GetCharacterID(character_name);
|
||||
RemoveLockoutsByCharacterID(character_id, expedition_name, event_name);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -126,7 +126,7 @@ bool ExpeditionRequest::CanGroupRequest(Group* group)
|
||||
|
||||
// Group::GetLeaderName() is broken if group formed across zones, ask database instead
|
||||
m_leader_name = m_leader ? m_leader->GetName() : GetGroupLeaderName(group->GetID()); // group->GetLeaderName();
|
||||
m_leader_id = m_leader ? m_leader->CharacterID() : database.GetCharacterID(m_leader_name.c_str());
|
||||
m_leader_id = m_leader ? m_leader->CharacterID() : database.GetCharacterID(m_leader_name);
|
||||
|
||||
std::vector<std::string> member_names;
|
||||
member_names.emplace_back(m_leader_name); // leader always added first
|
||||
|
||||
@@ -80,7 +80,7 @@ void command_instance(Client *c, const Seperator *sep)
|
||||
|
||||
std::string character_name = sep->arg[3];
|
||||
uint16 instance_id = static_cast<uint16>(Strings::ToUnsignedInt(sep->arg[2]));
|
||||
uint32 character_id = database.GetCharacterID(character_name.c_str());
|
||||
uint32 character_id = database.GetCharacterID(character_name);
|
||||
if (instance_id <= 0 || character_id <= 0) {
|
||||
c->Message(Chat::White, "You must enter a valid Instance ID and player name.");
|
||||
return;
|
||||
@@ -270,7 +270,7 @@ void command_instance(Client *c, const Seperator *sep)
|
||||
|
||||
std::string character_name = sep->arg[3];
|
||||
uint16 instance_id = static_cast<uint16>(Strings::ToUnsignedInt(sep->arg[2]));
|
||||
uint32 character_id = database.GetCharacterID(character_name.c_str());
|
||||
uint32 character_id = database.GetCharacterID(character_name);
|
||||
if (instance_id <= 0 || character_id <= 0) {
|
||||
c->Message(Chat::White, "You must enter a valid Instance ID and player name.");
|
||||
return;
|
||||
|
||||
@@ -13,7 +13,7 @@ void command_movechar(Client *c, const Seperator *sep)
|
||||
database.GetCharNameByID(Strings::ToUnsignedInt(sep->arg[1])) :
|
||||
sep->arg[1]
|
||||
);
|
||||
const uint32 character_id = database.GetCharacterID(character_name.c_str());
|
||||
const uint32 character_id = database.GetCharacterID(character_name);
|
||||
if (!character_id) {
|
||||
c->Message(
|
||||
Chat::White,
|
||||
|
||||
@@ -16,7 +16,7 @@ void command_summon(Client *c, const Seperator *sep)
|
||||
|
||||
if (arguments == 1) {
|
||||
std::string character_name = sep->arg[1];
|
||||
auto character_id = database.GetCharacterID(character_name.c_str());
|
||||
auto character_id = database.GetCharacterID(character_name);
|
||||
if (!character_id) {
|
||||
c->Message(
|
||||
Chat::White,
|
||||
|
||||
Reference in New Issue
Block a user