Merge pull request #44 from magefree/master

merge
This commit is contained in:
theelk801 2017-08-27 11:08:13 -04:00 committed by GitHub
commit ad893aee31
13 changed files with 505 additions and 375 deletions

View file

@ -105,6 +105,9 @@ public class EntersBattlefieldAllTriggeredAbility extends TriggeredAbilityImpl {
UUID targetId = event.getTargetId();
Permanent permanent = game.getPermanent(targetId);
if (permanent != null && filter.match(permanent, getSourceId(), getControllerId(), game)) {
for (Effect effect : this.getEffects()) {
effect.setValue("permanentEnteringBattlefield", permanent);
}
if (setTargetPointer != SetTargetPointer.NONE) {
for (Effect effect : this.getEffects()) {
switch (setTargetPointer) {

View file

@ -58,8 +58,7 @@ public enum CardRepository {
// raise this if db structure was changed
private static final long CARD_DB_VERSION = 51;
// raise this if new cards were added to the server
private static final long CARD_CONTENT_VERSION = 87;
private final TreeSet<String> landTypes = new TreeSet<>();
private static final long CARD_CONTENT_VERSION = 89;
private Dao<CardInfo, Object> cardDao;
private Set<String> classNames;

View file

@ -1829,7 +1829,7 @@ public abstract class PlayerImpl implements Player, Serializable {
MageObject sourceObject = game.getObject(sourceId);
game.informPlayers(damage + " damage "
+ (sourceObject == null ? "" : "from " + sourceObject.getLogName())
+ "to " + getLogName()
+ " to " + getLogName()
+ (damage > 1 ? " were" : "was") + " prevented because of protection.");
}
}