mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-03-30 02:31:04 -07:00
Code Issues Projects Releases Wiki Activity

Fixed missile shield pierce

Browse source
This commit is contained in:
Anuken 2018-09-03 09:07:59 -04:00
parent 5129e2ea73
commit 019e22aff2
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -26,7 +26,7 @@ allprojects {
appName = 'Mindustry'
gdxVersion = '1.9.8'
roboVMVersion = '2.3.0'
uCoreVersion = 'b6c84cdaad80c58267bdb0fc91d7197bb2252247'
uCoreVersion = 'f311d4683c798c2b0e5967938edb7a52a1294119'
getVersionString = {
String buildVersion = getBuildVersion()

10
core/src/io/anuke/mindustry/entities/bullet/Bullet.java
View file

@ -163,7 +163,7 @@ public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncT
@Override
public boolean collides(SolidTrait other){
return type.collides && super.collides(other);
return type.collides && super.collides(other) && !supressCollision;
}
@Override
@ -208,6 +208,14 @@ public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncT
supressCollision = false;
}
@Override
protected void updateLife(){
if(time >= type.lifetime){
if(!supressCollision) type.despawned(this);
remove();
}
}
@Override
public void reset(){
super.reset();