diff --git a/build.gradle b/build.gradle index cce55f263b..e04b77a2cc 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.8' roboVMVersion = '2.3.0' - uCoreVersion = '64ec4a15148b27749ca7b505dea9743add9902f2' + uCoreVersion = 'e8b535aa79075670c3478c7d24cacec8c58e8fc2' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index 0a69a59489..4cd5e40d32 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -95,7 +95,7 @@ public class DesktopInput extends InputHandler{ if(cursor == null) return; //draw selection(s) - if(mode == placing){ + if(mode == placing && recipe != null){ NormalizeResult result = PlaceUtils.normalizeArea(selectX, selectY, cursor.x, cursor.y, rotation, true, maxLength); for(int i = 0; i <= result.getLength(); i += recipe.result.size){ diff --git a/core/src/io/anuke/mindustry/net/NetEvents.java b/core/src/io/anuke/mindustry/net/NetEvents.java index 8e52472cca..8c326f5014 100644 --- a/core/src/io/anuke/mindustry/net/NetEvents.java +++ b/core/src/io/anuke/mindustry/net/NetEvents.java @@ -18,7 +18,7 @@ public class NetEvents{ 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){ Vars.ui.chatfrag.addMessage(message, player == null ? null : colorizeName(player.id, player.name));