From 39b88f1bbdf67b1baac602d9c6743cd7ca07f210 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 8 Oct 2022 19:44:32 +0800
Subject: [PATCH] 1

---
 server/gameserver/battledatacontext.cc | 4 ++--
 server/gameserver/skillhelper.cc       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/gameserver/battledatacontext.cc b/server/gameserver/battledatacontext.cc
index 87854f8c..e9d85ea6 100644
--- a/server/gameserver/battledatacontext.cc
+++ b/server/gameserver/battledatacontext.cc
@@ -364,7 +364,7 @@ void BattleDataContext::GetHeroLvQuality(int& hero_lv, int& quality)
     hero_lv = 1;
     quality = 1;
     if (owner_.Get()->IsPlayer()) {
-        if (hero_ability_) {
+        if (hero_ability_ && hero_dto && hero_dto->IsObject()) {
             hero_lv = hero_dto->Get("hero_lv", 0).GetInt();
             quality = hero_dto->Get("quality", 0).GetInt();
         }
@@ -433,7 +433,7 @@ void BattleDataContext::CalcBattleStat(struct PlayerStats* stats)
             return ceg;
         };
 
-    if (hero_ability_) {
+    if (hero_ability_ && hero_dto && hero_dto->IsObject()) {
         int hero_id = hero_dto->Get("hero_id", 0).GetInt();
         int quality = hero_dto->Get("quality", 0).GetInt();
         int today_get_gold = hero_dto->Get("today_get_gold", 0).GetInt();
diff --git a/server/gameserver/skillhelper.cc b/server/gameserver/skillhelper.cc
index 70a58c1e..6b74b9ed 100644
--- a/server/gameserver/skillhelper.cc
+++ b/server/gameserver/skillhelper.cc
@@ -123,11 +123,11 @@ void SkillHelper::Init()
     for (int i = MAGIC_NONE; i < MAGIC_END; ++i) {
         if (i != 0) {
             int skill_id = GetMagicSkillId(i);
-            if (skill_id == 0) {
-                abort();
+            if (skill_id) {
+                magic_skill_hash_[i] = skill_id;
+                skill_magic_hash_[skill_id] = i;
+                //abort();
             }
-            magic_skill_hash_[i] = skill_id;
-            skill_magic_hash_[skill_id] = i;
         }
     }
 }