From d364fc5c7234898da973fcca7bb1bf52c517702b Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 9 Oct 2022 21:22:55 +0800
Subject: [PATCH] 1

---
 server/gameserver/constant.h     | 40 ++++++++++++++++----------------
 server/gameserver/metadata.cc    | 10 ++++----
 server/gameserver/skillhelper.cc |  3 ++-
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h
index baa60cc7..42f644aa 100644
--- a/server/gameserver/constant.h
+++ b/server/gameserver/constant.h
@@ -476,27 +476,27 @@ enum BulletConsumeType_e
 enum MagicType_e
 {
    MAGIC_NONE = 0,
-   MAGIC_AXXF = 1, //20101 爱心香风
-   MAGIC_SJYDHX = 2, //20701 瞬间移动回血
-   MAGIC_HLYZ = 3, //20801 火力压制
-   MAGIC_YMCZ = 4, //20901 野蛮冲撞
-   MAGIC_LDFY = 5, //21001 立盾防御
-   MAGIC_HJHX = 6, //20201 火箭浣熊
-   MAGIC_FG = 7, //20401 飞勾
-   MAGIC_WLFB = 8, //20601 威力翻倍
-   MAGIC_YLZ = 9, //20301 医疗站
-   MAGIC_YS = 10, //20501 隐身
+   MAGIC_AXXF, //20101 爱心香风
+   MAGIC_SJYDHX, //20701 瞬间移动回血
+   MAGIC_HLYZ, //20801 火力压制
+   MAGIC_YMCZ, //20901 野蛮冲撞
+   MAGIC_LDFY, //21001 立盾防御
+   MAGIC_HJHX, //20201 火箭浣熊
+   MAGIC_FG, //20401 飞勾
+   MAGIC_WLFB, //20601 威力翻倍
+   MAGIC_YLZ, //20301 医疗站
+   MAGIC_YS, //20501 隐身
 
-   MAGIC_SJXY = 21, //30101 射击眩晕
-   MAGIC_SSJS = 22, //30201 受伤加速
-   MAGIC_JSHX = 23, //30301 击杀回血
-   MAGIC_SWZB = 24, //30401 死亡自曝
-   MAGIC_CMXD = 25, //30501 此面向敌
-   MAGIC_MYXY = 26, //30601 免疫眩晕
-   MAGIC_GZJS = 27, //30701 钩爪拉动减伤
-   MAGIC_JYFH = 28, //30801 救援防护
-   MAGIC_FH = 29, //30901 复活
-   MAGIC_YSHF = 30, //31001 隐身恢复
+   MAGIC_SJXY, //30101 射击眩晕
+   MAGIC_SSJS, //30201 受伤加速
+   MAGIC_JSHX, //30301 击杀回血
+   MAGIC_SWZB, //30401 死亡自曝
+   MAGIC_CMXD, //30501 此面向敌
+   MAGIC_MYXY, //30601 免疫眩晕
+   MAGIC_GZJS, //30701 钩爪拉动减伤
+   MAGIC_JYFH, //30801 救援防护
+   MAGIC_FH, //30901 复活
+   MAGIC_YSHF, //31001 隐身恢复
    MAGIC_END
 };
 
diff --git a/server/gameserver/metadata.cc b/server/gameserver/metadata.cc
index ed0be75b..9a3afa3b 100644
--- a/server/gameserver/metadata.cc
+++ b/server/gameserver/metadata.cc
@@ -1001,13 +1001,13 @@ namespace MetaData
             }
         }
         {
-            number_meta = MetaMgr::Instance()->GetSkillNumber(i->skill_id());
-            if (!number_meta) {
-                abort();
-            }
+            SkillHelper::GetMagicIdAndBaseSkillId(i->skill_id(), magic_id, base_skill_id);
         }
         {
-            SkillHelper::GetMagicIdAndBaseSkillId(i->skill_id(), magic_id, base_skill_id);
+            number_meta = MetaMgr::Instance()->GetSkillNumber(i->skill_id());
+            if (!number_meta && GetMagicId() != 0) {
+                abort();
+            }
         }
     }
 
diff --git a/server/gameserver/skillhelper.cc b/server/gameserver/skillhelper.cc
index a01ccc84..9b177a78 100644
--- a/server/gameserver/skillhelper.cc
+++ b/server/gameserver/skillhelper.cc
@@ -133,7 +133,8 @@ void SkillHelper::Init()
             if (skill_id) {
                 magic_skill_hash_[i] = skill_id;
                 skill_magic_hash_[skill_id] = i;
-                //abort();
+            } else {
+                abort();
             }
         }
     }