github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-25 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some fixes to player handling.

Browse source
This commit is contained in:
LevelX2 2015-06-14 02:42:56 +02:00
parent 526a93df7e
commit 6420666668
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java
View file

@ -569,8 +569,12 @@ public class PlayAreaPanel extends javax.swing.JPanel {
}
public void setMenuStates(boolean manaPoolAutomatic, boolean manaPoolAutomaticRestricted) {
manaPoolMenuItem1.setSelected(manaPoolAutomatic);
manaPoolMenuItem2.setSelected(manaPoolAutomaticRestricted);
if (manaPoolMenuItem1 != null) {
manaPoolMenuItem1.setSelected(manaPoolAutomatic);
}
if (manaPoolMenuItem2 != null) {
manaPoolMenuItem2.setSelected(manaPoolAutomaticRestricted);
}
}
private mage.client.game.BattlefieldPanel battlefieldPanel;

4
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -602,8 +602,8 @@ public class GameController implements GameCallback {
if (grantingPlayer.isHuman()) {
GameSessionPlayer gameSession = gameSessions.get(userIdGranter);
if (gameSession != null) {
UUID requestingPlayer = getPlayerId(userIdRequester);
if (requestingPlayer == null || !requestingPlayer.equals(grantingPlayer.getId())) { // don't allow request for your own cards
UUID requestingPlayerId = getPlayerId(userIdRequester);
if (requestingPlayerId == null || !requestingPlayerId.equals(grantingPlayer.getId())) { // don't allow request for your own cards
if (grantingPlayer.isRequestToShowHandCardsAllowed()) {
gameSession.requestPermissionToSeeHandCards(userIdRequester);
} else {

3
Mage/src/mage/players/PlayerImpl.java
View file

@ -209,7 +209,6 @@ public abstract class PlayerImpl implements Player, Serializable {
protected Set<UUID> playersUnderYourControl = new HashSet<>();
protected Set<UUID> usersAllowedToSeeHandCards = new HashSet<>();
protected boolean requestsAllowedToSeeHandCards = true;
protected List<UUID> attachments = new ArrayList<>();
@ -3113,7 +3112,7 @@ public abstract class PlayerImpl implements Player, Serializable {
@Override
public boolean isRequestToShowHandCardsAllowed() {
return userData.allowRequestShowHandCards();
return userData.isAllowRequestShowHandCards();
}
@Override

13
Mage/src/mage/players/net/UserData.java
View file

@ -28,6 +28,7 @@ public class UserData implements Serializable {
this.userSkipPrioritySteps = userSkipPrioritySteps;
this.confirmEmptyManaPool = confirmEmptyManaPool;
this.flagName = flagName;
this.askMoveToGraveOrder = askMoveToGraveOrder;
}
public void setGroupId(int groupId) {
@ -50,20 +51,16 @@ public class UserData implements Serializable {
return showAbilityPickerForced;
}
public boolean isAllowRequestShowHandCards() {
return allowRequestShowHandCards;
}
public void setShowAbilityPickerForced(boolean showAbilityPickerForced) {
this.showAbilityPickerForced = showAbilityPickerForced;
}
public void setAllowRequestShowHandCards(boolean allowRequestShowHandCards) {
this.allowRequestShowHandCards = allowRequestShowHandCards;
public boolean isAllowRequestShowHandCards() {
return allowRequestShowHandCards;
}
public boolean allowRequestShowHandCards() {
return allowRequestShowHandCards;
public void setAllowRequestShowHandCards(boolean allowRequestShowHandCards) {
this.allowRequestShowHandCards = allowRequestShowHandCards;
}
public UserSkipPrioritySteps getUserSkipPrioritySteps() {