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

Balance / UUID logging in d/c messages

Browse Source
This commit is contained in:
Anuken
2019-05-31 19:55:09 -04:00
parent 940965f03d
commit 61a92d55ae
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/content/Blocks.java
+1 -1
View File
@@ -1547,7 +1547,7 @@ public class Blocks implements ContentList{
reload = 50f; reload = 50f;
firingMoveFract = 0.5f; firingMoveFract = 0.5f;
shootDuration = 220f; shootDuration = 220f;
powerUse = 10f; powerUse = 14f;
health = 200 * size * size; health = 200 * size * size;
consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.5f)).update(false); consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.5f)).update(false);
core/src/io/anuke/mindustry/core/NetServer.java
+2 -2
View File
@@ -234,7 +234,7 @@ public class NetServer implements ApplicationListener{
} }
player.remove(); player.remove();
netServer.connections.remove(player.con.id); 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){ private static float compound(float speed, float drag){
@@ -372,7 +372,7 @@ public class NetServer implements ApplicationListener{
player.add(); player.add();
player.con.hasConnected = true; player.con.hasConnected = true;
Call.sendMessage("[accent]" + player.name + "[accent] has connected."); 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(){ public boolean isWaitingForPlayers(){
core/src/io/anuke/mindustry/editor/MapEditorDialog.java
+1 -2
View File
@@ -155,8 +155,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
} }
}); });
loadDialog = new MapLoadDialog(map -> loadDialog = new MapLoadDialog(map -> ui.loadAnd(() -> {
ui.loadAnd(() -> {
try{ try{
editor.beginEdit(map); editor.beginEdit(map);
}catch(Exception e){ }catch(Exception e){