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 2023-12-13 15:14:16 +08:00
parent 66867a5b37
commit 10e432541a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/player.cc
View File

@ -1523,7 +1523,7 @@ void Player::UpdateAiming()
if (second_weapon.meta) { if (second_weapon.meta) {
p_weapon = &second_weapon; p_weapon = &second_weapon;
} }
if (!p_weapon->meta->_power_charge.empty()) { if (!p_weapon->meta->_power_charge.empty() && !GetCurrWeapon()->meta->IsMultistageGun()) {
if (power_idx + 1 > p_weapon->meta->_power_charge.size()) { if (power_idx + 1 > p_weapon->meta->_power_charge.size()) {
A8_ABORT(); A8_ABORT();
} else if (power_idx + 1 == p_weapon->meta->_power_charge.size()) { } else if (power_idx + 1 == p_weapon->meta->_power_charge.size()) {
@ -1541,7 +1541,9 @@ void Player::UpdateAiming()
} }
} else { } else {
aiming_frameno = 0; aiming_frameno = 0;
if (!GetCurrWeapon()->meta->IsMultistageGun()) {
power_idx = -1; power_idx = -1;
}
if (!aiming_buffs.empty()) { if (!aiming_buffs.empty()) {
ClearAimingBuffs(); ClearAimingBuffs();
} }

2
server/gameserver/shot.cc
View File

@ -540,7 +540,9 @@ void InternalShot(Creature* c,
if (c->aiming) { if (c->aiming) {
c->aiming = false; c->aiming = false;
c->aiming_frameno = 0; c->aiming_frameno = 0;
if (!c->GetCurrWeapon()->meta->IsMultistageGun()) {
c->power_idx = -1; c->power_idx = -1;
}
c->ClearAimingBuffs(); c->ClearAimingBuffs();
} }
if (c->skill_hold_skill_id != 0) { if (c->skill_hold_skill_id != 0) {