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

1

Browse Source
This commit is contained in:
aozhiwei 2024-01-25 14:08:50 +08:00
parent 7fe296df2c
commit ad48dd2695
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/bullet.cc
View File

@ -904,6 +904,9 @@ void Bullet::GetHitCreatures(BulletCheckResult& result)
if (c->HasBuffEffect(kBET_BulletThrough)) { if (c->HasBuffEffect(kBET_BulletThrough)) {
return; return;
} }
if (c->HasBuffEffect(kBET_Dive)) {
return;
}
if (c->HasBuffEffect(kBET_HoldShield)) { if (c->HasBuffEffect(kBET_HoldShield)) {
c->CheckBulletHitHoldShield(this, result.eat); c->CheckBulletHitHoldShield(this, result.eat);
if (result.eat) { if (result.eat) {

2
server/gameserver/creature.cc
View File

@ -1122,7 +1122,7 @@ void Creature::Initialize()
[this, nature_recover_hp_timer] (int event, const a8::Args* args) mutable [this, nature_recover_hp_timer] (int event, const a8::Args* args) mutable
{ {
if (a8::TIMER_EXEC_EVENT == event) { if (a8::TIMER_EXEC_EVENT == event) {
if (nature_recover_hp_timer.expired()) { if (nature_recover_hp_timer.expired() && !HasBuffEffect(kBET_Dive)) {
nature_recover_hp_timer = room->xtimer.SetIntervalWpEx nature_recover_hp_timer = room->xtimer.SetIntervalWpEx
( (
SERVER_FRAME_RATE * mt::Param::s().nature_recover_hp_interval, SERVER_FRAME_RATE * mt::Param::s().nature_recover_hp_interval,