diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 5ddaeb7340..999f060388 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -1547,7 +1547,7 @@ public class Blocks implements ContentList{ reload = 50f; firingMoveFract = 0.5f; shootDuration = 220f; - powerUse = 10f; + powerUse = 14f; health = 200 * size * size; consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.5f)).update(false); diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index 461a7a65c9..465aa80e87 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -234,7 +234,7 @@ public class NetServer implements ApplicationListener{ } player.remove(); netServer.connections.remove(player.con.id); - Log.info("&lc{0} has disconnected.", player.name); + Log.info("&lm[{1}] &lc{0} has disconnected.", player.name, player.uuid); } private static float compound(float speed, float drag){ @@ -248,16 +248,16 @@ public class NetServer implements ApplicationListener{ @Remote(targets = Loc.client, unreliable = true) public static void onClientShapshot( - Player player, - int snapshotID, - float x, float y, - float pointerX, float pointerY, - float rotation, float baseRotation, - float xVelocity, float yVelocity, - Tile mining, - boolean boosting, boolean shooting, boolean chatting, - BuildRequest[] requests, - float viewX, float viewY, float viewWidth, float viewHeight + Player player, + int snapshotID, + float x, float y, + float pointerX, float pointerY, + float rotation, float baseRotation, + float xVelocity, float yVelocity, + Tile mining, + boolean boosting, boolean shooting, boolean chatting, + BuildRequest[] requests, + float viewX, float viewY, float viewWidth, float viewHeight ){ NetConnection connection = player.con; if(connection == null || snapshotID < connection.lastRecievedClientSnapshot) return; @@ -372,7 +372,7 @@ public class NetServer implements ApplicationListener{ player.add(); player.con.hasConnected = true; Call.sendMessage("[accent]" + player.name + "[accent] has connected."); - Log.info("&y{0} has connected.", player.name); + Log.info("&lm[{1}] &y{0} has connected. ", player.name, player.uuid); } public boolean isWaitingForPlayers(){ diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index 178e3f9478..8361e8bd7d 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -155,8 +155,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ } }); - loadDialog = new MapLoadDialog(map -> - ui.loadAnd(() -> { + loadDialog = new MapLoadDialog(map -> ui.loadAnd(() -> { try{ editor.beginEdit(map); }catch(Exception e){