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

Fixed some crashes

Browse Source
This commit is contained in:
Anuken
2020-11-29 11:08:12 -05:00
parent 67c6e0179f
commit 29be8176c1
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -769,7 +769,7 @@ public class MobileInput extends InputHandler implements GestureListener{
@Override @Override
public boolean pan(float x, float y, float deltaX, float deltaY){ public boolean pan(float x, float y, float deltaX, float deltaY){
if(Core.scene.hasDialog() || Core.settings.getBool("keyboard")) return false; if(Core.scene == null || Core.scene.hasDialog() || Core.settings.getBool("keyboard")) return false;
float scale = Core.camera.width / Core.graphics.getWidth(); float scale = Core.camera.width / Core.graphics.getWidth();
deltaX *= scale; deltaX *= scale;

1
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -711,6 +711,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
stable.table(t -> { stable.table(t -> {
t.add("@sectors.resources").padRight(4); t.add("@sectors.resources").padRight(4);
for(UnlockableContent c : sector.info.resources){ for(UnlockableContent c : sector.info.resources){
if(c == null) continue; //apparently this is possible.
t.image(c.icon(Cicon.small)).padRight(3).size(Cicon.small.size); t.image(c.icon(Cicon.small)).padRight(3).size(Cicon.small.size);
} }
}).padLeft(10f).fillX().row(); }).padLeft(10f).fillX().row();