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

Fixed bullets being able to hit their own players

Browse Source
This commit is contained in:
Anuken
2018-03-07 00:08:24 -05:00
parent 565c3ed12f
commit 7425b5e367
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/version.properties
View File

@@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Wed Mar 07 00:00:12 EST 2018 #Wed Mar 07 00:06:45 EST 2018
version=release version=release
androidBuildCode=339 androidBuildCode=339
name=Mindustry name=Mindustry
code=3.4 code=3.4
build=32 build=custom build

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.mindustry.world.Tile;
import io.anuke.ucore.entities.BulletEntity; import io.anuke.ucore.entities.BulletEntity;
import io.anuke.ucore.entities.Entity; import io.anuke.ucore.entities.Entity;
import io.anuke.ucore.entities.SolidEntity;
import io.anuke.ucore.util.Timer; import io.anuke.ucore.util.Timer;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -65,11 +64,6 @@ public class Bullet extends BulletEntity{
} }
} }
@Override
public boolean collides(SolidEntity other){
return true;
}
@Override @Override
public int getDamage(){ public int getDamage(){
return damage == -1 ? type.damage : damage; return damage == -1 ? type.damage : damage;