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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-12-28 14:51:50 -05:00
parent db40f154c5
commit 98e6303765
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/entities/bullet/RailBulletType.java
View File

@@ -63,6 +63,11 @@ public class RailBulletType extends BulletType{
} }
} }
@Override
public boolean testCollision(Bullet bullet, Building tile){
return bullet.team != tile.team;
}
@Override @Override
public void hitEntity(Bullet b, Hitboxc entity, float initialHealth){ public void hitEntity(Bullet b, Hitboxc entity, float initialHealth){
handle(b, entity, initialHealth); handle(b, entity, initialHealth);

1
core/src/mindustry/entities/comp/ShieldComp.java
View File

@@ -50,6 +50,7 @@ abstract class ShieldComp implements Healthc, Posc{
float shieldDamage = Math.min(Math.max(shield, 0), amount); float shieldDamage = Math.min(Math.max(shield, 0), amount);
shield -= shieldDamage; shield -= shieldDamage;
hitTime = 1f;
amount -= shieldDamage; amount -= shieldDamage;
if(amount > 0){ if(amount > 0){