From d04008a7d40c41bbc5174c62bbf6477ccb423e74 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Thu, 12 Jul 2012 05:48:48 +0400 Subject: [PATCH] Added game.getAbility(abilityId, sourceId) method --- Mage/src/mage/game/Game.java | 1 + Mage/src/mage/game/GameImpl.java | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/Mage/src/mage/game/Game.java b/Mage/src/mage/game/Game.java index 71cc9bceb6c..c57fc7d6dfb 100644 --- a/Mage/src/mage/game/Game.java +++ b/Mage/src/mage/game/Game.java @@ -85,6 +85,7 @@ public interface Game extends MageItem, Serializable { public UUID getControllerId(UUID objectId); public Permanent getPermanent(UUID permanentId); public Card getCard(UUID cardId); + public Ability getAbility(UUID abilityId, UUID sourceId); public void setZone(UUID objectId, Zone zone); public void addPlayer(Player player, Deck deck) throws GameException; public Player getPlayer(UUID playerId); diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java index 25a3d0e2611..5cf7d5396fe 100644 --- a/Mage/src/mage/game/GameImpl.java +++ b/Mage/src/mage/game/GameImpl.java @@ -306,6 +306,15 @@ public abstract class GameImpl> implements Game, Serializa return null; return gameCards.get(cardId); } + + @Override + public Ability getAbility(UUID abilityId, UUID sourceId) { + MageObject object = getObject(sourceId); + if (object != null) { + return object.getAbilities().get(abilityId); + } + return null; + } // @Override // public Zone getZone(UUID objectId) {