From d602aac403c67def2eced02f2bd899060cd55206 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Wed, 27 Jun 2012 01:17:03 +0400 Subject: [PATCH] Refactoring --- Mage/src/mage/cards/CardImpl.java | 4 ++-- Mage/src/mage/game/Game.java | 1 + Mage/src/mage/game/GameImpl.java | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Mage/src/mage/cards/CardImpl.java b/Mage/src/mage/cards/CardImpl.java index 7786365bb96..735da685b58 100644 --- a/Mage/src/mage/cards/CardImpl.java +++ b/Mage/src/mage/cards/CardImpl.java @@ -274,7 +274,7 @@ public abstract class CardImpl> extends MageObjectImpl break; case BATTLEFIELD: PermanentCard permanent = new PermanentCard(this, ownerId); - game.getBattlefield().addPermanent(permanent); + game.addPermanent(permanent); permanent.entersBattlefield(sourceId, game); game.applyEffects(); if (flag) @@ -386,7 +386,7 @@ public abstract class CardImpl> extends MageObjectImpl } updateZoneChangeCounter(); PermanentCard permanent = new PermanentCard(this, controllerId); - game.getBattlefield().addPermanent(permanent); + game.addPermanent(permanent); game.setZone(objectId, Zone.BATTLEFIELD); game.applyEffects(); permanent.entersBattlefield(sourceId, game); diff --git a/Mage/src/mage/game/Game.java b/Mage/src/mage/game/Game.java index a15051b7d3e..71cc9bceb6c 100644 --- a/Mage/src/mage/game/Game.java +++ b/Mage/src/mage/game/Game.java @@ -165,6 +165,7 @@ public interface Game extends MageItem, Serializable { public void emptyManaPools(); public void addEffect(ContinuousEffect continuousEffect, Ability source); public void addEmblem(Emblem emblem, Ability source); + public void addPermanent(Permanent permanent); /** * This version supports copying of copies of any depth. diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java index 629a355242c..25a3d0e2611 100644 --- a/Mage/src/mage/game/GameImpl.java +++ b/Mage/src/mage/game/GameImpl.java @@ -773,6 +773,11 @@ public abstract class GameImpl> implements Game, Serializa state.addEmblem(newEmblem); } + @Override + public void addPermanent(Permanent permanent) { + getBattlefield().addPermanent(permanent); + } + @Override public void copyPermanent(Permanent copyFromPermanent, Permanent copyToPermanent, Ability source, ApplyToPermanent applier) { Permanent permanent = copyFromPermanent.copy();