From fc4e51e355dcfd4dc647f4e835c72bbfa07af70a Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 27 May 2018 11:01:33 +0200 Subject: [PATCH] * Corrosive Ooze - Fixed a bug game breaking bug if it is in the deck. --- Mage.Sets/src/mage/cards/c/CorrosiveOoze.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/CorrosiveOoze.java b/Mage.Sets/src/mage/cards/c/CorrosiveOoze.java index ef43f7e358a..73317023202 100644 --- a/Mage.Sets/src/mage/cards/c/CorrosiveOoze.java +++ b/Mage.Sets/src/mage/cards/c/CorrosiveOoze.java @@ -199,9 +199,10 @@ class CorrosiveOozeCombatWatcher extends Watcher { } } } - if (game.getTurn().getPhaseType().equals(TurnPhase.COMBAT)) { - if (event.getType() == GameEvent.EventType.ZONE_CHANGE) { - if (((ZoneChangeEvent) event).getFromZone().equals(Zone.BATTLEFIELD)) { + + if (event.getType() == GameEvent.EventType.ZONE_CHANGE) { + if (((ZoneChangeEvent) event).getFromZone().equals(Zone.BATTLEFIELD)) { + if (game.getTurn() != null && TurnPhase.COMBAT.equals(game.getTurn().getPhaseType())) { // Check if a previous blocked or blocked by creatures is leaving the battlefield for (Map.Entry> entry : oozeBlocksOrBlocked.entrySet()) { for (MageObjectReference mor : entry.getValue()) {