From 8dab1100605ce210cb19d21b9589cf51a9f16abd Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 8 Jan 2013 22:31:43 +0100 Subject: [PATCH] Fixed a NPE in deck editor caused by fix of #84. --- .../plugins/adapters/MageActionCallback.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java index 8d842ca9499..434b1d744f8 100644 --- a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java +++ b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java @@ -276,16 +276,22 @@ public class MageActionCallback implements ActionCallback { @Override public void mouseExited(MouseEvent e, final TransferData data) { - hideAll(data.gameId); + if (data != null) { + hideAll(data.gameId); + } else { + hideAll(null); + } } public void hideAll(UUID gameId) { hidePopup(); startHideTimeout(); this.state = false; - ArrowBuilder.getBuilder().removeArrowsByType(gameId, ArrowBuilder.Type.TARGET); - ArrowBuilder.getBuilder().removeArrowsByType(gameId, ArrowBuilder.Type.PAIRED); - ArrowBuilder.getBuilder().removeArrowsByType(gameId, ArrowBuilder.Type.SOURCE); + if (gameId != null) { + ArrowBuilder.getBuilder().removeArrowsByType(gameId, ArrowBuilder.Type.TARGET); + ArrowBuilder.getBuilder().removeArrowsByType(gameId, ArrowBuilder.Type.PAIRED); + ArrowBuilder.getBuilder().removeArrowsByType(gameId, ArrowBuilder.Type.SOURCE); + } } public void enlargeCard() {