Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow any player to become GM in lobby without a vote #4644

Merged
merged 2 commits into from
Jul 21, 2023
Merged

Allow any player to become GM in lobby without a vote #4644

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc4fb24
allow player to become GM in lobby without a vote
Jul 18, 2023
3db6a79
use isLounge
Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions megamek/src/megamek/server/commands/GameMasterCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package megamek.server.commands;

import megamek.common.Player;
import megamek.common.enums.GamePhase;
import megamek.server.GameManager;
import megamek.server.Server;

Expand Down Expand Up @@ -55,13 +56,16 @@ public void run(int connId, String[] args) {
return;
}

// toggling off game master requires no vote
GameManager gameManager = (GameManager) server.getGameManager();
if (player.getGameMaster()) {
GameManager gameManager = (GameManager) server.getGameManager();
// toggling off game master requires no vote
gameManager.setGameMaster(player, false);
return;
} else if (gameManager.getGame() != null && gameManager.getGame().getPhase().isLounge() ) {
// becoming GameMaster in Lobby is always permitted
server.sendServerChat(player.getName() + " will become Game Master without vote.");
gameManager.setGameMaster(player, true);
} else {
// require voting
// becoming GameMaster in regular gameplay requires unanimous human player voting
for (Player p : server.getGame().getPlayersVector()) {
if (p.getId() != player.getId()) {
server.sendServerChat(p.getId(), player.getName() + " wants to become a Game Master" + SERVER_VOTE_PROMPT_MSG);
Expand Down