From 91df9fb9065358469adf2ab35074b05bb28a5846 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 21 Oct 2021 14:53:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=AA=E8=A3=85=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/human.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 3e12dfa..12b5187 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -3142,6 +3142,12 @@ void Human::OnBulletHit(Bullet* bullet) HasBuffEffect(kBET_Fly)) { return; } + { + Buff* buff = GetBuffByEffect(kBET_Camouflage); + if (buff && buff->i->int_param2 == 1) { + return + } + } #ifdef DEBUG #if 0 if (IsPlayer()) { @@ -3213,6 +3219,9 @@ void Human::OnExplosionHit(Explosion* e) HasBuffEffect(kBET_Fly)) { return; } + if (HasBuffEffect(kBET_Dive) && !MetaMgr::Instance()->dive_explosion_dmg_switch) { + return; + } RemoveBuffByEffectId(kBET_PeaceMode); float dmg = e->GetDmg();