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-06-03 16:48:25 +08:00
parent ceae63d636
commit a2c1174785
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/obstacle.cc
View File

@ -304,7 +304,7 @@ void Obstacle::Explosion(Bullet* bullet)
case ET_Player: case ET_Player:
{ {
Human* hum = (Human*)target; Human* hum = (Human*)target;
if (!hum->dead) { if (!hum->dead && hum->team_id != team_id_) {
float dmg = meta->i->damage(); float dmg = meta->i->damage();
float def = hum->ability.def; float def = hum->ability.def;
float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K); float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K);

3
server/gameserver/player.cc
View File

@ -184,7 +184,8 @@ void Player::UpdateShot()
if (dead || if (dead ||
downed || downed ||
room->IsWaitingStart() || room->IsWaitingStart() ||
HasBuffEffect(kBET_Jump)) { HasBuffEffect(kBET_Jump) ||
HasBuffEffect(kBET_Fly)) {
shot_start = false; shot_start = false;
shot_hold = false; shot_hold = false;
series_shot_frames = 0; series_shot_frames = 0;

2
server/gameserver/roomobstacle.cc
View File

@ -384,7 +384,7 @@ void RoomObstacle::ActiveMine()
{ {
room->xtimer.AddRepeatTimerAndAttach room->xtimer.AddRepeatTimerAndAttach
( (
SERVER_FRAME_RATE, 1,
a8::XParams() a8::XParams()
.SetSender(this), .SetSender(this),
[] (const a8::XParams& param) [] (const a8::XParams& param)