diff --git a/server/gameserver/buff.cc b/server/gameserver/buff.cc index 943209d1..b60b88c3 100644 --- a/server/gameserver/buff.cc +++ b/server/gameserver/buff.cc @@ -41,7 +41,6 @@ void Buff::Init() INIT_LIST_HEAD(&effect_entry); INIT_LIST_HEAD(&depend_entry); INIT_LIST_HEAD(&cond_entry); - INIT_LIST_HEAD(&break_skill_entry); INIT_LIST_HEAD(&on_remove_contexts); for (int effect_id : meta->_effect_list) { effect_list_.push_back(owner->AddEffect(effect_id)); @@ -61,9 +60,6 @@ void Buff::UnInit() if (!list_empty(&cond_entry)) { list_del_init(&cond_entry); } - if (!list_empty(&break_skill_entry)) { - list_del_init(&break_skill_entry); - } while (!list_empty(&on_remove_contexts)) { RemoveBuffCbConext* cb = list_last_entry(&on_remove_contexts, RemoveBuffCbConext, diff --git a/server/gameserver/buff.h b/server/gameserver/buff.h index d865b876..87da9a89 100644 --- a/server/gameserver/buff.h +++ b/server/gameserver/buff.h @@ -31,7 +31,6 @@ class Buff list_head effect_entry; list_head depend_entry; list_head cond_entry; - list_head break_skill_entry; list_head on_remove_contexts; a8::XTimerWp remover_timer; std::shared_ptr init_args; diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index a41c885f..e38f55e7 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -54,7 +54,6 @@ Creature::Creature():MoveableEntity() { - INIT_LIST_HEAD(&break_skill_buffs_); weak_ptr_chunk_.Set(this); trigger_ = std::make_shared(this); trigger_->Init(); @@ -4130,16 +4129,3 @@ bool Creature::IsOb() { return a8::HasBitFlag(status, CS_IsOb); } - -bool Creature::HasBreakSkillBuffs(Buff* buff) -{ - if (list_empty(&break_skill_buffs_)) { - return false; - } - return false; -} - -void Creature::TriggerBreakSkill(Buff* buff) -{ - -} diff --git a/server/gameserver/creature.h b/server/gameserver/creature.h index 627f24be..b3c8ded5 100644 --- a/server/gameserver/creature.h +++ b/server/gameserver/creature.h @@ -208,8 +208,6 @@ class Creature : public MoveableEntity void RecalcBuffAttr(); void RemoveBuffByEffectId(int buff_effect_id); void ClearBuffList(); - bool HasBreakSkillBuffs(Buff* buff); - void TriggerBreakSkill(Buff* buff); void TriggerBuff(Skill* skill, std::set& target_list, BuffTriggerType_e trigger_type); Skill* GetSkill(int skill_id); Skill* GetMainSkill(); @@ -482,7 +480,6 @@ private: int follow_times_ = 0; std::map buff_tags_; const mt::BattleHeroGrow* hero_grow_meta_ = nullptr; - list_head break_skill_buffs_; int hero_level_ = 1; int hero_exp_ = 0;