External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 21:12:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2017-12-28 12:57:53 +01:00
commit 91efa42d0d
6 changed files with 323 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -407,7 +407,7 @@ public abstract class AbilityImpl implements Ability {
}
if (!game.isSimulation()) {
// inform about x costs now, so canceled announcements are not shown in the log
if (announceString != null) {
if ((announceString != null) && (!announceString.equals(""))) {
game.informPlayers(announceString);
}
if (variableManaCost != null) {

1
Mage/src/main/java/mage/counters/CounterType.java
View file

@ -109,6 +109,7 @@ public enum CounterType {
PRESSURE("pressure"),
PREY("prey"),
REPAIR("repair"),
RUST("rust"),
QUEST("quest"),
SCREAM("scream"),
SHELL("shell"),