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

Merge remote-tracking branch 'fork/master'

Browse source
This commit is contained in:
vraskulin 2017-03-22 14:51:31 +03:00
commit d3214c65e4
7 changed files with 13 additions and 13 deletions
Mage.Client/src
main/java/mage/client
dialog
ConnectDialog.java
unusedFiles
DelayedViewerThread.java
test/java/mage/client/game
StartMultiGamesTest.java
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human
HumanPlayer.java
Mage.Tests/src/test/java/org/mage/test/cards/single
DivergentTransformationsTest.java
Mage/src/main/java/mage/abilities
AbilityImpl.java
effects
PayCostToAttackBlockEffectImpl.java

2
Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
View file

@ -391,7 +391,7 @@ public class ConnectDialog extends MageDialog {
connection.setUsername(this.txtUserName.getText().trim()); connection.setUsername(this.txtUserName.getText().trim());
connection.setPassword(this.txtPassword.getText().trim()); connection.setPassword(this.txtPassword.getText().trim());
connection.setForceDBComparison(this.chkForceUpdateDB.isSelected()); connection.setForceDBComparison(this.chkForceUpdateDB.isSelected());
connection.setUserIdStr(System.getProperty("user.name") + ":" + MagePreferences.getUserNames()); connection.setUserIdStr(System.getProperty("user.name") + ':' + MagePreferences.getUserNames());
MageFrame.getPreferences().put(KEY_CONNECT_FLAG, ((CountryItemEditor) cbFlag.getEditor()).getImageItem()); MageFrame.getPreferences().put(KEY_CONNECT_FLAG, ((CountryItemEditor) cbFlag.getEditor()).getImageItem());
PreferencesDialog.setProxyInformation(connection); PreferencesDialog.setProxyInformation(connection);

2
Mage.Client/src/main/java/mage/client/unusedFiles/DelayedViewerThread.java
View file

@ -24,7 +24,7 @@ public class DelayedViewerThread extends Thread {
public synchronized void show(Component component, long delay) { public synchronized void show(Component component, long delay) {
delayedViewers.put(component, System.currentTimeMillis() + delay); delayedViewers.put(component, System.currentTimeMillis() + delay);
notify(); notifyAll();
} }
public synchronized void hide(Component component) { public synchronized void hide(Component component) {

2
Mage.Client/src/test/java/mage/client/game/StartMultiGamesTest.java
View file

@ -48,7 +48,7 @@ public class StartMultiGamesTest {
synchronized (sync) { synchronized (sync) {
frame = new MageFrame(); frame = new MageFrame();
frame.setVisible(true); frame.setVisible(true);
sync.notify(); sync.notifyAll();
} }
}); });
synchronized (sync) { synchronized (sync) {

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

@ -1407,7 +1407,7 @@ public class HumanPlayer extends PlayerImpl {
public void setResponseString(String responseString) { public void setResponseString(String responseString) {
synchronized (response) { synchronized (response) {
response.setString(responseString); response.setString(responseString);
response.notify(); response.notifyAll();
logger.debug("Got response string from player: " + getId()); logger.debug("Got response string from player: " + getId());
} }
} }
@ -1417,7 +1417,7 @@ public class HumanPlayer extends PlayerImpl {
synchronized (response) { synchronized (response) {
response.setManaType(manaType); response.setManaType(manaType);
response.setResponseManaTypePlayerId(manaTypePlayerId); response.setResponseManaTypePlayerId(manaTypePlayerId);
response.notify(); response.notifyAll();
logger.debug("Got response mana type from player: " + getId()); logger.debug("Got response mana type from player: " + getId());
} }
} }
@ -1426,7 +1426,7 @@ public class HumanPlayer extends PlayerImpl {
public void setResponseUUID(UUID responseUUID) { public void setResponseUUID(UUID responseUUID) {
synchronized (response) { synchronized (response) {
response.setUUID(responseUUID); response.setUUID(responseUUID);
response.notify(); response.notifyAll();
logger.debug("Got response UUID from player: " + getId()); logger.debug("Got response UUID from player: " + getId());
} }
} }
@ -1435,7 +1435,7 @@ public class HumanPlayer extends PlayerImpl {
public void setResponseBoolean(Boolean responseBoolean) { public void setResponseBoolean(Boolean responseBoolean) {
synchronized (response) { synchronized (response) {
response.setBoolean(responseBoolean); response.setBoolean(responseBoolean);
response.notify(); response.notifyAll();
logger.debug("Got response boolean from player: " + getId()); logger.debug("Got response boolean from player: " + getId());
} }
} }
@ -1444,7 +1444,7 @@ public class HumanPlayer extends PlayerImpl {
public void setResponseInteger(Integer responseInteger) { public void setResponseInteger(Integer responseInteger) {
synchronized (response) { synchronized (response) {
response.setInteger(responseInteger); response.setInteger(responseInteger);
response.notify(); response.notifyAll();
logger.debug("Got response integer from player: " + getId()); logger.debug("Got response integer from player: " + getId());
} }
} }
@ -1453,7 +1453,7 @@ public class HumanPlayer extends PlayerImpl {
public void abort() { public void abort() {
abort = true; abort = true;
synchronized (response) { synchronized (response) {
response.notify(); response.notifyAll();
logger.debug("Got cancel action from player: " + getId()); logger.debug("Got cancel action from player: " + getId());
} }
} }
@ -1462,7 +1462,7 @@ public class HumanPlayer extends PlayerImpl {
public void skip() { public void skip() {
synchronized (response) { synchronized (response) {
response.setInteger(0); response.setInteger(0);
response.notify(); response.notifyAll();
logger.debug("Got skip action from player: " + getId()); logger.debug("Got skip action from player: " + getId());
} }
} }

2
Mage.Tests/src/test/java/org/mage/test/cards/single/DivergentTransformationsTest.java
View file

@ -38,7 +38,7 @@ public class DivergentTransformationsTest extends CardTestPlayerBase {
addCard(Zone.LIBRARY, playerA, hGiant); addCard(Zone.LIBRARY, playerA, hGiant);
addCard(Zone.LIBRARY, playerB, mFlunkies); addCard(Zone.LIBRARY, playerB, mFlunkies);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, dTransformations, memnite + "^" + gBears); castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, dTransformations, memnite + '^' + gBears);
setStopAt(1, PhaseStep.BEGIN_COMBAT); setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute(); execute();

2
Mage/src/main/java/mage/abilities/AbilityImpl.java
View file

@ -518,7 +518,7 @@ public abstract class AbilityImpl implements Ability {
PhyrexianManaCost phyrexianManaCost = (PhyrexianManaCost)cost; PhyrexianManaCost phyrexianManaCost = (PhyrexianManaCost)cost;
PayLifeCost payLifeCost = new PayLifeCost(2); PayLifeCost payLifeCost = new PayLifeCost(2);
if(payLifeCost.canPay(this, sourceId, controller.getId(), game) && if(payLifeCost.canPay(this, sourceId, controller.getId(), game) &&
controller.chooseUse(Outcome.LoseLife, "Pay 2 life instead of " + phyrexianManaCost.getBaseText() + "?", this, game)) { controller.chooseUse(Outcome.LoseLife, "Pay 2 life instead of " + phyrexianManaCost.getBaseText() + '?', this, game)) {
costIterator.remove(); costIterator.remove();
costs.add(payLifeCost); costs.add(payLifeCost);
} }

2
Mage/src/main/java/mage/abilities/effects/PayCostToAttackBlockEffectImpl.java
View file

@ -171,7 +171,7 @@ public abstract class PayCostToAttackBlockEffectImpl extends ReplacementEffectIm
PhyrexianManaCost phyrexianManaCost = (PhyrexianManaCost)manaCost; PhyrexianManaCost phyrexianManaCost = (PhyrexianManaCost)manaCost;
PayLifeCost payLifeCost = new PayLifeCost(2); PayLifeCost payLifeCost = new PayLifeCost(2);
if(payLifeCost.canPay(source, source.getSourceId(), player.getId(), game) && if(payLifeCost.canPay(source, source.getSourceId(), player.getId(), game) &&
player.chooseUse(Outcome.LoseLife, "Pay 2 life instead of " + phyrexianManaCost.getBaseText() + "?", source, game)) { player.chooseUse(Outcome.LoseLife, "Pay 2 life instead of " + phyrexianManaCost.getBaseText() + '?', source, game)) {
manaCostIterator.remove(); manaCostIterator.remove();
costs.add(payLifeCost); costs.add(payLifeCost);
} }