server/game2005
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2021-08-11 02:29:30 +00:00
parent c86e3eb10c
commit 8a3a6246f7
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/creature.cc
View File

@ -587,7 +587,9 @@ void Creature::RecalcBuffAttr()
void Creature::OnBuffRemove(Buff& buff) void Creature::OnBuffRemove(Buff& buff)
{ {
if (!buff.meta->i->only_server()) {
room->frame_event.RemoveBuff(GetWeakPtrRef(), buff.meta->i->buff_id());
}
} }
void Creature::RemoveBuffByEffectId(int buff_effect_id) void Creature::RemoveBuffByEffectId(int buff_effect_id)

3
server/gameserver/creature.h
View File

@ -214,12 +214,11 @@ class Creature : public MoveableEntity
std::string DebugOutBuffList(); std::string DebugOutBuffList();
protected: protected:
virtual void OnBuffRemove(Buff& buff);
private: private:
virtual void AddBuffPostProc(Creature* caster, Buff* buff); virtual void AddBuffPostProc(Creature* caster, Buff* buff);
virtual void OnBuffRemove(Buff& buff);
virtual void DoSkillPreProc(int skill_id, int target_id, const a8::Vec2& target_pos); virtual void DoSkillPreProc(int skill_id, int target_id, const a8::Vec2& target_pos);
virtual void DoSkillPostProc(bool used, int skill_id, int target_id, const a8::Vec2& target_pos); virtual void DoSkillPostProc(bool used, int skill_id, int target_id, const a8::Vec2& target_pos);

4
server/gameserver/human.cc
View File

@ -3202,6 +3202,7 @@ void Human::ProcReliveAction()
void Human::OnBuffRemove(Buff& buff) void Human::OnBuffRemove(Buff& buff)
{ {
Creature::OnBuffRemove(buff);
switch (buff.meta->i->buff_effect()) { switch (buff.meta->i->buff_effect()) {
case kBET_Jump: case kBET_Jump:
{ {
@ -3264,9 +3265,6 @@ void Human::OnBuffRemove(Buff& buff)
} }
break; break;
} }
if (!buff.meta->i->only_server()) {
room->frame_event.RemoveBuff(GetWeakPtrRef(), buff.meta->i->buff_id());
}
} }
void Human::OnLand() void Human::OnLand()