Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed random bullet pierce

Browse Source
This commit is contained in:
Anuken
2018-09-05 09:44:26 -04:00
parent 389034bf1a
commit bf5055f944
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/io/anuke/mindustry/entities/bullet/Bullet.java
View File

@@ -194,10 +194,8 @@ public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncT
if(tile == null) return false; if(tile == null) return false;
tile = tile.target(); tile = tile.target();
if(tile.entity != null && tile.entity.collide(this) && !tile.entity.isDead() && (type.collidesTeam || tile.entity.tile.getTeam() != team)){ if(tile.entity != null && tile.entity.collide(this) && !tile.entity.isDead() && (type.collidesTeam || tile.getTeam() != team)){
if(tile.entity.getTeam() != team){ tile.entity.collision(this);
tile.entity.collision(this);
}
if(!supressCollision){ if(!supressCollision){
type.hitTile(this, tile); type.hitTile(this, tile);
@@ -233,6 +231,8 @@ public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncT
timer.clear(); timer.clear();
team = null; team = null;
data = null; data = null;
supressCollision = false;
supressOnce = false;
initialized = false; initialized = false;
} }