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

Improvements to annotation code generation system, client RMI

Browse Source
This commit is contained in:
Anuken
2018-05-18 17:21:18 -07:00
parent ae3bcac3b7
commit b3e188a5f4
12 changed files with 130 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui.dialogs;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.gen.CallEvent;
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 +49,7 @@ public class AdminsDialog extends FloatingDialog {
for(Player player : playerGroup.all()){
NetConnection c = Net.getConnection(player.clientid);
if(c != null){
CallEvent.adminSet(player, false);
CallClient.adminSet(player, false);
break;
}
}

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

@@ -3,7 +3,7 @@ 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.CallEvent;
import io.anuke.mindustry.gen.CallClient;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.net.NetConnection;
import io.anuke.mindustry.net.NetEvents;
@@ -49,7 +49,7 @@ public class PlayerListFragment implements Fragment{
margin(12f);
get().addCheck("$text.server.friendlyfire", b -> {
CallEvent.friendlyFireChange(b);
// CallClient.friendlyFireChange(b);
}).growX().update(i -> i.setChecked(state.friendlyFire)).disabled(b -> Net.client()).padRight(5);
new button("$text.server.bans", () -> {
@@ -160,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);
CallEvent.adminSet(player, false);
CallClient.adminSet(player, false);
});
}else{
ui.showConfirm("$text.confirm", "$text.confirmadmin", () -> {
netServer.admins.adminPlayer(id, connection.address);
CallEvent.adminSet(player, true);
CallClient.adminSet(player, true);
});
}
}).update(b ->{