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

EggBuffs now stores debuff timestamp instead of remaining time

Browse Source
This commit is contained in:
kamilprzyb 2020-10-22 11:28:18 +02:00 committed by Gent
parent 45ed99ae35
commit c7006b46ed
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/NPCManager.cpp
View File

@ -19,7 +19,7 @@
std::map<int32_t, BaseNPC*> NPCManager::NPCs; std::map<int32_t, BaseNPC*> NPCManager::NPCs;
std::map<int32_t, WarpLocation> NPCManager::Warps; std::map<int32_t, WarpLocation> NPCManager::Warps;
std::vector<WarpLocation> NPCManager::RespawnPoints; std::vector<WarpLocation> NPCManager::RespawnPoints;
/// sock, CBFlag -> remaining time /// sock, CBFlag -> until
std::map<std::pair<CNSocket*, int32_t>, time_t> NPCManager::EggBuffs; std::map<std::pair<CNSocket*, int32_t>, time_t> NPCManager::EggBuffs;
nlohmann::json NPCManager::NPCData; nlohmann::json NPCManager::NPCData;
@ -694,8 +694,10 @@ int NPCManager::eggBuffPlayer(CNSocket* sock, int skillId, int duration) {
sock->sendPacket((void*)&updatePacket, P_FE2CL_PC_BUFF_UPDATE, sizeof(sP_FE2CL_PC_BUFF_UPDATE)); sock->sendPacket((void*)&updatePacket, P_FE2CL_PC_BUFF_UPDATE, sizeof(sP_FE2CL_PC_BUFF_UPDATE));
} }
// save the buff serverside; // save the buff serverside;
EggBuffs[key] = duration; // if you get the same buff again, new duration will override the previous one
time_t until = getTimestamp() + duration;
EggBuffs[key] = until;
return 0; return 0;
} }
@ -704,9 +706,8 @@ void NPCManager::buffStep(CNServer* serv, time_t currTime) {
auto it = EggBuffs.begin(); auto it = EggBuffs.begin();
while (it != EggBuffs.end()) { while (it != EggBuffs.end()) {
// decrement remaining time // check remaining time
it->second --; if (it->second > getTimestamp())
if (it->second > 0)
it++; it++;
// if time reached 0 // if time reached 0