external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git

Browse Source
This commit is contained in:
Alessandro Coli
2019-10-04 23:13:19 +02:00
parent 0bcc0e9248 dc000318bd
commit 9fce28bed7
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
View File

@@ -158,7 +158,8 @@ public class EffectEffect extends SpellAbilityEffect {
if (effectStaticAbilities != null) { if (effectStaticAbilities != null) {
for (final String s : effectStaticAbilities) { for (final String s : effectStaticAbilities) {
final StaticAbility addedStaticAbility = eff.addStaticAbility(AbilityUtils.getSVar(sa, s)); final StaticAbility addedStaticAbility = eff.addStaticAbility(AbilityUtils.getSVar(sa, s));
addedStaticAbility.setIntrinsic(true); if (addedStaticAbility != null) //prevent npe casting adventure card spell
addedStaticAbility.setIntrinsic(true);
} }
} }

2
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -5484,7 +5484,7 @@ public class Card extends GameEntity implements Comparable<Card> {
ability.add(inst.getOriginal()); ability.add(inst.getOriginal());
} }
Collections.sort(ability); Collections.sort(ability);
return String.join(",", ability); return StringUtils.join(ability.toArray(), ","); //fix nosuchmethod on some android devices...
} }
public Zone getZone() { public Zone getZone() {
return currentZone; return currentZone;