pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 19:51:29 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Bug Fix] Stop skill ups on Charmed NPCs. (#2249)

Browse Source 
- Clients were capable of leveling up their melee skills on Charmed Mobs according to: https://github.com/EQEmu/Server/issues/2182
This commit is contained in:
Kinglykrab 2022-06-09 21:08:50 -04:00 committed by GitHub
parent 4639405fdf
commit 83e066bffc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zone/client_process.cpp
View File

@ -330,7 +330,7 @@ bool Client::Process() {
{ {
if (ranged->GetItem() && ranged->GetItem()->ItemType == EQ::item::ItemTypeBow) { if (ranged->GetItem() && ranged->GetItem()->ItemType == EQ::item::ItemTypeBow) {
if (ranged_timer.Check(false)) { if (ranged_timer.Check(false)) {
if (GetTarget() && (GetTarget()->IsNPC() || GetTarget()->IsClient())) { if (GetTarget() && (GetTarget()->IsNPC() || GetTarget()->IsClient()) && IsAttackAllowed(GetTarget())) {
if (GetTarget()->InFrontMob(this, GetTarget()->GetX(), GetTarget()->GetY())) { if (GetTarget()->InFrontMob(this, GetTarget()->GetX(), GetTarget()->GetY())) {
if (CheckLosFN(GetTarget())) { if (CheckLosFN(GetTarget())) {
//client has built in los check, but auto fire does not.. done last. //client has built in los check, but auto fire does not.. done last.
@ -350,7 +350,7 @@ bool Client::Process() {
} }
else if (ranged->GetItem() && (ranged->GetItem()->ItemType == EQ::item::ItemTypeLargeThrowing || ranged->GetItem()->ItemType == EQ::item::ItemTypeSmallThrowing)) { else if (ranged->GetItem() && (ranged->GetItem()->ItemType == EQ::item::ItemTypeLargeThrowing || ranged->GetItem()->ItemType == EQ::item::ItemTypeSmallThrowing)) {
if (ranged_timer.Check(false)) { if (ranged_timer.Check(false)) {
if (GetTarget() && (GetTarget()->IsNPC() || GetTarget()->IsClient())) { if (GetTarget() && (GetTarget()->IsNPC() || GetTarget()->IsClient()) && IsAttackAllowed(GetTarget())) {
if (GetTarget()->InFrontMob(this, GetTarget()->GetX(), GetTarget()->GetY())) { if (GetTarget()->InFrontMob(this, GetTarget()->GetX(), GetTarget()->GetY())) {
if (CheckLosFN(GetTarget())) { if (CheckLosFN(GetTarget())) {
//client has built in los check, but auto fire does not.. done last. //client has built in los check, but auto fire does not.. done last.
@ -411,7 +411,7 @@ bool Client::Process() {
else if (!los_status || !los_status_facing) { else if (!los_status || !los_status_facing) {
//you can't see your target //you can't see your target
} }
else if (auto_attack_target->GetHP() > -10) // -10 so we can watch people bleed in PvP else if (auto_attack_target->GetHP() > -10 && IsAttackAllowed(auto_attack_target)) // -10 so we can watch people bleed in PvP
{ {
EQ::ItemInstance *wpn = GetInv().GetItem(EQ::invslot::slotPrimary); EQ::ItemInstance *wpn = GetInv().GetItem(EQ::invslot::slotPrimary);
TryCombatProcs(wpn, auto_attack_target, EQ::invslot::slotPrimary); TryCombatProcs(wpn, auto_attack_target, EQ::invslot::slotPrimary);
@ -456,7 +456,7 @@ bool Client::Process() {
{ {
//you can't see your target //you can't see your target
} }
else if (auto_attack_target->GetHP() > -10) { else if (auto_attack_target->GetHP() > -10 && IsAttackAllowed(auto_attack_target)) {
CheckIncreaseSkill(EQ::skills::SkillDualWield, auto_attack_target, -10); CheckIncreaseSkill(EQ::skills::SkillDualWield, auto_attack_target, -10);
if (CheckDualWield()) { if (CheckDualWield()) {
EQ::ItemInstance *wpn = GetInv().GetItem(EQ::invslot::slotSecondary); EQ::ItemInstance *wpn = GetInv().GetItem(EQ::invslot::slotSecondary);

4
zone/effects.cpp
View File

@ -1236,11 +1236,9 @@ void EntityList::AEAttack(
) { ) {
for (int i = 0; i < attack_rounds; i++) { for (int i = 0; i < attack_rounds; i++) {
if (!attacker->IsClient() || attacker->GetClass() == MONK || attacker->GetClass() == RANGER) { if (!attacker->IsClient() || attacker->GetClass() == MONK || attacker->GetClass() == RANGER) {
attacker->Attack(current_mob, Hand, false, false, is_from_spell); attacker->Attack(current_mob, Hand, false, false, is_from_spell);
} } else {
else {
attacker->CastToClient()->DoAttackRounds(current_mob, Hand, is_from_spell); attacker->CastToClient()->DoAttackRounds(current_mob, Hand, is_from_spell);
} }
} }

4
zone/mob_ai.cpp
View File

@ -806,14 +806,14 @@ void Client::AI_Process()
FaceTarget(); FaceTarget();
} }
} }
if (GetTarget() && !IsStunned() && !IsMezzed() && !GetFeigned()) { if (GetTarget() && !IsStunned() && !IsMezzed() && !GetFeigned() && IsAttackAllowed(GetTarget())) {
if (attack_timer.Check()) { if (attack_timer.Check()) {
// Should charmed clients not be procing? // Should charmed clients not be procing?
DoAttackRounds(GetTarget(), EQ::invslot::slotPrimary); DoAttackRounds(GetTarget(), EQ::invslot::slotPrimary);
} }
} }
if (CanThisClassDualWield() && GetTarget() && !IsStunned() && !IsMezzed() && !GetFeigned()) { if (CanThisClassDualWield() && GetTarget() && !IsStunned() && !IsMezzed() && !GetFeigned() && IsAttackAllowed(GetTarget())) {
if (attack_dw_timer.Check()) { if (attack_dw_timer.Check()) {
if (CheckDualWield()) { if (CheckDualWield()) {
// Should charmed clients not be procing? // Should charmed clients not be procing?