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

fixed several cards which use an invalid UUID to find a player

Browse source
This commit is contained in:
Evan Kranzler 2021-04-30 08:39:54 -04:00
parent 77d792bbaf
commit ed759d7a63
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/c/CouncilsJudgment.java
View file

@ -65,7 +65,7 @@ class CouncilsJudgmentEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getSourceId()); Player player = game.getPlayer(source.getControllerId());
if (player == null) { if (player == null) {
return false; return false;
} }

2
Mage.Sets/src/mage/cards/g/GruesomeEncore.java
View file

@ -115,7 +115,7 @@ class GruesomeEncoreReplacementEffect extends ReplacementEffectImpl {
@Override @Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) { public boolean replaceEvent(GameEvent event, Ability source, Game game) {
Player player = game.getPlayer(source.getSourceId()); Player player = game.getPlayer(source.getControllerId());
Card card = game.getCard(source.getFirstTarget()); Card card = game.getCard(source.getFirstTarget());
return player != null && card != null && player.moveCards(card, Zone.EXILED, source, game); return player != null && card != null && player.moveCards(card, Zone.EXILED, source, game);
} }

2
Mage.Sets/src/mage/cards/r/RowanScholarOfSparks.java
View file

@ -157,7 +157,7 @@ class WillScholarOfFrostEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getSourceId()); Player player = game.getPlayer(source.getControllerId());
if (player == null) { if (player == null) {
return false; return false;
} }

2
Mage.Sets/src/mage/cards/r/RuinGrinder.java
View file

@ -71,7 +71,7 @@ class RuinGrinderEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
List<Player> wheelers = new ArrayList<>(); List<Player> wheelers = new ArrayList<>();
for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) {
Player player = game.getPlayer(source.getSourceId()); Player player = game.getPlayer(playerId);
if (player != null && player.chooseUse( if (player != null && player.chooseUse(
Outcome.DrawCard, "Discard your hand and draw seven?", source, game Outcome.DrawCard, "Discard your hand and draw seven?", source, game
)) { )) {

2
Mage.Sets/src/mage/cards/s/SternJudge.java
View file

@ -69,7 +69,7 @@ class SternJudgeEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
for (UUID playerId : game.getState().getPlayersInRange(source.getSourceId(), game)) { for (UUID playerId : game.getState().getPlayersInRange(source.getSourceId(), game)) {
Player player = game.getPlayer(source.getSourceId()); Player player = game.getPlayer(playerId);
if (player != null) { if (player != null) {
int lifeToLose = game.getBattlefield().getAllActivePermanents(filter, playerId, game).size(); int lifeToLose = game.getBattlefield().getAllActivePermanents(filter, playerId, game).size();
player.loseLife(lifeToLose, game, source, false); player.loseLife(lifeToLose, game, source, false);

2
Mage.Sets/src/mage/cards/w/WizardMentor.java
View file

@ -65,7 +65,7 @@ class WizardMentorEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getSourceId()); Player player = game.getPlayer(source.getControllerId());
if (player == null) { if (player == null) {
return false; return false;
} }

2
Mage/src/main/java/mage/abilities/effects/common/ReturnToHandAttachedEffect.java
View file

@ -30,7 +30,7 @@ public class ReturnToHandAttachedEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getSourceId()); Player player = game.getPlayer(source.getControllerId());
Permanent permanent = (Permanent) getValue("attachedTo"); Permanent permanent = (Permanent) getValue("attachedTo");
if (player == null || permanent == null) { if (player == null || permanent == null) {
return false; return false;