diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc index bcccaa32..9e0e2d27 100644 --- a/server/gameserver/netdata.cc +++ b/server/gameserver/netdata.cc @@ -1414,9 +1414,11 @@ float BattleDataContext::GetTotalLucky() void BattleDataContext::UseItem(int item_id) { - for (auto& tuple : items_) { - if (std::get<0>(tuple) == item_id) { - std::get<2>(tuple) += 1; + if (owner_.Get()->IsPlayer()) { + for (auto& tuple : items_) { + if (std::get<0>(tuple) == item_id) { + std::get<2>(tuple) += 1; + } } } } diff --git a/server/gameserver/team.cc b/server/gameserver/team.cc index 38baf09c..e7b17ddb 100644 --- a/server/gameserver/team.cc +++ b/server/gameserver/team.cc @@ -483,12 +483,12 @@ void Team::GenBattleReportData(a8::MutableXObject* params) auto battle_items_pb = a8::MutableXObject::CreateArray(); for (auto tuple : hum->GetNetData()->GetItems()) { int item_id = std::get<0>(tuple); - int item_num = std::get<2>(tuple); + int use_item_num = std::get<2>(tuple); int already_dec_num = std::get<3>(tuple); - if (item_num > 0) { + if (use_item_num > 0) { auto item_pb = a8::MutableXObject::CreateObject(); item_pb->SetVal("item_id", item_id); - item_pb->SetVal("item_num", item_num); + item_pb->SetVal("item_num", use_item_num); item_pb->SetVal("already_dec_num", already_dec_num); battle_items_pb->Push(*item_pb); }