From 8ec465319bc520d016ec1f25f4cd8628ef2f3fb8 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 Sep 2019 16:10:00 -0400 Subject: [PATCH] server debug --- core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java | 4 ++-- server/src/io/anuke/mindustry/server/ServerControl.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java index c6b2dabe60..f8a7e36a97 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java @@ -204,8 +204,8 @@ public class MapsDialog extends FloatingDialog{ } }).fillX().height(54f).marginLeft(10); - table.addImageTextButton(map.workshop ? "$view.workshop" : "$delete", map.workshop ? Icon.linkSmall : Icon.trash16Small, () -> { - if(map.workshop){ + table.addImageTextButton(map.workshop && steam ? "$view.workshop" : "$delete", map.workshop && steam ? Icon.linkSmall : Icon.trash16Small, () -> { + if(map.workshop && steam){ platform.viewMapListing(map); }else{ ui.showConfirm("$confirm", Core.bundle.format("map.delete", map.name()), () -> { diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java index 501e6fb157..33c0dde34f 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/io/anuke/mindustry/server/ServerControl.java @@ -801,6 +801,7 @@ public class ServerControl implements ApplicationListener{ Runnable r = () -> { Array players = new Array<>(); + Log.info("Players: " + playerGroup.all()); for(Player p : playerGroup.all()){ players.add(p); p.setDead(true); @@ -814,6 +815,8 @@ public class ServerControl implements ApplicationListener{ state.rules = world.getMap().applyRules(lastMode); for(Player p : players){ + + Log.info("Iterate: " + p.name); p.reset(); if(state.rules.pvp){ p.setTeam(netServer.assignTeam(p, new ArrayIterable<>(players)));