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

Crash fixes

Browse Source
This commit is contained in:
Anuken
2018-09-04 09:00:37 -04:00
parent ff37e99d71
commit 063893adee
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -26,7 +26,7 @@ allprojects {
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
roboVMVersion = '2.3.0' roboVMVersion = '2.3.0'
uCoreVersion = '64ec4a15148b27749ca7b505dea9743add9902f2' uCoreVersion = 'e8b535aa79075670c3478c7d24cacec8c58e8fc2'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()

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

@@ -95,7 +95,7 @@ public class DesktopInput extends InputHandler{
if(cursor == null) return; if(cursor == null) return;
//draw selection(s) //draw selection(s)
if(mode == placing){ if(mode == placing && recipe != null){
NormalizeResult result = PlaceUtils.normalizeArea(selectX, selectY, cursor.x, cursor.y, rotation, true, maxLength); NormalizeResult result = PlaceUtils.normalizeArea(selectX, selectY, cursor.x, cursor.y, rotation, true, maxLength);
for(int i = 0; i <= result.getLength(); i += recipe.result.size){ for(int i = 0; i <= result.getLength(); i += recipe.result.size){

2
core/src/io/anuke/mindustry/net/NetEvents.java
View File

@@ -18,7 +18,7 @@ public class NetEvents{
throw new ValidateException(player, "Player has sent a message above the text limit."); throw new ValidateException(player, "Player has sent a message above the text limit.");
} }
Log.info("&y{0}: &lb{1}", (player.name == null ? "" : player.name), message); Log.info("&y{0}: &lb{1}", (player == null || player.name == null ? "" : player.name), message);
if(Vars.ui != null){ if(Vars.ui != null){
Vars.ui.chatfrag.addMessage(message, player == null ? null : colorizeName(player.id, player.name)); Vars.ui.chatfrag.addMessage(message, player == null ? null : colorizeName(player.id, player.name));