Balance / UUID logging in d/c messages

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

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);

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){
@ -248,16 +248,16 @@ public class NetServer implements ApplicationListener{
@Remote(targets = Loc.client, unreliable = true) @Remote(targets = Loc.client, unreliable = true)
public static void onClientShapshot( public static void onClientShapshot(
Player player, Player player,
int snapshotID, int snapshotID,
float x, float y, float x, float y,
float pointerX, float pointerY, float pointerX, float pointerY,
float rotation, float baseRotation, float rotation, float baseRotation,
float xVelocity, float yVelocity, float xVelocity, float yVelocity,
Tile mining, Tile mining,
boolean boosting, boolean shooting, boolean chatting, boolean boosting, boolean shooting, boolean chatting,
BuildRequest[] requests, BuildRequest[] requests,
float viewX, float viewY, float viewWidth, float viewHeight float viewX, float viewY, float viewWidth, float viewHeight
){ ){
NetConnection connection = player.con; NetConnection connection = player.con;
if(connection == null || snapshotID < connection.lastRecievedClientSnapshot) return; if(connection == null || snapshotID < connection.lastRecievedClientSnapshot) return;
@ -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(){

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){