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

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2015-10-12 23:11:00 +02:00
commit b22ee6a5ad
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/mage/abilities/keyword/ConspireAbility.java
View file

@ -68,7 +68,7 @@ import mage.target.common.TargetControlledPermanent;
* 702.77b If a spell has multiple instances of conspire, each is paid separately and triggers
* based on its own payment, not any other instance of conspire. *
*
* @author jeffwadsworth heavily based off the replicate keyword by LevelX
* @author LevelX
*/
public class ConspireAbility extends StaticAbility implements OptionalAdditionalSourceCosts {

4
Mage/src/mage/watchers/common/FirstTimeStepWatcher.java
View file

@ -34,8 +34,8 @@ import mage.game.events.GameEvent.EventType;
import mage.watchers.Watcher;
/**
* The wachter checks if a specific phase event has already happened during the
* current turn. If not it returns false, otheriwsed true.
* The watcher checks if a specific phase event has already happened during the
* current turn. If not it returns false, otherwise true.
*
* @author LevelX2
*/