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

iPhone X splash images

Browse Source
This commit is contained in:
Anuken
2019-08-20 19:14:30 -04:00
parent 46230ad307
commit bae88ec416
22 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/entities/type/Player.java
View File

@@ -527,7 +527,9 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
spawner = null;
}
avoidOthers();
if(isLocal || Net.server()){
avoidOthers();
}
Tile tile = world.tileWorld(x, y);

7
core/src/io/anuke/mindustry/maps/Maps.java
View File

@@ -214,7 +214,12 @@ public class Maps implements Disposable{
return filters;
}else{
return JsonIO.read(Array.class, str);
try{
return JsonIO.read(Array.class, str);
}catch(Exception e){
e.printStackTrace();
return readFilters("");
}
}
}

4
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@@ -242,9 +242,9 @@ public class HudFragment extends Fragment{
IntFormat fps = new IntFormat("fps");
IntFormat ping = new IntFormat("ping");
info.label(() -> fps.get(Core.graphics.getFramesPerSecond())).left();
info.label(() -> fps.get(Core.graphics.getFramesPerSecond())).left().style("outline");
info.row();
info.label(() -> ping.get(Net.getPing())).visible(Net::client).left();
info.label(() -> ping.get(Net.getPing())).visible(Net::client).left().style("outline");
}).top().left();
});