From 681cf0167de2cb3b8bffc835d2053b2b5ca06307 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Sat, 4 Feb 2012 15:46:46 +0400
Subject: [PATCH] minor fix

---
 Mage/src/mage/players/PlayerImpl.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java
index e0e4f9baf43..ed6eecb77d2 100644
--- a/Mage/src/mage/players/PlayerImpl.java
+++ b/Mage/src/mage/players/PlayerImpl.java
@@ -630,17 +630,20 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
 
 	@Override
 	public boolean triggerAbility(TriggeredAbility source, Game game) {
+        if (source == null) {
+            log.warn("Null source in triggerAbility method");
+            return false;
+        }
 		//20091005 - 603.3c, 603.3d
 		int bookmark = game.bookmarkState();
         //FIXME: remove try\catch once we find out the reason for NPE on server
         TriggeredAbility ability = null;
         try {
-		    ability = (TriggeredAbility) source.copy();
+		    ability = source.copy();
         } catch (NullPointerException npe) {
             log.fatal("NPE for source=" + source);
-            if (source != null) {
-                log.fatal("NPE for source=" + source.getRule());
-            }
+            log.fatal("NPE for source=" + source.getRule());
+            throw npe;
         }
 		if (ability != null && ability.canChooseTarget(game)) {
 			if (ability.isUsesStack()) {