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

* Fixed that calling the destroy method for an object of the class permanent did move the card in game but shouldn't (#6571).

Browse source
This commit is contained in:
LevelX2 2020-06-03 15:06:12 +02:00
parent 47af865bc3
commit f65f4a4344
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/main/java/mage/game/permanent/PermanentImpl.java
View file

@ -1112,14 +1112,18 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
@Override @Override
public boolean destroy(UUID sourceId, Game game, boolean noRegen) { public boolean destroy(UUID sourceId, Game game, boolean noRegen) {
// Only permanets on the battlefield can be destroyed
if (!game.getState().getZone(getId()).equals(Zone.BATTLEFIELD)) {
return false;
}
//20091005 - 701.6 //20091005 - 701.6
if (abilities.containsKey(IndestructibleAbility.getInstance().getId())) { if (abilities.containsKey(IndestructibleAbility.getInstance().getId())) {
return false; return false;
} }
if (!game.replaceEvent(GameEvent.getEvent(EventType.DESTROY_PERMANENT, objectId, sourceId, controllerId, noRegen ? 1 : 0))) { if (!game.replaceEvent(GameEvent.getEvent(EventType.DESTROY_PERMANENT, objectId, sourceId, controllerId, noRegen ? 1 : 0))) {
// this means destroy was successful, if object movement to graveyard will be replaced (e.g. commander to command zone) its still // this means destroy was successful, if object movement to graveyard will be replaced (e.g. commander to command zone) it's still
// is handled as successful destroying (but not as sucessful "dies this way" for destroying). // handled as successful destroying (but not as sucessful "dies this way" for destroying).
if (moveToZone(Zone.GRAVEYARD, sourceId, game, false)) { if (moveToZone(Zone.GRAVEYARD, sourceId, game, false)) {
if (!game.isSimulation()) { if (!game.isSimulation()) {
String logName; String logName;