Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0
# Conflicts: # core/assets-raw/sprites/blocks/chainturret-icon.png # core/assets-raw/sprites/blocks/chainturret.png # core/assets-raw/sprites/blocks/titancannon-icon.png # core/assets-raw/sprites/blocks/titancannon.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/version.properties # core/src/io/anuke/mindustry/entities/effect/TeslaOrb.java # core/src/io/anuke/mindustry/graphics/BlockRenderer.java # core/src/io/anuke/mindustry/input/InputHandler.java # core/src/io/anuke/mindustry/input/PlaceMode.java
This commit is contained in:
@@ -115,6 +115,8 @@ public class AndroidLauncher extends AndroidApplication{
|
||||
+ Character.digit(s.charAt(i + 1), 16));
|
||||
}
|
||||
|
||||
if(new String(Base64Coder.encode(data)).equals("AAAAAAAAAOA=")) throw new RuntimeException("Bad UUID.");
|
||||
|
||||
return data;
|
||||
}catch (Exception e){
|
||||
Settings.defaults("uuid", "");
|
||||
|
||||
Reference in New Issue
Block a user