pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-31 10:22:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Fix] Clamp Item Ldon Sell Back Rates. (#2592)

Browse Source 
* [Fix] Clamp ldonsellbackrates to prevent abuse.

* Change cast to uint32

* Fix issues with Clamp not functioning correctly.

* Fix missed clamp

* change price is unsigned int to prevent potential overflow

* Formatting

* Formatting fix

* Update client_packet.cpp

* Update client_packet.cpp

Co-authored-by: Alex King <89047260+Kinglykrab@users.noreply.github.com>
This commit is contained in:
Aeadoin 2022-11-30 18:02:36 -05:00 committed by GitHub
parent 1d302f512e
commit 639f8e184a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
zone/client_packet.cpp
View File

@ -2211,7 +2211,14 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app)
} }
// 06/11/2016 This formula matches RoF2 client side calculation. // 06/11/2016 This formula matches RoF2 client side calculation.
int32 price = (item->LDoNPrice + 1) * item->LDoNSellBackRate / 100; uint32 price = EQ::Clamp(
price,
EQ::ClampUpper(
(item->LDoNPrice + 1) * item->LDoNSellBackRate / 100,
item->LDoNPrice
),
item->LDoNPrice
);
if (price == 0) if (price == 0)
{ {
@ -2696,7 +2703,14 @@ void Client::Handle_OP_AltCurrencySell(const EQApplicationPacket *app)
if (item->ID == inst->GetItem()->ID) { if (item->ID == inst->GetItem()->ID) {
// 06/11/2016 This formula matches RoF2 client side calculation. // 06/11/2016 This formula matches RoF2 client side calculation.
cost = (ml.alt_currency_cost + 1) * item->LDoNSellBackRate / 100; cost = EQ::Clamp(
cost,
EQ::ClampUpper(
static_cast<uint32>((ml.alt_currency_cost + 1) * item->LDoNSellBackRate / 100),
static_cast<uint32>(ml.alt_currency_cost)
),
static_cast<uint32>(ml.alt_currency_cost)
);
found = true; found = true;
break; break;
} }
@ -2801,7 +2815,14 @@ void Client::Handle_OP_AltCurrencySellSelection(const EQApplicationPacket *app)
if (item->ID == inst->GetItem()->ID) { if (item->ID == inst->GetItem()->ID) {
// 06/11/2016 This formula matches RoF2 client side calculation. // 06/11/2016 This formula matches RoF2 client side calculation.
cost = (ml.alt_currency_cost + 1) * item->LDoNSellBackRate / 100; cost = EQ::Clamp(
cost,
EQ::ClampUpper(
static_cast<uint32>((ml.alt_currency_cost + 1) * item->LDoNSellBackRate / 100),
static_cast<uint32>(ml.alt_currency_cost)
),
static_cast<uint32>(ml.alt_currency_cost)
);
found = true; found = true;
break; break;
} }