From f7c84c62edb1bbfaf5f472c2859903fece3a2ab5 Mon Sep 17 00:00:00 2001 From: Jade Date: Fri, 5 Mar 2021 14:18:36 +0000 Subject: [PATCH] Possibly fixed item duping via trading --- src/ItemManager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ItemManager.cpp b/src/ItemManager.cpp index 52ec7c3..d5620aa 100644 --- a/src/ItemManager.cpp +++ b/src/ItemManager.cpp @@ -530,7 +530,9 @@ bool ItemManager::doTrade(Player* plr, Player* plr2) { for (int i = 0; i < 5; i++) { // remove items offered by us if (plr->Trade[i].iID != 0) { - if (plrInven[plr->Trade[i].iInvenNum].iID == 0) // pulling a fast one on us + if (plrInven[plr->Trade[i].iInvenNum].iID == 0 + || plr->Trade[i].iID != plrInven[plr->Trade[i].iInvenNum].iID + || plr->Trade[i].iType != plrInven[plr->Trade[i].iInvenNum].iType) // pulling a fast one on us return false; if (plr->Trade[i].iOpt < 1) { @@ -551,7 +553,9 @@ bool ItemManager::doTrade(Player* plr, Player* plr2) { } if (plr2->Trade[i].iID != 0) { - if (plr2Inven[plr2->Trade[i].iInvenNum].iID == 0) // pulling a fast one on us + if (plr2Inven[plr2->Trade[i].iInvenNum].iID == 0 + || plr2->Trade[i].iID != plr2Inven[plr2->Trade[i].iInvenNum].iID + || plr2->Trade[i].iType != plr2Inven[plr2->Trade[i].iInvenNum].iType) // pulling a fast one on us return false; if (plr2->Trade[i].iOpt < 1) {