From ded7eeeaa8db384a6e4471693acfbe18acac6c6a Mon Sep 17 00:00:00 2001 From: xenohedron Date: Thu, 9 Nov 2023 20:41:34 -0500 Subject: [PATCH] align DISCOVERED event to naming convention no need for custom event class --- .../src/mage/cards/c/CuratorOfSunsCreation.java | 2 +- .../abilities/effects/keyword/DiscoverEffect.java | 4 ++-- .../main/java/mage/game/events/DiscoverEvent.java | 14 -------------- Mage/src/main/java/mage/game/events/GameEvent.java | 2 +- 4 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 Mage/src/main/java/mage/game/events/DiscoverEvent.java diff --git a/Mage.Sets/src/mage/cards/c/CuratorOfSunsCreation.java b/Mage.Sets/src/mage/cards/c/CuratorOfSunsCreation.java index 02fb4085e06..83223c712aa 100644 --- a/Mage.Sets/src/mage/cards/c/CuratorOfSunsCreation.java +++ b/Mage.Sets/src/mage/cards/c/CuratorOfSunsCreation.java @@ -59,7 +59,7 @@ class CuratorOfSunsCreationTriggeredAbility extends TriggeredAbilityImpl { @Override public boolean checkEventType(GameEvent event, Game game) { - return event.getType() == GameEvent.EventType.DISCOVER; + return event.getType() == GameEvent.EventType.DISCOVERED; } @Override diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/DiscoverEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/DiscoverEffect.java index 446b07d8ce7..c9289b97a9b 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/DiscoverEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/DiscoverEffect.java @@ -12,7 +12,7 @@ import mage.filter.FilterCard; import mage.filter.common.FilterNonlandCard; import mage.filter.predicate.mageobject.ManaValuePredicate; import mage.game.Game; -import mage.game.events.DiscoverEvent; +import mage.game.events.GameEvent; import mage.players.Player; import mage.util.CardUtil; @@ -88,7 +88,7 @@ public class DiscoverEffect extends OneShotEffect { } cards.retainZone(Zone.EXILED, game); player.putCardsOnBottomOfLibrary(cards, game, source, false); - game.fireEvent(new DiscoverEvent(source, player.getId(), amount)); + game.fireEvent(GameEvent.getEvent(GameEvent.EventType.DISCOVERED, null, source, player.getId(), amount)); return card; } } diff --git a/Mage/src/main/java/mage/game/events/DiscoverEvent.java b/Mage/src/main/java/mage/game/events/DiscoverEvent.java deleted file mode 100644 index 1299f130000..00000000000 --- a/Mage/src/main/java/mage/game/events/DiscoverEvent.java +++ /dev/null @@ -1,14 +0,0 @@ -package mage.game.events; - -import mage.abilities.Ability; - -import java.util.UUID; - -/** - * @author Susucr - */ -public class DiscoverEvent extends GameEvent { - public DiscoverEvent(Ability source, UUID playerId, int amount) { - super(EventType.DISCOVER, null, source, playerId, amount, false); - } -} diff --git a/Mage/src/main/java/mage/game/events/GameEvent.java b/Mage/src/main/java/mage/game/events/GameEvent.java index 72520863782..122ef6b731d 100644 --- a/Mage/src/main/java/mage/game/events/GameEvent.java +++ b/Mage/src/main/java/mage/game/events/GameEvent.java @@ -539,7 +539,7 @@ public class GameEvent implements Serializable { amount discover value flag not used for this event */ - DISCOVER, + DISCOVERED, //custom events CUSTOM_EVENT }