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

Synchronized settings / Dead units sense as non-controlled

Browse Source
This commit is contained in:
Anuken
2021-02-25 09:12:17 -05:00
parent 781410ea04
commit f6eba3edae
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,8 +139,8 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
case mineX -> mining() ? mineTile.x : -1;
case mineY -> mining() ? mineTile.y : -1;
case flag -> flag;
case controlled -> controller instanceof LogicAI ? 1 : controller instanceof Player ? 2 : controller instanceof FormationAI ? 3 : 0;
case commanded -> controller instanceof FormationAI ? 1 : 0;
case controlled -> !isValid() ? 0 : controller instanceof LogicAI ? 1 : controller instanceof Player ? 2 : controller instanceof FormationAI ? 3 : 0;
case commanded -> controller instanceof FormationAI && isValid() ? 1 : 0;
case payloadCount -> self() instanceof Payloadc pay ? pay.payloads().size : 0;
case size -> hitSize / tilesize;
default -> Float.NaN;

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=cace621b0f6dbbe263e9adbfc1a9f82bd74a6b9a
archash=919af3d6fab9319626fbd0e28ccb0a8588fcc221