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

Fixed empty admin menu

Browse Source
This commit is contained in:
Anuken
2023-09-03 22:02:02 -04:00
parent 5548e72750
commit 26b66f9bdb
1 changed files with 73 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/ui/fragments/PlayerListFragment.java
+5 -10
View File
@@ -75,6 +75,8 @@ public class PlayerListFragment{
} }
public void rebuild(){ public void rebuild(){
boolean allowTeamSwitch = !state.isCampaign() && (state.rules.pvp || state.rules.infiniteResources);
content.clear(); content.clear();
float h = 50f; float h = 50f;
@@ -141,15 +143,6 @@ public class PlayerListFragment{
button.image(Icon.admin).visible(() -> user.admin && !(!user.isLocal() && net.server())).padRight(5).get().updateVisibility(); button.image(Icon.admin).visible(() -> user.admin && !(!user.isLocal() && net.server())).padRight(5).get().updateVisibility();
var style = new ImageButtonStyle(){{
down = Styles.none;
up = Styles.none;
imageCheckedColor = Pal.accent;
imageDownColor = Pal.accent;
imageUpColor = Color.white;
imageOverColor = Color.lightGray;
}};
var ustyle = new ImageButtonStyle(){{ var ustyle = new ImageButtonStyle(){{
down = Styles.none; down = Styles.none;
up = Styles.none; up = Styles.none;
@@ -161,6 +154,7 @@ public class PlayerListFragment{
if(net.server() || (player.admin && (!user.admin || user == player))){ if(net.server() || (player.admin && (!user.admin || user == player))){
button.add().growY(); button.add().growY();
if(allowTeamSwitch || user != player){
button.button(Icon.menu, ustyle, () -> { button.button(Icon.menu, ustyle, () -> {
var dialog = new BaseDialog(user.coloredName()); var dialog = new BaseDialog(user.coloredName());
@@ -195,7 +189,7 @@ public class PlayerListFragment{
} }
//there's generally no reason to team switch outside PvP or sandbox, and it's basically an easy way to cheat //there's generally no reason to team switch outside PvP or sandbox, and it's basically an easy way to cheat
if(!state.isCampaign() && (state.rules.pvp || state.rules.infiniteResources)){ if(allowTeamSwitch){
t.button("@player.team", Icon.redo, bstyle, () -> { t.button("@player.team", Icon.redo, bstyle, () -> {
var teamSelect = new BaseDialog(Core.bundle.get("player.team") + ": " + user.name); var teamSelect = new BaseDialog(Core.bundle.get("player.team") + ": " + user.name);
teamSelect.setFillParent(false); teamSelect.setFillParent(false);
@@ -251,6 +245,7 @@ public class PlayerListFragment{
}).size(h); }).size(h);
}
}else if(!user.isLocal() && !user.admin && net.client() && Groups.player.size() >= 3 && player.team() == user.team()){ //votekick }else if(!user.isLocal() && !user.admin && net.client() && Groups.player.size() >= 3 && player.team() == user.team()){ //votekick
button.add().growY(); button.add().growY();