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

added a condition to not send mob/egg _ENTER packet when it's HP is 0

Browse Source
This commit is contained in:
Kamil 2020-10-24 22:57:50 +02:00 committed by Gent
parent 674d5112f3
commit 859b24229a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/NPCManager.cpp
View File

@ -734,10 +734,11 @@ int NPCManager::eggBuffPlayer(CNSocket* sock, int skillId, int duration) {
void NPCManager::eggStep(CNServer* serv, time_t currTime) { void NPCManager::eggStep(CNServer* serv, time_t currTime) {
// tick buffs // tick buffs
time_t timeStamp = getTimestamp();
auto it = EggBuffs.begin(); auto it = EggBuffs.begin();
while (it != EggBuffs.end()) { while (it != EggBuffs.end()) {
// check remaining time // check remaining time
if (it->second > currTime) if (it->second > timeStamp)
it++; it++;
// if time reached 0 // if time reached 0
@ -781,11 +782,13 @@ void NPCManager::eggStep(CNServer* serv, time_t currTime) {
// check dead eggs // check dead eggs
for (auto egg : Eggs) { for (auto egg : Eggs) {
if (!egg.second->dead) if (!egg.second->dead)
return; continue;
if (egg.second->deadUntil <= currTime) { if (egg.second->deadUntil <= timeStamp) {
// respawn it // respawn it
addNPC(egg.second->currentChunks, egg.first);
egg.second->dead = false; egg.second->dead = false;
egg.second->deadUntil = 0;
egg.second->appearanceData.iHP = 400;
addNPC(egg.second->currentChunks, egg.first);
} }
} }
@ -920,5 +923,6 @@ void NPCManager::eggPickup(CNSocket* sock, CNPacketData* data) {
removeNPC(egg->currentChunks, eggId); removeNPC(egg->currentChunks, eggId);
egg->dead = true; egg->dead = true;
egg->deadUntil = getTimestamp() + type->regen; egg->deadUntil = getTimestamp() + type->regen;
egg->appearanceData.iHP = 0;
} }
} }

4
src/PlayerManager.cpp
View File

@ -150,6 +150,10 @@ void PlayerManager::addPlayerToChunks(std::vector<Chunk*> chunks, CNSocket* sock
// add npcs // add npcs
for (int32_t id : chunk->NPCs) { for (int32_t id : chunk->NPCs) {
BaseNPC* npc = NPCManager::NPCs[id]; BaseNPC* npc = NPCManager::NPCs[id];
if (npc->appearanceData.iHP <= 0)
continue;
switch (npc->npcClass) { switch (npc->npcClass) {
case NPC_BUS: case NPC_BUS:
INITSTRUCT(sP_FE2CL_TRANSPORTATION_ENTER, enterBusData); INITSTRUCT(sP_FE2CL_TRANSPORTATION_ENTER, enterBusData);