Merge remote-tracking branch 'origin/master'

2023-07-23 16:30:49 -04:00
parent 636ce4ca94 bfdd7ecc3a
commit 4998abfe01
5 changed files with 17 additions and 3 deletions
--- a/core/src/mindustry/ui/fragments/PlayerListFragment.java
+++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java
@@ -197,7 +197,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
-                        if(state.rules.pvp || state.rules.infiniteResources){
+                        if(!state.isCampaign() && (state.rules.pvp || state.rules.infiniteResources)){
                            t.button("@player.team", Icon.redo, bstyle, () -> {
                                var teamSelect = new BaseDialog(Core.bundle.get("player.team") + ": " + user.name);
                                teamSelect.setFillParent(false);