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

refactor: removed direct counter names usage (part 2)

Browse source
This commit is contained in:
Oleg Agafonov 2023-06-12 16:01:18 +04:00
parent 8f4cc84266
commit c351a4e8e9
8 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -71,7 +71,7 @@ class SiegeDefeatedTriggeredAbility extends TriggeredAbilityImpl {
return permanent != null
&& permanent.getCounters(game).getCount(CounterType.DEFENSE) == 0
&& event.getTargetId().equals(this.getSourceId())
&& event.getData().equals("defense") && event.getAmount() > 0;
&& event.getData().equals(CounterType.DEFENSE.getName()) && event.getAmount() > 0;
}
@Override

2
Mage/src/main/java/mage/abilities/keyword/VanishingSacrificeAbility.java
View file

@ -25,7 +25,7 @@ public class VanishingSacrificeAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getData().equals("time") && event.getTargetId().equals(this.getSourceId())) {
if (event.getData().equals(CounterType.TIME.getName()) && event.getTargetId().equals(this.getSourceId())) {
Permanent p = game.getPermanent(this.getSourceId());
if (p != null) {
return p.getCounters(game).getCount(CounterType.TIME) == 0;