From 6338ff887e8c89cb49b1126e4c183b44ac596b70 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 29 Jun 2021 19:41:24 +0800 Subject: [PATCH 1/2] 1 --- server/gameserver/mapmgr.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/gameserver/mapmgr.cc b/server/gameserver/mapmgr.cc index 42b24c8..9bf872a 100644 --- a/server/gameserver/mapmgr.cc +++ b/server/gameserver/mapmgr.cc @@ -27,9 +27,11 @@ void MapMgr::Init() } else { abort(); } + #if 0 if (mode_hash_.find(kZombieMode) == mode_hash_.end()) { abort(); } + #endif if (mode_hash_.find(kChiJiMode) == mode_hash_.end()) { abort(); } From 707729778eb9e97bd9e5c8c8e34e9230261a1b78 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 1 Jul 2021 10:34:50 +0800 Subject: [PATCH 2/2] 1 --- server/gameserver/creature.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index d655f01..74b9fcc 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -1020,12 +1020,14 @@ void Creature::AddSkill(int skill_id) { MetaData::Skill* skill_meta = MetaMgr::Instance()->GetSkill(skill_id); if (skill_meta && !GetSkill(skill_id)) { - Skill* skill = new Skill; - skill->owner = this; - skill->meta = skill_meta; - skill->xtimer_attacher.xtimer = &room->xtimer; - skill->Initialzie(); - skill_hash_[skill_id] = skill; + if (skill_meta->i->skill_type() == 1) { + Skill* skill = new Skill; + skill->owner = this; + skill->meta = skill_meta; + skill->xtimer_attacher.xtimer = &room->xtimer; + skill->Initialzie(); + skill_hash_[skill_id] = skill; + } } }