From 1daef7c0e48a4d16d4f3ac351873844817cebef7 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 19 Oct 2022 00:22:50 +0800
Subject: [PATCH] 1

---
 server/gameserver/bullet.cc   | 2 +-
 server/gameserver/creature.cc | 6 +++++-
 server/gameserver/shot.cc     | 4 ----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc
index a70b2b8c..fe16b5cc 100644
--- a/server/gameserver/bullet.cc
+++ b/server/gameserver/bullet.cc
@@ -419,7 +419,7 @@ void Bullet::MapServiceUpdate()
                 Check(distance);
             }
         } while(!later_removed_ && move_length >= 0.0001f);
-#ifdef DEBUG
+#ifdef DEBUG1
         {
             if (sender.Get()->IsPlayer()) {
                 if ((room->GetFrameNo() - create_frameno_) % 2 == 0) {
diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 9414577a..2d8173ff 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -969,7 +969,7 @@ void Creature::ProcSkillPhase(MetaData::SkillPhase* phase)
                                  CurrentSkill() ? CurrentSkill()->meta : nullptr,
                                  target_distance,
                                  0,
-                                 target_id);
+                                 0);
                             SetAttackDir(old_attack_dir);
                         }
                     }
@@ -978,6 +978,10 @@ void Creature::ProcSkillPhase(MetaData::SkillPhase* phase)
                     if (entity) {
                         float target_distance = entity->GetPos().Distance(GetPos());
                         if (bullet_meta && target_distance > 0.00001f) {
+                            if (CurrentSkill()->meta->GetMagicId() == MAGIC_HJHX) {
+                                TryAddBuff(this, 202013);
+                                TryAddBuff(this, 202014);
+                            }
                             a8::Vec2 old_attack_dir = GetAttackDir();
                             a8::Vec2 attack_dir = entity->GetPos() - GetPos();
                             attack_dir.Normalize();
diff --git a/server/gameserver/shot.cc b/server/gameserver/shot.cc
index bd11c2c4..a0e4762a 100644
--- a/server/gameserver/shot.cc
+++ b/server/gameserver/shot.cc
@@ -395,12 +395,8 @@ void InternalShot(Creature* c,
             bullet_info.keep_shot_animi_timer_ptr = keep_shot_animi_timer_ptr;
             bullet_info.shot_animi_time = shot_animi_time;
             if (skill_meta &&
-#if 1
-                skill_meta->GetMagicId() == MAGIC_AXXF
-#else
                 (skill_meta->GetMagicId() == MAGIC_AXXF ||
                  skill_meta->GetMagicId() == MAGIC_HJHX)
-#endif
                 ) {
                 bullet_info.trace_target_uniid = c->GetSkillTargetId();
             }