Fixed build block repair / Sectors in random maps / Editor unlocks

2018-10-18 16:31:15 -04:00
parent 5e5838a8c1
commit 91a2dfab36
5 changed files with 12 additions and 6 deletions
@@ -210,7 +210,9 @@ public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncT
                tile = tile.target();

                if(tile.entity != null && tile.entity.collide(this) && !tile.entity.isDead() && (type.collidesTeam || tile.getTeam() != team)){
-                    tile.entity.collision(this);
+                    if(tile.getTeam() != team){
+                        tile.entity.collision(this);
+                    }

                    if(!supressCollision){
                        type.hitTile(this, tile);