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

Fixed setProp x/y not teleporting on strict servers

Browse Source
This commit is contained in:
Anuken
2023-09-22 10:06:43 -04:00
parent 71e049d92d
commit f633fb0af5
13 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/input/InputHandler.java
View File

@@ -325,7 +325,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
for(int id : unitIds){
Unit unit = Groups.unit.getByID(id);
if(unit != null && unit.team == player.team() && unit.controller() instanceof CommandAI ai){
if(stance == UnitStance.stopStance){ //not a real stance, just cancels orders
if(stance == UnitStance.stop){ //not a real stance, just cancels orders
ai.clearCommands();
}else{
ai.stance = stance;

15
core/src/mindustry/input/MobileInput.java
View File

@@ -288,23 +288,20 @@ public class MobileInput extends InputHandler implements GestureListener{
t.visible(() -> !showCancel() && block == null && !hasSchem());
t.bottom().left();
t.button("@command.queue", Icon.rightOpen, Styles.clearTogglet, () -> {
queueCommandMode = !queueCommandMode;
}).width(155f).height(48f).margin(12f).checked(b -> queueCommandMode).visible(() -> commandMode).row();
t.button("@command", Icon.units, Styles.clearTogglet, () -> {
commandMode = !commandMode;
}).width(155f).height(56f).margin(12f).checked(b -> {
b.setText(queueCommandMode ? bundle.get("command") + "\n" + bundle.get("command.queue") : bundle.get("command"));
return commandMode;
});
t.button(Icon.rightOpen, Styles.clearTogglei, () -> {
queueCommandMode = !queueCommandMode;
}).size(56f).margin(12f).checked(b -> queueCommandMode).visible(() -> commandMode).row();
}).width(155f).height(48f).margin(12f).checked(b -> commandMode);
//for better looking insets
t.rect((x, y, w, h) -> {
if(Core.scene.marginBottom > 0){
Tex.paneRight.draw(x, 0, w, y);
}
}).fillX().colspan(2).row();
}).fillX().row();
});
group.fill(t -> {