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

修复打自己问题

Browse Source
This commit is contained in:
aozhiwei 2019-04-25 17:11:33 +08:00
parent 92e6e37a78
commit 2990a44ca2
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/gameserver/bullet.cc
View File

@ -36,11 +36,22 @@ void Bullet::Update(int delta_time)
} else { } else {
std::set<Entity*> objects; std::set<Entity*> objects;
for (auto& grid : grid_list) { for (auto& grid : grid_list) {
for (Human* hum: grid->human_list) {
#if 1
if (hum != player) {
#else
if (hum != player &&
(hum->team_id == 0 || player->team_id != hum->team_id)) {
#endif
if (TestCollision(hum)) {
objects.insert(hum);
}
}
}
for (Entity* entity : grid->entity_list) { for (Entity* entity : grid->entity_list) {
switch (entity->entity_type) { switch (entity->entity_type) {
case ET_Obstacle: case ET_Obstacle:
case ET_Building: case ET_Building:
case ET_Player:
{ {
if (TestCollision(entity)) { if (TestCollision(entity)) {
objects.insert(entity); objects.insert(entity);