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

Bugfixes, added saving/loading maps in editor for web version

Browse Source
This commit is contained in:
Anuken
2018-05-31 23:49:43 -04:00
parent 418467e467
commit 23d07600f7
10 changed files with 103 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java
View File

@@ -1,7 +1,6 @@
package io.anuke.mindustry.ui.dialogs;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.gen.CallClient;
import io.anuke.mindustry.net.Administration.PlayerInfo;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.net.NetConnection;
@@ -49,7 +48,7 @@ public class AdminsDialog extends FloatingDialog {
for(Player player : playerGroup.all()){
NetConnection c = Net.getConnection(player.clientid);
if(c != null){
CallClient.adminSet(player, false);
//CallClient.adminSet(player, false);
break;
}
}

5
core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
View File

@@ -3,7 +3,6 @@ package io.anuke.mindustry.ui.fragments;
import com.badlogic.gdx.utils.ObjectMap;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.gen.CallClient;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.net.NetConnection;
import io.anuke.mindustry.net.NetEvents;
@@ -161,12 +160,12 @@ public class PlayerListFragment implements Fragment{
if(netServer.admins.isAdmin(id, connection.address)){
ui.showConfirm("$text.confirm", "$text.confirmunadmin", () -> {
netServer.admins.unAdminPlayer(id);
CallClient.adminSet(player, false);
//CallClient.adminSet(player, false);
});
}else{
ui.showConfirm("$text.confirm", "$text.confirmadmin", () -> {
netServer.admins.adminPlayer(id, connection.address);
CallClient.adminSet(player, true);
//CallClient.adminSet(player, true);
});
}
}).update(b ->{