mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 03:08:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tab cycling not working

Browse Source
This commit is contained in:
Anuken 2020-08-17 20:02:56 -04:00
parent 7ecf5aa26d
commit 7ec6e64c18
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,7 @@ public class DesktopInput extends InputHandler{
public void update(){ public void update(){
super.update(); super.update();
if(net.active() && Core.input.keyTap(Binding.player_list)){ if(net.active() && Core.input.keyTap(Binding.player_list) && (scene.getKeyboardFocus() == null || scene.getKeyboardFocus().isDescendantOf(ui.listfrag.content))){
ui.listfrag.toggle(); ui.listfrag.toggle();
} }

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

@ -250,7 +250,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
@Remote(targets = Loc.both, called = Loc.both, forward = true) @Remote(targets = Loc.both, called = Loc.both, forward = true)
public static void unitClear(Player player){ public static void unitClear(Player player){
//no free core teleports? //no free core teleports?
if(!player.dead() && player.unit().spawnedByCore) return; if(player == null || !player.dead() && player.unit().spawnedByCore) return;
Fx.spawn.at(player); Fx.spawn.at(player);
player.clearUnit(); player.clearUnit();
@ -259,7 +259,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
@Remote(targets = Loc.both, called = Loc.server, forward = true) @Remote(targets = Loc.both, called = Loc.server, forward = true)
public static void unitCommand(Player player){ public static void unitCommand(Player player){
if(player.dead() || !(player.unit() instanceof Commanderc)) return; if(player == null || player.dead() || !(player.unit() instanceof Commanderc)) return;
Commanderc commander = (Commanderc)player.unit(); Commanderc commander = (Commanderc)player.unit();

2
core/src/mindustry/ui/fragments/PlayerListFragment.java
View File

@ -16,8 +16,8 @@ import mindustry.ui.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class PlayerListFragment extends Fragment{ public class PlayerListFragment extends Fragment{
public Table content = new Table().marginRight(13f).marginLeft(13f);
private boolean visible = false; private boolean visible = false;
private Table content = new Table().marginRight(13f).marginLeft(13f);
private Interval timer = new Interval(); private Interval timer = new Interval();
private TextField sField; private TextField sField;
private boolean found = false; private boolean found = false;

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=12a666e6b9871bbe865a3e45610678d2ce27d100 archash=ffe8dc8a19bfea1ac934b601be452c272b850945