mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-08-01 23:50:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed iOS NullPtr

Browse Source
This commit is contained in:
Anuken
2018-07-03 19:03:53 -04:00
parent 4d600f973a
commit 677526cb16
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/Vars.java
View File

@ -23,6 +23,7 @@ import io.anuke.ucore.entities.trait.DrawTrait;
import io.anuke.ucore.entities.impl.EffectEntity;
import io.anuke.ucore.scene.ui.layout.Unit;
import io.anuke.ucore.util.OS;
import io.anuke.ucore.util.Translator;
import java.util.Locale;
@ -96,6 +97,8 @@ public class Vars{
public static final int tilesize = 8;
public static final Translator[] tmptr = new Translator[]{new Translator(), new Translator(), new Translator(), new Translator()};
public static final Locale[] locales = {new Locale("en"), new Locale("fr"), new Locale("ru"), new Locale("uk", "UA"), new Locale("pl"),
new Locale("de"), new Locale("pt", "BR"), new Locale("ko"), new Locale("in", "ID"), new Locale("ita"), new Locale("es")};

5
core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java
View File

@ -130,4 +130,9 @@ public class ItemTransfer extends TimedEntity implements DrawTrait{
public EntityGroup targetGroup() {
return effectGroup;
}
@Override
public float fin(){
return time() / lifetime();
}
}

2
core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
View File

@ -30,12 +30,12 @@ import io.anuke.ucore.util.*;
import java.util.Arrays;
import static io.anuke.mindustry.Vars.tilesize;
import static io.anuke.mindustry.Vars.tmptr;
import static io.anuke.mindustry.Vars.world;
/**Interface for units that build, break or mine things.*/
public interface BuilderTrait {
//these are not instance variables!
Translator[] tmptr = {new Translator(), new Translator(), new Translator(), new Translator()};
float placeDistance = 140f;
float mineDistance = 70f;