diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index 47dec281..73423044 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -809,9 +809,19 @@ void Bullet::ProcFlyHook(Entity* target) if (target->IsCreature(room)) { Creature* c = (Creature*)target; room->frame_event.AddPropChg(c->GetWeakPtrRef(), kPropBeHook, 0, sender.Get()->GetUniId()); - c->AutoNavigation(born_pos, gun_meta->i->bullet_speed() * 2); + int buff_uniid = c->TryAddBuff(c, gun_meta->i->buffid()); + c->AutoNavigation(born_pos, gun_meta->i->bullet_speed() * 2, + [buff_uniid] (Creature* c) + { + c->RemoveBuffByUniId(buff_uniid); + } + ); } else { - sender.Get()->AutoNavigation(GetPos(), gun_meta->i->bullet_speed() * 2); + sender.Get()->AutoNavigation(GetPos(), gun_meta->i->bullet_speed() * 2, + [] (Creature* c) + { + + }); } sender.Get()->IncDisableMoveTimes(); diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 0ce13f2c..5ee4f5a6 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -3616,7 +3616,8 @@ void Creature::_UpdateSpecMove() } } -void Creature::AutoNavigation(a8::Vec2 target_pos, float speed) +void Creature::AutoNavigation(a8::Vec2 target_pos, float speed, + std::function cb) { float distance = GetPos().Distance(target_pos); if (distance < 0.001f) { diff --git a/server/gameserver/creature.h b/server/gameserver/creature.h index 5e28151a..6f166c3a 100644 --- a/server/gameserver/creature.h +++ b/server/gameserver/creature.h @@ -278,7 +278,8 @@ class Creature : public MoveableEntity float GetAttrAbs(int attr_id); float GetAttrRate(int attr_id); void RecalcDtoAttr(); - void AutoNavigation(a8::Vec2 target_pos, float speed); + void AutoNavigation(a8::Vec2 target_pos, float speed, + std::function cb); void AddTraceBullet(int bullet_uniid, int target_uniid, int gun_id); void LockAttackDir(int time);