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

[Cleanup] Remove redundant check in Object::HandleCombine (#4041)

Browse Source 
Some minor formatting updates.
This commit is contained in:
JJ 2024-02-03 17:07:43 -05:00 committed by GitHub
parent 175f2b16f5
commit 029581772d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zone/tradeskills.cpp
View File

@ -274,7 +274,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
); );
EQ::InventoryProfile &user_inv = user->GetInv(); EQ::InventoryProfile &user_inv = user->GetInv();
PlayerProfile_Struct &user_pp = user->GetPP(); PlayerProfile_Struct &user_pp = user->GetPP();
EQ::ItemInstance *container = nullptr; EQ::ItemInstance *container = nullptr;
EQ::ItemInstance *inst = nullptr; EQ::ItemInstance *inst = nullptr;
@ -326,8 +326,8 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
container = inst; container = inst;
if (container->GetItem() && container->GetItem()->BagType == EQ::item::BagTypeTransformationmold) { if (container->GetItem() && container->GetItem()->BagType == EQ::item::BagTypeTransformationmold) {
const EQ::ItemInstance *inst = container->GetItem(0); const EQ::ItemInstance *inst = container->GetItem(0);
bool AllowAll = RuleB(Inventory, AllowAnyWeaponTransformation); bool AllowAll = RuleB(Inventory, AllowAnyWeaponTransformation);
if (inst && EQ::ItemInstance::CanTransform(inst->GetItem(), container->GetItem(), AllowAll)) { if (inst && EQ::ItemInstance::CanTransform(inst->GetItem(), container->GetItem(), AllowAll)) {
const EQ::ItemData *new_weapon = inst->GetItem(); const EQ::ItemData *new_weapon = inst->GetItem();
user->DeleteItemInInventory(EQ::InventoryProfile::CalcSlotId(in_combine->container_slot, 0), 0, true); user->DeleteItemInInventory(EQ::InventoryProfile::CalcSlotId(in_combine->container_slot, 0), 0, true);
@ -372,7 +372,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
LogTradeskillsDetail("Check 1"); LogTradeskillsDetail("Check 1");
const EQ::ItemInstance* inst = container->GetItem(0); const EQ::ItemInstance* inst = container->GetItem(0);
if (inst && inst->GetOrnamentationIcon() && inst->GetOrnamentationIcon()) { if (inst && inst->GetOrnamentationIcon()) {
const EQ::ItemData* new_weapon = inst->GetItem(); const EQ::ItemData* new_weapon = inst->GetItem();
user->DeleteItemInInventory(EQ::InventoryProfile::CalcSlotId(in_combine->container_slot, 0), 0, true); user->DeleteItemInInventory(EQ::InventoryProfile::CalcSlotId(in_combine->container_slot, 0), 0, true);
container->Clear(); container->Clear();
@ -389,7 +389,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
} }
DBTradeskillRecipe_Struct spec; DBTradeskillRecipe_Struct spec;
bool is_augmented = false; bool is_augmented = false;
if (parse->PlayerHasQuestSub(EVENT_COMBINE)) { if (parse->PlayerHasQuestSub(EVENT_COMBINE)) {
if (parse->EventPlayer(EVENT_COMBINE, user, std::to_string(in_combine->container_slot), 0) == 1) { if (parse->EventPlayer(EVENT_COMBINE, user, std::to_string(in_combine->container_slot), 0) == 1) {