mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-10 19:10:25 +00:00
Truncate members after conflict checks
This more accurately matches live for the new behavior introduced in the September 16, 2020 patch. All members of a raid/group are still checked for conflicts and the truncation is only allowed if there are none. It might make sense to add a rule for this since ignoring members that would exceed the expedition max from the start makes it more convenient to create expeditions. Members that wouldn't be added anyway don't really need their conflicts checked.
This commit is contained in:
@@ -261,8 +261,8 @@ MySQLRequestResult ExpeditionDatabase::LoadMembersForCreateRequest(
|
||||
AND lockout.expedition_name = '{}'
|
||||
LEFT JOIN expedition_members member ON character_data.id = member.character_id
|
||||
WHERE character_data.name IN ({})
|
||||
ORDER BY character_data.id;
|
||||
), EscapeString(expedition_name), in_character_names_query);
|
||||
ORDER BY FIELD(character_data.name, {})
|
||||
), EscapeString(expedition_name), in_character_names_query, in_character_names_query);
|
||||
|
||||
results = database.QueryDatabase(query);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user