pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 07:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Potential fix for some undesired ranged explotative behavior. (#4413)

Browse Source 
Original Commit: 33fecd68d4eab36885eb7f8067102ba6bce95bac

Conditional ranged double attack
This commit is contained in:
Fryguy
2024-07-22 06:05:46 -04:00
committed by GitHub
parent a23ac4628f
commit 3bfdc0cf71
3 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client_process.cpp
+16 -18
View File
@@ -321,44 +321,42 @@ bool Client::Process() {
auto_fire = false;
}
EQ::ItemInstance *ranged = GetInv().GetItem(EQ::invslot::slotRange);
if (ranged)
{
if (ranged) {
if (ranged->GetItem() && ranged->GetItem()->ItemType == EQ::item::ItemTypeBow) {
if (ranged_timer.Check(false)) {
if (GetTarget() && (GetTarget()->IsNPC() || GetTarget()->IsClient()) && IsAttackAllowed(GetTarget())) {
if (GetTarget()->InFrontMob(this, GetTarget()->GetX(), GetTarget()->GetY())) {
if (CheckLosFN(GetTarget()) && CheckWaterAutoFireLoS(GetTarget())) {
//client has built in los check, but auto fire does not.. done last.
RangedAttack(GetTarget());
if (CheckDoubleRangedAttack())
if (RangedAttack(GetTarget()) && CheckDoubleRangedAttack()) {
RangedAttack(GetTarget(), true);
}
else
}
} else {
ranged_timer.Start();
}
else
}
} else {
ranged_timer.Start();
}
else
}
} else {
ranged_timer.Start();
}
}
}
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 (GetTarget() && (GetTarget()->IsNPC() || GetTarget()->IsClient()) && IsAttackAllowed(GetTarget())) {
if (GetTarget()->InFrontMob(this, GetTarget()->GetX(), GetTarget()->GetY())) {
if (CheckLosFN(GetTarget()) && CheckWaterAutoFireLoS(GetTarget())) {
//client has built in los check, but auto fire does not.. done last.
ThrowingAttack(GetTarget());
}
else
} else {
ranged_timer.Start();
}
else
}
} else {
ranged_timer.Start();
}
else
}
} else {
ranged_timer.Start();
}
}
}
}