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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0

Browse Source
This commit is contained in:
Anuken
2018-03-08 22:34:26 -05:00
parent 7d8b0f9941 2a306d70be
commit 3131e8c7e9
31 changed files with 508 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 (other instanceof Player) == (owner instanceof Enemy);
}
@Override
public int getDamage(){
return damage == -1 ? type.damage : damage;