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-08-23 13:05:41 +08:00
parent 1169bc8bb9
commit 45d64b6ced
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/bullet.cc
View File

@ -592,5 +592,5 @@ void Bullet::AddGunBuff()
bool Bullet::IsPreBattleBullet()
{
return create_frameno_ <= room->GetBattleStartFrameNo();
return create_frameno_ <= room->GetBattleStartFrameNo() || room->GetBattleStartFrameNo() == 0;
}

4
server/gameserver/creature.cc
View File

@ -2764,7 +2764,9 @@ void Creature::OnBattleStart(Room* room)
del_buffs.reserve(buff_list_.size());
for (auto& buff : buff_list_) {
if (!buff.meta->i->post_battle_valid()) {
del_buffs.push_back(buff.buff_uniid);
if (!buff.skill_meta || buff.skill_meta->i->skill_type() != kPassiveSkill) {
del_buffs.push_back(buff.buff_uniid);
}
}
}
for (auto itr = del_buffs.rbegin(); itr != del_buffs.rend(); ++itr) {

2
server/gameserver/explosion.cc
View File

@ -127,5 +127,5 @@ void Explosion::InternalAttack()
bool Explosion::IsPreBattleExplosion()
{
return create_frameno_ <= room_->GetBattleStartFrameNo();
return create_frameno_ <= room_->GetBattleStartFrameNo() || room_->GetBattleStartFrameNo() == 0;
}