diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 992a40e955..097cce0130 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -37,6 +37,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I @Import float x, y, rotation, elevation, maxHealth, drag, armor, hitSize, health, ammo, minFormationSpeed; @Import Team team; @Import int id; + @Import @Nullable Tile mineTile; private UnitController controller; UnitType type; @@ -123,6 +124,9 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I case shooting -> isShooting() ? 1 : 0; case shootX -> World.conv(aimX()); case shootY -> World.conv(aimY()); + case mining -> mining() ? 1 : 0; + case mineX -> mining() ? mineTile.x : -1; + case mineY -> mining() ? mineTile.y : -1; case flag -> flag; case controlled -> controller instanceof LogicAI || controller instanceof Player ? 1 : 0; case payloadCount -> self() instanceof Payloadc pay ? pay.payloads().size : 0; diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java index acac5efdce..ab1d7ca687 100644 --- a/core/src/mindustry/logic/LAccess.java +++ b/core/src/mindustry/logic/LAccess.java @@ -27,6 +27,9 @@ public enum LAccess{ shootX, shootY, shooting, + mineX, + mineY, + mining, team, type, flag,