incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix attribute count check in 6xDA

Browse Source
This commit is contained in:
Martin Michelsen
2026-03-11 07:19:53 -07:00
parent 4e3549ba6b
commit 4571cf7fdc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReceiveSubcommands.cc
+2 -2
View File
@@ -4440,7 +4440,7 @@ static asio::awaitable<void> on_destroy_floor_item(shared_ptr<Client> c, Subcomm
static asio::awaitable<void> on_identify_item_bb(shared_ptr<Client> c, SubcommandMessage& msg) { static asio::awaitable<void> on_identify_item_bb(shared_ptr<Client> c, SubcommandMessage& msg) {
auto l = c->require_lobby(); auto l = c->require_lobby();
if (!l->is_game()) { if (!l->is_game()) {
throw runtime_error("6xDA command sent in non-game lobby"); throw runtime_error("6xB8 command sent in non-game lobby");
} }
if (c->version() == Version::BB_V4) { if (c->version() == Version::BB_V4) {
@@ -5391,7 +5391,7 @@ static asio::awaitable<void> on_upgrade_weapon_attribute_bb(shared_ptr<Client> c
} }
size_t attribute_index = 0; size_t attribute_index = 0;
for (size_t z = 6; z <= (item.has_kill_count() ? 10 : 8); z += 2) { for (size_t z = 6; z <= (item.has_kill_count() ? 8 : 10); z += 2) {
if ((item.data1[z] == 0) || (!(item.data1[z] & 0x80) && (item.data1[z] == cmd.attribute))) { if ((item.data1[z] == 0) || (!(item.data1[z] & 0x80) && (item.data1[z] == cmd.attribute))) {
attribute_index = z; attribute_index = z;
break; break;