server/game2005
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into team

Browse Source
This commit is contained in:
aozhiwei 2021-09-28 22:54:15 +08:00
commit 037e85247c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/human.cc
View File

@ -2226,8 +2226,9 @@ void Human::DecItem(int item_id, int item_num)
room->frame_event.AddItemChg(GetWeakPtrRef(), item_id, std::max(0, itr->second)); room->frame_event.AddItemChg(GetWeakPtrRef(), item_id, std::max(0, itr->second));
if (itr->second <= 0) { if (itr->second <= 0) {
if (battling_items_.find(item_id) == battling_items_.end()) { if (battling_items_.find(item_id) == battling_items_.end()) {
items_.erase(itr); //items_.erase(itr); //为啥?????
} }
items_.erase(itr);
} }
} }
} }

1
server/gameserver/player.cc
View File

@ -365,6 +365,7 @@ void Player::UpdateUseItemId()
ProcUseItem(use_item_id); ProcUseItem(use_item_id);
use_item_id = 0; use_item_id = 0;
has_use_item_id = false; has_use_item_id = false;
need_sync_active_player = true;
} }
void Player::UpdateSpectate() void Player::UpdateSpectate()