pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-29 12:32:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Crash] Fix crash in CheckTradeskillLoreConflict (#3009)

Browse Source
This commit is contained in:
Aeadoin 2023-02-27 20:24:05 -05:00 committed by GitHub
parent 3296287d70
commit 93c79817cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
zone/tradeskills.cpp
View File

@ -1888,15 +1888,18 @@ bool Client::CheckTradeskillLoreConflict(int32 recipe_id)
if (fi_is_valid) { if (fi_is_valid) {
auto tre_update_item_inst = database.GetItem(tre_update_item.item_id); auto tre_update_item_inst = database.GetItem(tre_update_item.item_id);
bool ei_is_valid = tre_update_item_inst && tre_update_item_inst->LoreGroup != 0; bool ei_is_valid = tre_update_item_inst && tre_update_item_inst->LoreGroup != 0;
bool unique_lore_group_match = tre_inst->LoreGroup > 0 && tre_inst->LoreGroup == tre_update_item_inst->LoreGroup;
bool component_count_is_valid = tre_update_item.componentcount == 0 && tre.componentcount > 0;
// If the recipe item is a component, and matches a unique lore group (> 0) or the item_id matches another entry in the recipe if (ei_is_valid) {
// zero out the item_id, this will prevent us from doing a lore check inadvertently where bool unique_lore_group_match = tre_inst->LoreGroup > 0 && tre_inst->LoreGroup == tre_update_item_inst->LoreGroup;
// the item is a component, and returned on success, fail, salvage. bool component_count_is_valid = tre_update_item.componentcount == 0 && tre.componentcount > 0;
// or uses an item that is part of a unique loregroup that returns an item of the same unique loregroup
if (ei_is_valid && (tre_update_item.item_id == tre.item_id || unique_lore_group_match) && component_count_is_valid) { // If the recipe item is a component, and matches a unique lore group (> 0) or the item_id matches another entry in the recipe
tre_update_item.item_id = 0; // zero out the item_id, this will prevent us from doing a lore check inadvertently where
// the item is a component, and returned on success, fail, salvage.
// or uses an item that is part of a unique loregroup that returns an item of the same unique loregroup
if (ei_is_valid && (tre_update_item.item_id == tre.item_id || unique_lore_group_match) && component_count_is_valid) {
tre_update_item.item_id = 0;
}
} }
} }
} }