OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 13:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Quest Item Bug

Browse Source
This commit is contained in:
Jade 2020-12-30 20:42:10 +00:00 committed by dongresource
parent 0e3fac4d34
commit 2b95bc660c
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/MissionManager.cpp
View File

@ -265,20 +265,20 @@ void MissionManager::quitTask(CNSocket* sock, int32_t taskNum, bool manual) {
TaskData& task = *Tasks[taskNum]; TaskData& task = *Tasks[taskNum];
// clean up quest items // clean up quest items
for (i = 0; i < 3; i++) { if (manual) {
if (task["m_iSUItem"][i] == 0 && task["m_iCSUItemID"][i] == 0) for (i = 0; i < 3; i++) {
continue; if (task["m_iSUItem"][i] == 0 && task["m_iCSUItemID"][i] == 0)
continue;
/* /*
* It's ok to do this only server-side, because the server decides which * It's ok to do this only server-side, because the server decides which
* slot later items will be placed in. * slot later items will be placed in.
*/ */
for (int j = 0; j < AQINVEN_COUNT; j++) for (int j = 0; j < AQINVEN_COUNT; j++)
if (plr->QInven[j].iID == task["m_iSUItem"][i] || plr->QInven[j].iID == task["m_iCSUItemID"][i] || plr->QInven[j].iID == task["m_iSTItemID"][i]) if (plr->QInven[j].iID == task["m_iSUItem"][i] || plr->QInven[j].iID == task["m_iCSUItemID"][i] || plr->QInven[j].iID == task["m_iSTItemID"][i])
memset(&plr->QInven[j], 0, sizeof(sItemBase)); memset(&plr->QInven[j], 0, sizeof(sItemBase));
} }
} else {
if (!manual) {
INITSTRUCT(sP_FE2CL_REP_PC_TASK_END_FAIL, failResp); INITSTRUCT(sP_FE2CL_REP_PC_TASK_END_FAIL, failResp);
failResp.iErrorCode = 1; failResp.iErrorCode = 1;
failResp.iTaskNum = taskNum; failResp.iTaskNum = taskNum;
@ -308,6 +308,7 @@ int MissionManager::findQSlot(Player *plr, int id) {
} }
void MissionManager::dropQuestItem(CNSocket *sock, int task, int count, int id, int mobid) { void MissionManager::dropQuestItem(CNSocket *sock, int task, int count, int id, int mobid) {
std::cout << "Altered item id " << id << " by " << count << " for task id " << task << std::endl;
const size_t resplen = sizeof(sP_FE2CL_REP_REWARD_ITEM) + sizeof(sItemReward); const size_t resplen = sizeof(sP_FE2CL_REP_REWARD_ITEM) + sizeof(sItemReward);
assert(resplen < CN_PACKET_BUFFER_SIZE); assert(resplen < CN_PACKET_BUFFER_SIZE);
// we know it's only one trailing struct, so we can skip full validation // we know it's only one trailing struct, so we can skip full validation