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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-02-21 09:22:05 -05:00
parent 544828d9fb ca726d579e
commit 02d8f679b5
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,6 +131,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
case dead -> dead || !isAdded() ? 1 : 0; case dead -> dead || !isAdded() ? 1 : 0;
case team -> team.id; case team -> team.id;
case shooting -> isShooting() ? 1 : 0; case shooting -> isShooting() ? 1 : 0;
case boosting -> type.canBoost && isFlying() ? 1 : 0;
case range -> range() / tilesize; case range -> range() / tilesize;
case shootX -> World.conv(aimX()); case shootX -> World.conv(aimX());
case shootY -> World.conv(aimY()); case shootY -> World.conv(aimY());

1
core/src/mindustry/logic/LAccess.java
View File

@@ -30,6 +30,7 @@ public enum LAccess{
dead, dead,
range, range,
shooting, shooting,
boosting,
mineX, mineX,
mineY, mineY,
mining, mining,