Merge pull request #2335 from spjspj/master

spjspj - Fix for if Combustible Gearhulk dies prior to trigger resolv…
This commit is contained in:
spjspj 2016-09-19 23:44:34 +10:00 committed by GitHub
commit 0a8bb10068

View file

@ -99,7 +99,7 @@ class CombustibleGearhulkEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
Permanent sourcePermanent = game.getPermanent(source.getSourceId()); Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
if (controller != null && sourcePermanent != null) { if (controller != null && sourcePermanent != null) {
UUID opponentId; UUID opponentId;
if (game.getOpponents(controller.getId()).size() == 1) { if (game.getOpponents(controller.getId()).size() == 1) {