mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-27 23:11:12 -08:00
Code Issues 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
public void hitEntity(Bullet b, Hitboxc entity, float 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);
shield -= shieldDamage;
hitTime = 1f;
amount -= shieldDamage;
if(amount > 0){