github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-13 01:01:11 -09:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed a bug that prevented rollback request window to appear.

Browse source
This commit is contained in:
LevelX2 2017-02-03 21:00:49 +01:00
parent a5299e3a30
commit 2a3e38f845
1 changed files with 16 additions and 17 deletions

33
Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
View file

@ -27,6 +27,10 @@
*/ */
package mage.server.game; package mage.server.game;
import java.io.Serializable;
import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.ExecutorService;
import mage.cards.Cards; import mage.cards.Cards;
import mage.choices.Choice; import mage.choices.Choice;
import mage.constants.ManaType; import mage.constants.ManaType;
@ -41,11 +45,6 @@ import mage.server.util.ThreadExecutor;
import mage.view.*; import mage.view.*;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import java.io.Serializable;
import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.ExecutorService;
/** /**
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
@ -92,39 +91,39 @@ public class GameSessionPlayer extends GameSessionWatcher {
public void chooseAbility(final AbilityPickerView abilities) { public void chooseAbility(final AbilityPickerView abilities) {
if (!killed) { if (!killed) {
UserManager.getInstance().getUser(userId).ifPresent(user -> UserManager.getInstance().getUser(userId).ifPresent(user
user.fireCallback(new ClientCallback("gameChooseAbility", game.getId(), abilities))); -> user.fireCallback(new ClientCallback("gameChooseAbility", game.getId(), abilities)));
} }
} }
public void choosePile(final String message, final CardsView pile1, final CardsView pile2) { public void choosePile(final String message, final CardsView pile1, final CardsView pile2) {
if (!killed) { if (!killed) {
UserManager.getInstance().getUser(userId).ifPresent(user -> UserManager.getInstance().getUser(userId).ifPresent(user
user.fireCallback(new ClientCallback("gameChoosePile", game.getId(), new GameClientMessage(message, pile1, pile2)))); -> user.fireCallback(new ClientCallback("gameChoosePile", game.getId(), new GameClientMessage(message, pile1, pile2))));
} }
} }
public void chooseChoice(final Choice choice) { public void chooseChoice(final Choice choice) {
if (!killed) { if (!killed) {
UserManager.getInstance().getUser(userId).ifPresent(user -> UserManager.getInstance().getUser(userId).ifPresent(user
user.fireCallback(new ClientCallback("gameChooseChoice", game.getId(), new GameClientMessage(choice)))); -> user.fireCallback(new ClientCallback("gameChooseChoice", game.getId(), new GameClientMessage(choice))));
} }
} }
public void playMana(final String message, final Map<String, Serializable> options) { public void playMana(final String message, final Map<String, Serializable> options) {
if (!killed) { if (!killed) {
UserManager.getInstance().getUser(userId).ifPresent(user -> UserManager.getInstance().getUser(userId).ifPresent(user
user.fireCallback(new ClientCallback("gamePlayMana", game.getId(), new GameClientMessage(getGameView(), message, options)))); -> user.fireCallback(new ClientCallback("gamePlayMana", game.getId(), new GameClientMessage(getGameView(), message, options))));
} }
} }
public void playXMana(final String message) { public void playXMana(final String message) {
if (!killed) { if (!killed) {
UserManager.getInstance().getUser(userId).ifPresent(user -> UserManager.getInstance().getUser(userId).ifPresent(user
user.fireCallback(new ClientCallback("gamePlayXMana", game.getId(), new GameClientMessage(getGameView(), message)))); -> user.fireCallback(new ClientCallback("gamePlayXMana", game.getId(), new GameClientMessage(getGameView(), message))));
} }
} }
@ -149,7 +148,7 @@ public class GameSessionPlayer extends GameSessionWatcher {
if (!killed) { if (!killed) {
Optional<User> requestingUser = UserManager.getInstance().getUser(requestingUserId); Optional<User> requestingUser = UserManager.getInstance().getUser(requestingUserId);
Optional<User> requestedUser = UserManager.getInstance().getUser(userId); Optional<User> requestedUser = UserManager.getInstance().getUser(userId);
if (!requestedUser.isPresent() && !requestingUser.isPresent()) { if (requestedUser.isPresent() && requestingUser.isPresent()) {
String message; String message;
switch (numberTurns) { switch (numberTurns) {
case 0: case 0:
@ -180,7 +179,7 @@ public class GameSessionPlayer extends GameSessionWatcher {
UserRequestMessage userRequestMessage = new UserRequestMessage( UserRequestMessage userRequestMessage = new UserRequestMessage(
"User request", "User request",
"Allow user <b>" + watcher.get().getName() + "</b> for this match to see your hand cards?<br>" "Allow user <b>" + watcher.get().getName() + "</b> for this match to see your hand cards?<br>"
+ "(You can revoke this every time using related popup menu item of your battlefield.)"); + "(You can revoke this every time using related popup menu item of your battlefield.)");
userRequestMessage.setRelatedUser(watcherId, watcher.get().getName()); userRequestMessage.setRelatedUser(watcherId, watcher.get().getName());
userRequestMessage.setGameId(game.getId()); userRequestMessage.setGameId(game.getId());
userRequestMessage.setButton1("Accept", PlayerAction.ADD_PERMISSION_TO_SEE_HAND_CARDS); userRequestMessage.setButton1("Accept", PlayerAction.ADD_PERMISSION_TO_SEE_HAND_CARDS);