OpenPunk
/
OpenFusion
mirror of https://github.com/OpenFusionProject/OpenFusion.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly validate vendor logic. 

Also, iTimeLimit should be 0.
This commit is contained in:
dongresource 2020-09-12 16:10:53 +02:00
parent 0c97969757
commit 4c06163b51
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/NPCManager.cpp
View File

@ -67,9 +67,7 @@ void NPCManager::npcVendorSell(CNSocket* sock, CNPacketData* data) {
sP_CL2FE_REQ_PC_VENDOR_ITEM_SELL* req = (sP_CL2FE_REQ_PC_VENDOR_ITEM_SELL*)data->buf; sP_CL2FE_REQ_PC_VENDOR_ITEM_SELL* req = (sP_CL2FE_REQ_PC_VENDOR_ITEM_SELL*)data->buf;
Player* plr = PlayerManager::getPlayer(sock); Player* plr = PlayerManager::getPlayer(sock);
sItemBase* item = &plr->Inven[req->iInvenSlotNum]; if (req->iInvenSlotNum < 0 || req->iInvenSlotNum >= AINVEN_COUNT || req->iItemCnt < 0) {
if (req->iInvenSlotNum < 0 || req->iItemCnt < 0) { // TODO: expand fail condition
std::cout << "[WARN] Client failed to sell item in slot " << req->iInvenSlotNum << std::endl; std::cout << "[WARN] Client failed to sell item in slot " << req->iInvenSlotNum << std::endl;
INITSTRUCT(sP_FE2CL_REP_PC_VENDOR_ITEM_SELL_FAIL, failResp); INITSTRUCT(sP_FE2CL_REP_PC_VENDOR_ITEM_SELL_FAIL, failResp);
failResp.iErrorCode = 0; failResp.iErrorCode = 0;
@ -77,6 +75,8 @@ void NPCManager::npcVendorSell(CNSocket* sock, CNPacketData* data) {
return; return;
} }
sItemBase* item = &plr->Inven[req->iInvenSlotNum];
INITSTRUCT(sP_FE2CL_REP_PC_VENDOR_ITEM_SELL_SUCC, resp); INITSTRUCT(sP_FE2CL_REP_PC_VENDOR_ITEM_SELL_SUCC, resp);
int sellValue = 100 * req->iItemCnt; // TODO: lookup item price int sellValue = 100 * req->iItemCnt; // TODO: lookup item price
@ -88,7 +88,7 @@ void NPCManager::npcVendorSell(CNSocket* sock, CNPacketData* data) {
item->iID = 0; item->iID = 0;
item->iOpt = 0; item->iOpt = 0;
item->iType = 0; item->iType = 0;
item->iTimeLimit = -1; item->iTimeLimit = 0;
// response parameters // response parameters
resp.iInvenSlotNum = req->iInvenSlotNum; resp.iInvenSlotNum = req->iInvenSlotNum;
@ -113,7 +113,7 @@ void NPCManager::npcVendorTable(CNSocket* sock, CNPacketData* data) {
base1.iID = 60; base1.iID = 60;
base1.iOpt = 0; base1.iOpt = 0;
// expire date // expire date
base1.iTimeLimit = -1; base1.iTimeLimit = 0;
base1.iType = 1; base1.iType = 1;
sItemVendor item1; sItemVendor item1;
@ -127,7 +127,7 @@ void NPCManager::npcVendorTable(CNSocket* sock, CNPacketData* data) {
sItemBase base2; sItemBase base2;
base2.iID = 61; base2.iID = 61;
base2.iOpt = 0; base2.iOpt = 0;
base2.iTimeLimit = -1; base2.iTimeLimit = 0;
base2.iType = 2; base2.iType = 2;
sItemVendor item2; sItemVendor item2;
@ -140,7 +140,7 @@ void NPCManager::npcVendorTable(CNSocket* sock, CNPacketData* data) {
sItemBase base3; sItemBase base3;
base3.iID = 51; base3.iID = 51;
base3.iOpt = 0; base3.iOpt = 0;
base3.iTimeLimit = -1; base3.iTimeLimit = 0;
base3.iType = 3; base3.iType = 3;
sItemVendor item3; sItemVendor item3;