diff --git a/ucs/database.cpp b/ucs/database.cpp index fbbfdeac6..7cd5b7d09 100644 --- a/ucs/database.cpp +++ b/ucs/database.cpp @@ -508,8 +508,6 @@ void Database::ExpireMail() { results = QueryDatabase(query); if(results.Success()) Log.Out(Logs::Detail, Logs::UCS_Server, "Expired %i trash messages.", results.RowsAffected()); - else - } // Expire Read @@ -519,7 +517,6 @@ void Database::ExpireMail() { results = QueryDatabase(query); if(results.Success()) Log.Out(Logs::Detail, Logs::UCS_Server, "Expired %i read messages.", results.RowsAffected()); - else } // Expire Unread @@ -529,7 +526,6 @@ void Database::ExpireMail() { results = QueryDatabase(query); if(results.Success()) Log.Out(Logs::Detail, Logs::UCS_Server, "Expired %i unread messages.", results.RowsAffected()); - else } } @@ -539,8 +535,7 @@ void Database::AddFriendOrIgnore(int charID, int type, std::string name) { "VALUES('%i', %i, '%s')", charID, type, CapitaliseName(name).c_str()); auto results = QueryDatabase(query); - if(!results.Success()) - else + if(results.Success()) Log.Out(Logs::Detail, Logs::UCS_Server, "Wrote Friend/Ignore entry for charid %i, type %i, name %s to database.", charID, type, name.c_str()); } diff --git a/world/adventure.cpp b/world/adventure.cpp index e0a5aae18..40becd855 100644 --- a/world/adventure.cpp +++ b/world/adventure.cpp @@ -402,8 +402,7 @@ void Adventure::MoveCorpsesToGraveyard() "x = %f, y = %f, z = %f WHERE instanceid = %d", GetTemplate()->graveyard_zone_id, x, y, z, GetInstanceID()); - auto results = database.QueryDatabase(query); - if(!results.Success()) + database.QueryDatabase(query); } auto c_iter = charid_list.begin(); diff --git a/zone/petitions.cpp b/zone/petitions.cpp index 2d810564d..bcca6aabf 100644 --- a/zone/petitions.cpp +++ b/zone/petitions.cpp @@ -212,8 +212,6 @@ void ZoneDatabase::DeletePetitionFromDB(Petition* wpet) { std::string query = StringFormat("DELETE FROM petitions WHERE petid = %i", wpet->GetID()); auto results = QueryDatabase(query); - if (!results.Success()) - } void ZoneDatabase::UpdatePetitionToDB(Petition* wpet) { diff --git a/zone/spawn2.cpp b/zone/spawn2.cpp index 77adcddb2..6fc314a11 100644 --- a/zone/spawn2.cpp +++ b/zone/spawn2.cpp @@ -668,9 +668,7 @@ void SpawnConditionManager::UpdateDBEvent(SpawnEvent &event) { event.next.day, event.next.month, event.next.year, event.enabled? 1: 0, event.strict? 1: 0, event.id); - auto results = database.QueryDatabase(query); - if(!results.Success()) - + database.QueryDatabase(query); } void SpawnConditionManager::UpdateDBCondition(const char* zone_name, uint32 instance_id, uint16 cond_id, int16 value) { @@ -679,9 +677,7 @@ void SpawnConditionManager::UpdateDBCondition(const char* zone_name, uint32 inst "(id, value, zone, instance_id) " "VALUES( %u, %u, '%s', %u)", cond_id, value, zone_name, instance_id); - auto results = database.QueryDatabase(query); - if(!results.Success()) - + database.QueryDatabase(query); } bool SpawnConditionManager::LoadDBEvent(uint32 event_id, SpawnEvent &event, std::string &zone_name) { diff --git a/zone/tasks.cpp b/zone/tasks.cpp index 0673e51c8..fbc5ae3b5 100644 --- a/zone/tasks.cpp +++ b/zone/tasks.cpp @@ -723,9 +723,7 @@ void ClientTaskState::EnableTask(int characterID, int taskCount, int *tasks) { std::string query = queryStream.str(); Log.Out(Logs::General, Logs::Tasks, "[UPDATE] Executing query %s", query.c_str()); - auto results = database.QueryDatabase(query); - if(!results.Success()) - + database.QueryDatabase(query); } void ClientTaskState::DisableTask(int charID, int taskCount, int *taskList) { diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index ec3dd46d3..a973f9a97 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -1457,8 +1457,7 @@ void ZoneDatabase::UpdateRecipeMadecount(uint32 recipe_id, uint32 char_id, uint3 "SET recipe_id = %u, char_id = %u, madecount = %u " "ON DUPLICATE KEY UPDATE madecount = %u;", recipe_id, char_id, madeCount, madeCount); - auto results = QueryDatabase(query); - if (!results.Success()) + QueryDatabase(query); } void Client::LearnRecipe(uint32 recipeID)