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

Merge branch 'master' of ssh://109.200.159.85/var/lib/git/mage.git

Browse source
This commit is contained in:
jeffwadsworth 2012-04-04 19:59:36 -05:00
commit e92d3e146f
12 changed files with 561 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/mage/abilities/effects/common/DiscardTargetEffect.java
View file

@ -98,8 +98,12 @@ public class DiscardTargetEffect extends OneShotEffect<DiscardTargetEffect> {
@Override
public String getText(Mode mode) {
StringBuilder sb = new StringBuilder("Target ");
sb.append(mode.getTargets().get(0).getTargetName());
StringBuilder sb = new StringBuilder();
if(mode.getTargets().isEmpty()){
sb.append("that player");
} else {
sb.append("Target ").append(mode.getTargets().get(0).getTargetName());
}
sb.append(" discards ");
sb.append(amount).append(" card");
try {

6
Mage/src/mage/abilities/keyword/ReboundAbility.java
View file

@ -131,8 +131,6 @@ public class ReboundAbility extends TriggeredAbilityImpl<ReboundAbility> {
*/
class ReboundEffect extends OneShotEffect<ReboundEffect> {
private UUID originalId;
public ReboundEffect() {
super(Outcome.Benefit);
}
@ -144,7 +142,7 @@ class ReboundEffect extends OneShotEffect<ReboundEffect> {
@Override
public boolean apply(Game game, Ability source) {
Spell sourceSpell = (Spell)game.getObject(source.getId());
if ( sourceSpell.isCopiedSpell() ) {
if ( sourceSpell != null && sourceSpell.isCopiedSpell() ) {
return false;
}
else {
@ -201,7 +199,7 @@ class ReboundCastFromHandReplacementEffect extends ReplacementEffectImpl<Rebound
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
Spell sourceSpell = (Spell)game.getObject(source.getId());
if ( sourceSpell.isCopiedSpell() ) {
if ( sourceSpell != null && sourceSpell.isCopiedSpell() ) {
return false;
}
else {