From 9ca49272d43aa48d991df02dc413536bab962f1d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Fri, 25 Jun 2021 20:28:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E5=86=85=E5=BB=BA=E7=AD=91?=
 =?UTF-8?q?=EF=BC=8C=E8=A2=AB=E5=AD=90=E5=BC=B9=E5=91=BD=E4=B8=AD=E8=BE=B9?=
 =?UTF-8?q?=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/obstacle.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/gameserver/obstacle.cc b/server/gameserver/obstacle.cc
index 3b464f4..da739ba 100644
--- a/server/gameserver/obstacle.cc
+++ b/server/gameserver/obstacle.cc
@@ -469,6 +469,9 @@ void Obstacle::SetMasterId(Room* room, int master_id)
 
 void Obstacle::OnBulletHit(Bullet* bullet)
 {
+    if (meta->i->bullet_hit() == kBulletHitEatDmg) {
+        return;
+    }
     if (!IsDead(bullet->room) &&
         !IsTerminatorAirDropBox(bullet->room)) {
         if (meta->receive_special_damage_type != 0 &&