mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-17 14:51:15 -08:00
Code Issues Projects Releases Wiki Activity

server debug

Browse source
This commit is contained in:
Anuken 2019-09-25 16:10:00 -04:00
parent 53f66308d4
commit 8ec465319b
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java
View file

@ -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()), () -> {

3
server/src/io/anuke/mindustry/server/ServerControl.java
View file

@ -801,6 +801,7 @@ public class ServerControl implements ApplicationListener{
Runnable r = () -> {
Array<Player> 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)));