Fixed bullets being able to hit their own players
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#Autogenerated file. Do not modify.
|
||||
#Wed Mar 07 00:00:12 EST 2018
|
||||
#Wed Mar 07 00:06:45 EST 2018
|
||||
version=release
|
||||
androidBuildCode=339
|
||||
name=Mindustry
|
||||
code=3.4
|
||||
build=32
|
||||
build=custom build
|
||||
|
||||
@@ -4,7 +4,6 @@ import io.anuke.mindustry.entities.enemies.Enemy;
|
||||
import io.anuke.mindustry.world.Tile;
|
||||
import io.anuke.ucore.entities.BulletEntity;
|
||||
import io.anuke.ucore.entities.Entity;
|
||||
import io.anuke.ucore.entities.SolidEntity;
|
||||
import io.anuke.ucore.util.Timer;
|
||||
|
||||
import static io.anuke.mindustry.Vars.*;
|
||||
@@ -65,11 +64,6 @@ public class Bullet extends BulletEntity{
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean collides(SolidEntity other){
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDamage(){
|
||||
return damage == -1 ? type.damage : damage;
|
||||
|
||||
Reference in New Issue
Block a user