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

Refactor: Fix spelling of 'controller' (#9163)

Browse source
This commit is contained in:
DeepCrimson 2022-06-26 19:58:06 -07:00 committed by GitHub
parent 2d2b7ae835
commit 7bb851e0a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
View file

@ -136,7 +136,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
// controller hints:
// - target.getTargetController(), this.getId() -- player that must makes choices (must be same with this.getId)
// - target.getAbilityController(), abilityControllerId -- affected player/controller for all actions/filters
// - affected controler can be different from target controller (another player makes choices for controller)
// - affected controller can be different from target controller (another player makes choices for controller)
// sometimes a target selection can be made from a player that does not control the ability
UUID abilityControllerId = playerId;
if (target.getTargetController() != null

5
Mage.Sets/src/mage/cards/f/Fogwalker.java
View file

@ -1,7 +1,6 @@
package mage.cards.f;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect;
@ -13,6 +12,8 @@ import mage.constants.SubType;
import mage.filter.StaticFilters;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
*
* @author LevelX2
@ -27,7 +28,7 @@ public final class Fogwalker extends CardImpl {
// Skulk
this.addAbility(new SkulkAbility());
// When Fogwalker enters the battlefield, target creature an opponent controls doesn't untap during it controler's next untap step.
// When Fogwalker enters the battlefield, target creature an opponent controls doesn't untap during its controller's next untap step.
EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DontUntapInControllersNextUntapStepTargetEffect());
ability.addTarget(new TargetCreaturePermanent(StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURE));
this.addAbility(ability);

5
Mage.Sets/src/mage/cards/g/GunganCaptain.java
View file

@ -1,7 +1,6 @@
package mage.cards.g;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.DealsDamageToACreatureTriggeredAbility;
@ -12,6 +11,8 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import java.util.UUID;
/**
*
* @author Styxo
@ -25,7 +26,7 @@ public final class GunganCaptain extends CardImpl {
this.power = new MageInt(1);
this.toughness = new MageInt(4);
// Whenever Gungan Captain deals damage to a creture, tap that creature. That creature does not untap during it controlers untap step.
// Whenever Gungan Captain deals damage to a creture, tap that creature. That creature does not untap during its controllers untap step.
Ability ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("tap that creature"), false, false, true);
ability.addEffect(new DontUntapInControllersNextUntapStepTargetEffect("That creature"));
this.addAbility(ability);

2
Mage.Sets/src/mage/cards/o/OpenSeason.java
View file

@ -106,7 +106,7 @@ class OpenSeasonEffect extends OneShotEffect {
public OpenSeasonEffect() {
super(Outcome.LoseLife);
staticText = "that creature's controler loses 2 life. Each other player gains 2 life";
staticText = "that creature's controller loses 2 life. Each other player gains 2 life";
}
public OpenSeasonEffect(final OpenSeasonEffect effect) {

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

@ -32,7 +32,7 @@ public final class Seasinger extends CardImpl {
private static final FilterPermanent filter
= new FilterPermanent("Island");
private static final FilterPermanent filter2
= new FilterCreaturePermanent("creature whose controler controls an Island");
= new FilterCreaturePermanent("creature whose controller controls an Island");
static {
filter.add(SubType.ISLAND.getPredicate());

2
Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/RoonOfTheHiddenRealmTest.java
View file

@ -13,7 +13,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
public class RoonOfTheHiddenRealmTest extends CardTestPlayerBase {
/**
* Roon of the Hidden Realm is returning cards to their controler's control
* Roon of the Hidden Realm is returning cards to their controller's control
* instead of the owner's control at the end of the turn. I used his ability
* on a Perplexing Chimera I gave my opponent and in the end of the turn it
* returned to the battlefield in their control.

2
Mage.Tests/src/test/java/org/mage/test/cards/restriction/ElvishChampionForestwalkTest.java
View file

@ -21,7 +21,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
public class ElvishChampionForestwalkTest extends CardTestPlayerBase {
/**
* Tests "If all other elves get the Forestwalk ability and can't be blockt from creatures whose controler has a forest in game"
* Tests "If all other elves get the Forestwalk ability and can't be blockt from creatures whose controller has a forest in game"
*/
@Test

2
Mage/src/main/java/mage/game/permanent/PermanentImpl.java
View file

@ -743,7 +743,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
return false;
}
// For each control change compared to last controler send a GAIN_CONTROL replace event to be able to prevent the gain control (e.g. Guardian Beast)
// For each control change compared to last controller send a GAIN_CONTROL replace event to be able to prevent the gain control (e.g. Guardian Beast)
if (beforeResetControllerId != newControllerId) {
GameEvent gainControlEvent = GameEvent.getEvent(GameEvent.EventType.GAIN_CONTROL, this.getId(), null, newControllerId);
if (game.replaceEvent(gainControlEvent)) {