server/game2005
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2021-04-08 17:39:20 +08:00
parent 9672339b44
commit ee2e50f8d3
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/bullet.cc
View File

@ -190,9 +190,7 @@ void Bullet::ProcBomb()
case IS_FRAG: case IS_FRAG:
{ {
//手雷 //手雷
#if 0
ProcFragBomb(delay_time); ProcFragBomb(delay_time);
#endif
} }
break; break;
case IS_SMOKE: case IS_SMOKE:

10
server/gameserver/creature.cc
View File

@ -868,7 +868,7 @@ void Creature::ProcBuffEffect(Creature* caster, Buff* buff)
.SetSender(this) .SetSender(this)
.SetParam1(caster_state) .SetParam1(caster_state)
.SetParam2(buff->meta) .SetParam2(buff->meta)
.SetParam3(((Creature*)caster)->CurrentSkill()->meta), .SetParam3(caster->CurrentSkill() ? caster->CurrentSkill()->meta : nullptr),
[] (const a8::XParams& param) [] (const a8::XParams& param)
{ {
Creature* receiver = (Creature*)param.sender.GetUserData(); Creature* receiver = (Creature*)param.sender.GetUserData();
@ -878,8 +878,12 @@ void Creature::ProcBuffEffect(Creature* caster, Buff* buff)
MetaData::Skill* skill = (MetaData::Skill*)param.param3.GetUserData(); MetaData::Skill* skill = (MetaData::Skill*)param.param3.GetUserData();
MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(buff_id); MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(buff_id);
if (buff_meta && if (buff_meta &&
caster_state->caster.Get()->CurrentSkill() && (!skill ||
skill == caster_state->caster.Get()->CurrentSkill()->meta) { (
caster_state->caster.Get()->CurrentSkill() &&
skill == caster_state->caster.Get()->CurrentSkill()->meta)
)
) {
SkillCasterState old_caster_state; SkillCasterState old_caster_state;
caster_state->caster.Get()->FillSkillCasterState(&old_caster_state); caster_state->caster.Get()->FillSkillCasterState(&old_caster_state);
caster_state->caster.Get()->RecoverSkillCasterState(caster_state); caster_state->caster.Get()->RecoverSkillCasterState(caster_state);