diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 47fe2bfb..3b6db774 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -3863,7 +3863,11 @@ void Human::OnExplosionHit(Explosion* e)
 
     RemoveBuffByEffectId(kBET_PeaceMode);
     float finaly_dmg = GetBattleContext()->CalcDmg(e);
+#if 1
+    {
+#else
     if (e->GetSender().Get()) {
+#endif
         DecHP(finaly_dmg,
               VP_Explosion,
               "",
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 357e1239..4ca009e4 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -436,6 +436,9 @@ void Player::UpdateUseItemIdx()
     if (use_item_idx >= 0 && use_item_idx < IS_END) {
         MetaData::Equip* item_meta = MetaMgr::Instance()->GetEquipBySlotId(use_item_idx);
         if (item_meta) {
+            if (GetInventory(item_meta->i->_inventory_slot()) <= 0) {
+                return;
+            }
             int use_time = item_meta->i->use_time();
             switch (use_item_idx) {
             case IS_HEALTHKIT: