From dd374b2ea1ddc52edfdbaf701d548b54504cefa5 Mon Sep 17 00:00:00 2001 From: Gent Semaj Date: Sun, 27 Sep 2020 02:58:33 -0400 Subject: [PATCH 1/2] Fix boosts and potions not updating on reward --- src/MobManager.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/MobManager.cpp b/src/MobManager.cpp index 595cb81..586140e 100644 --- a/src/MobManager.cpp +++ b/src/MobManager.cpp @@ -69,6 +69,7 @@ void MobManager::pcAttackNpcs(CNSocket *sock, CNPacketData *data) { respdata[i].iHitFlag = 2; // hitscan, not a rocket or a grenade } + resp->iBatteryW = plr->batteryW; sock->sendPacket((void*)respbuf, P_FE2CL_PC_ATTACK_NPCs_SUCC, resplen); // a bit of a hack: these are the same size, so we can reuse the response packet @@ -133,6 +134,8 @@ void MobManager::giveReward(CNSocket *sock) { // simple rewards reward->m_iCandy = plr->money; reward->m_iFusionMatter = plr->fusionmatter; + reward->m_iBatteryN = plr->batteryN; + reward->m_iBatteryW = plr->batteryW; reward->iFatigue = 100; // prevents warning message reward->iFatigue_Level = 1; reward->iItemCnt = 1; // remember to update resplen if you change this From b03cc563ebc69da01d6bc00ed55fb62a3793affa Mon Sep 17 00:00:00 2001 From: Gent Semaj Date: Sun, 27 Sep 2020 03:04:33 -0400 Subject: [PATCH 2/2] Fix mobs not aggroing --- src/MobManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MobManager.cpp b/src/MobManager.cpp index 586140e..67fb38a 100644 --- a/src/MobManager.cpp +++ b/src/MobManager.cpp @@ -318,7 +318,7 @@ void MobManager::roamingStep(Mob *mob, time_t currTime) { * We reuse nextAttack to avoid scanning for players all the time, but to still * do so more often than if we waited for nextMovement (which is way too slow). */ - if (mob->nextAttack == 0 || currTime < mob->nextAttack) { + if (mob->nextAttack == 0 || currTime >= mob->nextAttack) { mob->nextAttack = currTime + (int)mob->data["m_iDelayTime"] * 100; /*