github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge

Browse source
This commit is contained in:
magenoxx 2011-03-07 18:56:56 +03:00
commit 42be4090a4
8 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/magic2010/Earthquake.java
View file

@ -101,7 +101,7 @@ class EarthquakeEffect extends OneShotEffect<EarthquakeEffect> {
for (UUID playerId: game.getPlayer(source.getControllerId()).getInRange()) { for (UUID playerId: game.getPlayer(source.getControllerId()).getInRange()) {
Player player = game.getPlayer(playerId); Player player = game.getPlayer(playerId);
if (player != null) if (player != null)
player.damage(amount, source.getId(), game, false, true); player.damage(amount, source.getSourceId(), game, false, true);
} }
return true; return true;
} }

2
Mage.Sets/src/mage/sets/mirrodinbesieged/BurntheImpure.java
View file

@ -98,7 +98,7 @@ public class BurntheImpure extends CardImpl<BurntheImpure> {
if (permanent.getAbilities().contains(InfectAbility.getInstance())) { if (permanent.getAbilities().contains(InfectAbility.getInstance())) {
Player controller = game.getPlayer(permanent.getControllerId()); Player controller = game.getPlayer(permanent.getControllerId());
if (controller != null) { if (controller != null) {
controller.damage(amount, source.getId(), game, true, false); controller.damage(amount, source.getSourceId(), game, true, false);
} }
} }
return true; return true;

4
Mage.Sets/src/mage/sets/scarsofmirrodin/ArcTrail.java
View file

@ -102,11 +102,11 @@ class ArcTrailEffect extends OneShotEffect {
} }
if (permanent != null) { if (permanent != null) {
applied |= (permanent.damage( damage, source.getId(), game, false, true ) > 0); applied |= (permanent.damage( damage, source.getSourceId(), game, false, true ) > 0);
} }
Player player = game.getPlayer(target); Player player = game.getPlayer(target);
if (player != null) { if (player != null) {
applied |= (player.damage( damage, source.getId(), game, false, true ) > 0); applied |= (player.damage( damage, source.getSourceId(), game, false, true ) > 0);
} }
twoDamageDone = true; twoDamageDone = true;

2
Mage.Sets/src/mage/sets/scarsofmirrodin/Embersmith.java
View file

@ -129,7 +129,7 @@ class EmbersmithEffect extends OneShotEffect<EmbersmithEffect> {
} }
Player player = game.getPlayer(source.getFirstTarget()); Player player = game.getPlayer(source.getFirstTarget());
if (player != null) { if (player != null) {
player.damage(1, source.getId(), game, false, true); player.damage(1, source.getSourceId(), game, false, true);
return true; return true;
} }
return false; return false;

2
Mage.Sets/src/mage/sets/scarsofmirrodin/SpikeshotElder.java
View file

@ -94,7 +94,7 @@ class SpikeshotElderEffect extends OneShotEffect<SpikeshotElderEffect> {
} }
Player player = game.getPlayer(source.getFirstTarget()); Player player = game.getPlayer(source.getFirstTarget());
if (sourcePermanent != null && player != null) { if (sourcePermanent != null && player != null) {
player.damage(sourcePermanent.getPower().getValue(), source.getId(), game, false, true); player.damage(sourcePermanent.getPower().getValue(), source.getSourceId(), game, false, true);
return true; return true;
} }
return false; return false;

2
Mage.Sets/src/mage/sets/shardsofalara/FlameblastDragon.java
View file

@ -100,7 +100,7 @@ class FlameblastDragonEffect extends OneShotEffect<FlameblastDragonEffect> {
} }
Player targetPlayer = game.getPlayer(source.getFirstTarget()); Player targetPlayer = game.getPlayer(source.getFirstTarget());
if (targetPlayer != null) { if (targetPlayer != null) {
targetPlayer.damage(costX, source.getId(), game, true, false); targetPlayer.damage(costX, source.getSourceId(), game, true, false);
return true; return true;
} }
return false; return false;

8
Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java
View file

@ -129,18 +129,18 @@ class SearingBlazeEffect extends OneShotEffect<SearingBlazeEffect> {
Permanent creature = game.getPermanent(source.getTargets().get(1).getFirstTarget()); Permanent creature = game.getPermanent(source.getTargets().get(1).getFirstTarget());
if (watcher != null && watcher.conditionMet()) { if (watcher != null && watcher.conditionMet()) {
if (player != null) { if (player != null) {
player.damage(3, source.getId(), game, false, true); player.damage(3, source.getSourceId(), game, false, true);
} }
if (creature != null) { if (creature != null) {
creature.damage(3, source.getId(), game, true, false); creature.damage(3, source.getSourceId(), game, true, false);
} }
} }
else { else {
if (player != null) { if (player != null) {
player.damage(1, source.getId(), game, false, true); player.damage(1, source.getSourceId(), game, false, true);
} }
if (creature != null) { if (creature != null) {
creature.damage(1, source.getId(), game, true, false); creature.damage(1, source.getSourceId(), game, true, false);
} }
} }
return true; return true;

4
Mage/src/mage/abilities/effects/common/DamageTargetEffect.java
View file

@ -73,12 +73,12 @@ public class DamageTargetEffect extends OneShotEffect<DamageTargetEffect> {
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Permanent permanent = game.getPermanent(source.getFirstTarget()); Permanent permanent = game.getPermanent(source.getFirstTarget());
if (permanent != null) { if (permanent != null) {
permanent.damage(amount, source.getId(), game, preventable, false); permanent.damage(amount, source.getSourceId(), game, preventable, false);
return true; return true;
} }
Player player = game.getPlayer(source.getFirstTarget()); Player player = game.getPlayer(source.getFirstTarget());
if (player != null) { if (player != null) {
player.damage(amount, source.getId(), game, false, preventable); player.damage(amount, source.getSourceId(), game, false, preventable);
return true; return true;
} }
return false; return false;