Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: forge fuse and transfer check queryAdd #3190

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: forge fuse and transfer check queryAdd #3190

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
270a643
fix: forge fuse and transfer check queryAdd
dudantas Dec 21, 2024
0176117
fix: remove logs
dudantas Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 53 additions & 38 deletions src/creatures/players/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8858,55 +8858,63 @@ void Player::forgeFuseItems(ForgeAction_t actionType, uint16_t firstItemId, uint
history.success = success;
history.tierLoss = reduceTierLoss;

const auto &firstForgingItem = getForgeItemFromId(firstItemId, tier);
if (!firstForgingItem) {
g_logger().error("[Log 1] Player with name {} failed to fuse item with id {}", getName(), firstItemId);
const auto &exaltationChest = Item::CreateItem(ITEM_EXALTATION_CHEST, 1);
if (!exaltationChest) {
g_logger().error("Failed to create exaltation chest");
sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
return;
}
const auto &exaltationContainer = exaltationChest->getContainer();
if (!exaltationContainer) {
g_logger().error("Failed to create exaltation container");
sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
return;
}
auto returnValue = g_game().internalRemoveItem(firstForgingItem, 1);

auto returnValue = queryAdd(CONST_SLOT_BACKPACK, exaltationContainer, 1, 0);
if (returnValue != RETURNVALUE_NOERROR) {
g_logger().error("[Log 1] Failed to remove forge item {} from player with name {}", firstItemId, getName());
sendCancelMessage(getReturnMessage(returnValue));
sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
return;
}
const auto &secondForgingItem = getForgeItemFromId(secondItemId, tier);
if (!secondForgingItem) {
g_logger().error("[Log 2] Player with name {} failed to fuse item with id {}", getName(), secondItemId);

const auto &firstForgedItem = Item::CreateItem(firstItemId, 1);
if (!firstForgedItem) {
g_logger().error("[Log 3] Player with name {} failed to fuse item with id {}", getName(), firstItemId);
sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
return;
}
if (returnValue = g_game().internalRemoveItem(secondForgingItem, 1);
returnValue != RETURNVALUE_NOERROR) {
g_logger().error("[Log 2] Failed to remove forge item {} from player with name {}", secondItemId, getName());

returnValue = g_game().internalAddItem(exaltationContainer, firstForgedItem, INDEX_WHEREEVER);
if (returnValue != RETURNVALUE_NOERROR) {
g_logger().error("[Log 1] Failed to add forge item {} from player with name {}", firstItemId, getName());
sendCancelMessage(getReturnMessage(returnValue));
sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
return;
}

const auto &exaltationChest = Item::CreateItem(ITEM_EXALTATION_CHEST, 1);
if (!exaltationChest) {
g_logger().error("Failed to create exaltation chest");
const auto &firstForgingItem = getForgeItemFromId(firstItemId, tier);
if (!firstForgingItem) {
g_logger().error("[Log 1] Player with name {} failed to fuse item with id {}", getName(), firstItemId);
sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
return;
}
const auto &exaltationContainer = exaltationChest->getContainer();
if (!exaltationContainer) {
g_logger().error("Failed to create exaltation container");
returnValue = g_game().internalRemoveItem(firstForgingItem, 1);
if (returnValue != RETURNVALUE_NOERROR) {
g_logger().error("[Log 1] Failed to remove forge item {} from player with name {}", firstItemId, getName());
sendCancelMessage(getReturnMessage(returnValue));
sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
return;
}

const auto &firstForgedItem = Item::CreateItem(firstItemId, 1);
if (!firstForgedItem) {
g_logger().error("[Log 3] Player with name {} failed to fuse item with id {}", getName(), firstItemId);
const auto &secondForgingItem = getForgeItemFromId(secondItemId, tier);
if (!secondForgingItem) {
g_logger().error("[Log 2] Player with name {} failed to fuse item with id {}", getName(), secondItemId);
sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
return;
}
returnValue = g_game().internalAddItem(exaltationContainer, firstForgedItem, INDEX_WHEREEVER);
if (returnValue != RETURNVALUE_NOERROR) {
g_logger().error("[Log 1] Failed to add forge item {} from player with name {}", firstItemId, getName());
if (returnValue = g_game().internalRemoveItem(secondForgingItem, 1);
returnValue != RETURNVALUE_NOERROR) {
g_logger().error("[Log 2] Failed to remove forge item {} from player with name {}", secondItemId, getName());
sendCancelMessage(getReturnMessage(returnValue));
sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
return;
Expand Down Expand Up @@ -9100,13 +9108,33 @@ void Player::forgeTransferItemTier(ForgeAction_t actionType, uint16_t donorItemI
history.tier = tier;
history.success = true;

const auto &exaltationChest = Item::CreateItem(ITEM_EXALTATION_CHEST, 1);
if (!exaltationChest) {
g_logger().error("Exaltation chest is nullptr");
sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
return;
}
const auto &exaltationContainer = exaltationChest->getContainer();
if (!exaltationContainer) {
g_logger().error("Exaltation container is nullptr");
sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
return;
}

auto returnValue = queryAdd(CONST_SLOT_BACKPACK, exaltationContainer, 1, 0);
if (returnValue != RETURNVALUE_NOERROR) {
sendCancelMessage(getReturnMessage(returnValue));
sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
return;
}

const auto &donorItem = getForgeItemFromId(donorItemId, tier);
if (!donorItem) {
g_logger().error("[Log 1] Player with name {} failed to transfer item with id {}", getName(), donorItemId);
sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
return;
}
auto returnValue = g_game().internalRemoveItem(donorItem, 1);
returnValue = g_game().internalRemoveItem(donorItem, 1);
if (returnValue != RETURNVALUE_NOERROR) {
g_logger().error("[Log 1] Failed to remove transfer item {} from player with name {}", donorItemId, getName());
sendCancelMessage(getReturnMessage(returnValue));
Expand All @@ -9128,19 +9156,6 @@ void Player::forgeTransferItemTier(ForgeAction_t actionType, uint16_t donorItemI
return;
}

const auto &exaltationChest = Item::CreateItem(ITEM_EXALTATION_CHEST, 1);
if (!exaltationChest) {
g_logger().error("Exaltation chest is nullptr");
sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
return;
}
const auto &exaltationContainer = exaltationChest->getContainer();
if (!exaltationContainer) {
g_logger().error("Exaltation container is nullptr");
sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR);
return;
}

const auto &newReceiveItem = Item::CreateItem(receiveItemId, 1);
if (!newReceiveItem) {
g_logger().error("[Log 6] Player with name {} failed to fuse item with id {}", getName(), receiveItemId);
Expand Down
Loading