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

Fix player state issue after failing to complete a mission

Browse Source 
Fixes #225.

Co-authored-by: Jade <jadeshrinemaiden@gmail.com>
This commit is contained in:
dongresource 2022-02-11 17:45:08 +01:00
parent 28bfd14362
commit 00865e1c7b
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Combat.cpp
View File

@ -226,7 +226,7 @@ void Combat::killMob(CNSocket *sock, Mob *mob) {
mob->killedTime = getTime(); // XXX: maybe introduce a shard-global time for each step? mob->killedTime = getTime(); // XXX: maybe introduce a shard-global time for each step?
// check for the edge case where hitting the mob did not aggro it // check for the edge case where hitting the mob did not aggro it
if (sock != nullptr && PlayerManager::players.find(sock) != PlayerManager::players.end()) { if (sock != nullptr) {
Player* plr = PlayerManager::getPlayer(sock); Player* plr = PlayerManager::getPlayer(sock);
Items::DropRoll rolled; Items::DropRoll rolled;

24
src/Missions.cpp
View File

@ -219,16 +219,13 @@ static bool endTask(CNSocket *sock, int32_t taskNum, int choice=0) {
// ugly pointer/reference juggling for the sake of operator overloading... // ugly pointer/reference juggling for the sake of operator overloading...
TaskData& task = *Tasks[taskNum]; TaskData& task = *Tasks[taskNum];
// update player // sanity check
int i; int i;
bool found = false; bool found = false;
for (i = 0; i < ACTIVE_MISSION_COUNT; i++) { for (i = 0; i < ACTIVE_MISSION_COUNT; i++) {
if (plr->tasks[i] == taskNum) { if (plr->tasks[i] == taskNum) {
found = true; found = true;
plr->tasks[i] = 0; break;
for (int j = 0; j < 3; j++) {
plr->RemainingNPCCount[i][j] = 0;
}
} }
} }
@ -249,6 +246,23 @@ static bool endTask(CNSocket *sock, int32_t taskNum, int choice=0) {
} }
// don't take away quest items if we haven't finished the quest // don't take away quest items if we haven't finished the quest
/*
* Update player's active mission data.
*
* This must be done after all early returns have passed, otherwise we
* risk introducing non-atomic changes. For example, failing to finish
* a mission due to not having any inventory space could delete the
* mission server-side; leading to a desync.
*/
for (i = 0; i < ACTIVE_MISSION_COUNT; i++) {
if (plr->tasks[i] == taskNum) {
plr->tasks[i] = 0;
for (int j = 0; j < 3; j++) {
plr->RemainingNPCCount[i][j] = 0;
}
}
}
/* /*
* Give (or take away) quest items * Give (or take away) quest items
* *