Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] Update trader add/remove packets to limits for RoF2 #4595

Merged
merged 2 commits into from
Jan 19, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update for feedback
neckkola committed Jan 18, 2025
commit f1d21760c1c4e9249eb1d5f27d7b1794ced969e4
10 changes: 5 additions & 5 deletions zone/client.h
Original file line number Diff line number Diff line change
@@ -1128,10 +1128,10 @@ class Client : public Mob
void SetTrader(bool status) { trader = status; }
uint16 GetTraderID() { return trader_id; }
void SetTraderID(uint16 id) { trader_id = id; }
void SetNoOfTraders(uint32 no) { m_no_traders = no; }
uint32 GetNoOfTraders() { return m_no_traders; }
void IncrementNoOfTraders() { m_no_traders += 1; }
void DecrementNoOfTraders() { m_no_traders > 0 ? m_no_traders -= 1 : m_no_traders = 0; }
void SetTraderCount(uint32 no) { m_trader_count = no; }
uint32 GetTraderCount() { return m_trader_count; }
void IncrementTraderCount() { m_trader_count += 1; }
void DecrementTraderCount() { m_trader_count > 0 ? m_trader_count -= 1 : m_trader_count = 0; }

eqFilterMode GetFilter(eqFilterType filter_id) const { return ClientFilters[filter_id]; }
void SetFilter(eqFilterType filter_id, eqFilterMode filter_mode) { ClientFilters[filter_id] = filter_mode; }
@@ -1950,7 +1950,7 @@ class Client : public Mob
uint8 firstlogon;
uint32 mercid; // current merc
uint8 mercSlot; // selected merc slot
uint32 m_no_traders{};
uint32 m_trader_count{};
uint32 m_buyer_id;
uint32 m_barter_time;
int32 m_parcel_platinum;
2 changes: 1 addition & 1 deletion zone/trading.cpp
Original file line number Diff line number Diff line change
@@ -3225,7 +3225,7 @@ void Client::SendBulkBazaarTraders()
EQ::constants::StaticLookup(ClientVersion())->BazaarTraderLimit
);

SetNoOfTraders(results.count);
SetTraderCount(results.count);

auto p_size = 4 + 12 * results.count + results.name_length;
auto buffer = std::make_unique<char[]>(p_size);
6 changes: 3 additions & 3 deletions zone/worldserver.cpp
Original file line number Diff line number Diff line change
@@ -3924,17 +3924,17 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
switch (in->action) {
case TraderOn: {
out->action = AddTraderToBazaarWindow;
if (c.second->GetNoOfTraders() <
if (c.second->GetTraderCount() <
EQ::constants::StaticLookup(c.second->ClientVersion())->BazaarTraderLimit) {
c.second->IncrementNoOfTraders();
c.second->IncrementTraderCount();
c.second->QueuePacket(outapp, true, Mob::CLIENT_CONNECTED);
}

break;
}
case TraderOff: {
out->action = RemoveTraderFromBazaarWindow;
c.second->DecrementNoOfTraders();
c.second->DecrementTraderCount();
c.second->QueuePacket(outapp, true, Mob::CLIENT_CONNECTED);
break;
}