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

Xmage 1.4.25V0 (update because of Log problem)

Browse source
This commit is contained in:
LevelX2 2017-07-30 08:54:37 +02:00
parent d0922fdca4
commit 69e239d2ed
4 changed files with 54 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -188,7 +188,6 @@ public class HumanPlayer extends PlayerImpl {
synchronized (response) {
try {
response.wait();
logger.info("Got response from player: " + response.toString());
} catch (InterruptedException ex) {
logger.error("Response error for player " + getName() + " gameId: " + game.getId(), ex);
} finally {

50
Mage.Tests/src/test/java/org/mage/test/cards/single/FracturingGustTest.java
View file

@ -85,4 +85,54 @@ public class FracturingGustTest extends CardTestPlayerBase {
assertLife(playerB, 20);
}
@Test
public void testWithIndestructible() {
addCard(Zone.BATTLEFIELD, playerA, "Forest", 5);
// Destroy all artifacts and enchantments. You gain 2 life for each permanent destroyed this way.
addCard(Zone.HAND, playerA, "Fracturing Gust", 1);
// Flying
// Indestructible (Damage and effects that say "destroy" don't destroy this creature.)
addCard(Zone.BATTLEFIELD, playerB, "Darksteel Gargoyle", 1); // Artifact Creature - Gargoyle
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Fracturing Gust");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertGraveyardCount(playerA, "Fracturing Gust", 1);
assertPermanentCount(playerB, "Darksteel Gargoyle", 1);
// No life because Darksteel Gargoyle is Indestructible
assertLife(playerA, 20);
assertLife(playerB, 20);
}
@Test
public void testWithRestInPeace() {
addCard(Zone.BATTLEFIELD, playerA, "Forest", 5);
// Destroy all artifacts and enchantments. You gain 2 life for each permanent destroyed this way.
addCard(Zone.HAND, playerA, "Fracturing Gust", 1);
addCard(Zone.BATTLEFIELD, playerB, "Ornithopter", 1); // Artifact Creature 2/2
// When Rest in Peace enters the battlefield, exile all cards from all graveyards.
// If a card or token would be put into a graveyard from anywhere, exile it instead.
addCard(Zone.BATTLEFIELD, playerB, "Rest in Peace"); // Artifact
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Fracturing Gust");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertGraveyardCount(playerA, "Fracturing Gust", 1);
assertGraveyardCount(playerB, "Ornithopter", 0);
assertExileCount(playerB, "Ornithopter", 1);
assertLife(playerA, 24);
assertLife(playerB, 20);
}
}

3
Mage.Tests/src/test/java/org/mage/test/commander/duel/CommanderReplaceEffectTest.java
View file

@ -59,7 +59,8 @@ public class CommanderReplaceEffectTest extends CardTestCommanderDuelBase {
addCard(Zone.HAND, playerB, "Phyrexian Rebirth", 1);
// Daxos of Meletis can't be blocked by creatures with power 3 or greater.
// Whenever Daxos of Meletis deals combat damage to a player, exile the top card of that player's library. You gain life equal to that card's converted mana cost. Until end of turn, you may cast that card and you may spend mana as though it were mana of any color to cast it.
// Whenever Daxos of Meletis deals combat damage to a player, exile the top card of that player's library. You gain life equal to that card's converted mana cost.
// Until end of turn, you may cast that card and you may spend mana as though it were mana of any color to cast it.
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Daxos of Meletis");
// Destroy all creatures, then put an X/X colorless Horror artifact creature token onto the battlefield, where X is the number of creatures destroyed this way.

5
Mage/src/main/java/mage/game/permanent/PermanentImpl.java
View file

@ -27,6 +27,7 @@
*/
package mage.game.permanent;
import java.util.*;
import mage.MageObject;
import mage.MageObjectReference;
import mage.ObjectColor;
@ -55,8 +56,6 @@ import mage.players.Player;
import mage.util.GameLog;
import mage.util.ThreadLocalStringBuilder;
import java.util.*;
/**
* @author BetaSteward_at_googlemail.com
*/
@ -972,8 +971,8 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
}
}
game.fireEvent(GameEvent.getEvent(EventType.DESTROYED_PERMANENT, objectId, sourceId, controllerId));
return true;
}
return true;
}
return false;
}