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

1

Browse Source
This commit is contained in:
aozhiwei 2023-09-01 10:51:00 +08:00
parent e4431b959a
commit 19de0307b2
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/bullet.cc
View File

@ -878,7 +878,9 @@ void Bullet::GetHitCreatures(BulletCheckResult& result)
[this, &result] (Creature* c, bool& stop) [this, &result] (Creature* c, bool& stop)
{ {
bool no_teammate = IsFlyHook(); bool no_teammate = IsFlyHook();
if (sender.Get()->IsProperTarget(c, no_teammate)) { long long ignore_buff_effects = 0;
a8::SetBitFlag(ignore_buff_effects, kBET_Hide);
if (sender.Get()->IsProperTarget(c, no_teammate, ignore_buff_effects)) {
if (gun_meta->ispenetrate() && if (gun_meta->ispenetrate() &&
hit_objects_.find(c->GetUniId()) != hit_objects_.end()) { hit_objects_.find(c->GetUniId()) != hit_objects_.end()) {
//穿人 //穿人

10
server/gameserver/creature.cc
View File

@ -1206,7 +1206,7 @@ void Creature::ResetAction()
} }
} }
bool Creature::IsProperTarget(Creature* target, bool no_teammate) bool Creature::IsProperTarget(Creature* target, bool no_teammate, long long ignore_buff_effects)
{ {
if (target->dead) { if (target->dead) {
return false; return false;
@ -1220,11 +1220,11 @@ bool Creature::IsProperTarget(Creature* target, bool no_teammate)
if (target->IsInvincible()) { if (target->IsInvincible()) {
return false; return false;
} }
#if 0 if (!a8::HasBitFlag(ignore_buff_effects, kBET_Hide)) {
if (target->HasBuffEffect(kBET_Hide)) { if (target->HasBuffEffect(kBET_Hide)) {
return false; return false;
}
} }
#endif
if (target->HasBuffEffect(kBET_Driver)) { if (target->HasBuffEffect(kBET_Driver)) {
return false; return false;
} }

2
server/gameserver/creature.h
View File

@ -215,7 +215,7 @@ class Creature : public MoveableEntity
void RemoveEffects(std::vector<int> effect_uniids); void RemoveEffects(std::vector<int> effect_uniids);
void ClearEffect(); void ClearEffect();
bool IsProperTarget(Creature* target, bool no_teammate = false); bool IsProperTarget(Creature* target, bool no_teammate = false, long long ignore_buff_effects = 0);
bool IsEnemy(Creature* target); bool IsEnemy(Creature* target);
virtual void SelectSkillTargets(Skill* skill, virtual void SelectSkillTargets(Skill* skill,
const Position& target_pos, const Position& target_pos,

4
server/gameserver/virtualbullet.cc
View File

@ -257,7 +257,9 @@ void VirtualBullet::GetHitCreatures(BulletCheckResult& result)
[this, &result] (Creature* c, bool& stop) [this, &result] (Creature* c, bool& stop)
{ {
bool no_teammate = false; bool no_teammate = false;
if (sender.Get()->IsProperTarget(c, no_teammate)) { long long ignore_buff_effects = 0;
a8::SetBitFlag(ignore_buff_effects, kBET_Hide);
if (sender.Get()->IsProperTarget(c, no_teammate, ignore_buff_effects)) {
if (gun_meta->ispenetrate() && if (gun_meta->ispenetrate() &&
hit_objects_.find(c->GetUniId()) != hit_objects_.end()) { hit_objects_.find(c->GetUniId()) != hit_objects_.end()) {
//穿人 //穿人