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

Fix FM patches not dealing damage unless invulnerable

Browse Source
This commit is contained in:
dongresource 2020-12-04 17:48:12 +01:00
parent 46552307cd
commit 88d904e302
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/MobManager.cpp
View File

@ -871,9 +871,6 @@ void MobManager::dealGooDamage(CNSocket *sock, int amount) {
sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK *pkt = (sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK*)respbuf; sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK *pkt = (sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK*)respbuf;
sSkillResult_DotDamage *dmg = (sSkillResult_DotDamage*)(respbuf + sizeof(sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK)); sSkillResult_DotDamage *dmg = (sSkillResult_DotDamage*)(respbuf + sizeof(sP_FE2CL_CHAR_TIME_BUFF_TIME_TICK));
if (!(plr->iSpecialState & CN_SPECIAL_STATE_FLAG__INVULNERABLE))
amount = 0;
if (plr->iConditionBitFlag & CSB_BIT_PROTECT_INFECTION) { if (plr->iConditionBitFlag & CSB_BIT_PROTECT_INFECTION) {
amount = -2; // -2 is the magic number for "Protected" to appear as the damage number amount = -2; // -2 is the magic number for "Protected" to appear as the damage number
dmg->bProtected = 1; dmg->bProtected = 1;
@ -926,7 +923,8 @@ void MobManager::playerTick(CNServer *serv, time_t currTime) {
continue; continue;
// fm patch/lake damage // fm patch/lake damage
if (plr->iConditionBitFlag & CSB_BIT_INFECTION) if ((plr->iConditionBitFlag & CSB_BIT_INFECTION)
&& !(plr->iSpecialState & CN_SPECIAL_STATE_FLAG__INVULNERABLE))
dealGooDamage(sock, PC_MAXHEALTH(plr->level) * 3 / 20); dealGooDamage(sock, PC_MAXHEALTH(plr->level) * 3 / 20);
// heal // heal