From db3eb75ac3a3232cd93b0a7400d997c0ab74cc5d Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 7 Mar 2023 11:18:26 +0800 Subject: [PATCH] 1 --- server/gameserver/human.cc | 4 ++-- server/gameserver/player.cc | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index bf15e6a2..adb22407 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -3452,13 +3452,13 @@ void Human::SyncVolume(int slot_id) [this, i] (int event, const a8::Args* args) { if (a8::TIMER_EXEC_EVENT == event) { - room->frame_event.AddPropChg(GetWeakPtrRef(), kPropVolume, i, volume_[i], true); + room->frame_event.AddPropChgEx(GetWeakPtrRef(), kPropVolume, i, GetInventory(i), 0, volume_[i], true); } }, &xtimer_attacher); } } } else if (slot_id < IS_END){ - room->frame_event.AddPropChg(GetWeakPtrRef(), kPropVolume, slot_id, volume_[slot_id], true); + room->frame_event.AddPropChgEx(GetWeakPtrRef(), kPropVolume, slot_id, GetInventory(slot_id), volume_[slot_id], 0, true); } } diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index f426dbe9..1a9cf09d 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -1671,6 +1671,8 @@ void Player::UpdateThrowBomb() 0, true ); + DecInventory(slot_id, 1); + SyncVolume(slot_id); glm::vec3 bomb_pos = glm::vec3( throw_bomb->pos().x(), throw_bomb->pos().y(),