github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-29 17:00:07 -09:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2018-02-03 17:55:51 +01:00
commit 75b8a4b165
2 changed files with 10 additions and 2 deletions
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human
HumanPlayer.java
Mage.Sets/src/mage/cards/s
SwordOfWarAndPeace.java

10
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -152,8 +152,16 @@ public class HumanPlayer extends PlayerImpl {
protected void waitResponseOpen() {
// wait response open for answer process
int numTimesWaiting = 0;
while (!responseOpenedForAnswer && canRespond() && numTimesWaiting < 300) {
while (!responseOpenedForAnswer && canRespond()) {
numTimesWaiting ++;
if (numTimesWaiting >= 300) {
// game freezed -- need to report about error and continue to execute
String s = "Game freezed in waitResponseOpen for user " + getName();
Throwable th = new IllegalStateException(s);
logger.error(s, th);
break;
}
try {
Thread.sleep(100);
} catch (InterruptedException e) {

2
Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java
View file

@ -96,7 +96,7 @@ class SwordOfWarAndPeaceAbility extends TriggeredAbilityImpl {
public SwordOfWarAndPeaceAbility() {
super(Zone.BATTLEFIELD, new SwordOfWarAndPeaceDamageEffect());
this.addEffect(new GainLifeEffect(new CardsInControllerHandCount()));
this.addTarget(new TargetPlayer());
this.addTarget(new TargetPlayer(1, 1, true));
}
public SwordOfWarAndPeaceAbility(final SwordOfWarAndPeaceAbility ability) {