Reverting [2319]

L2_GameServer/java/net/sf/l2j/gameserver/model/quest/QuestTimer.java

@@ -97,9 +97,7 @@ public class QuestTimer
     		return false;
     	if ( (quest != getQuest()) || name.compareToIgnoreCase(getName())!=0 )
     		return false;
-    	if (((npc == null && getNpc() == null) || (getNpc() != null && npc == getNpc())) && ((player == null && getPlayer() == null) || (getPlayer() != null && player == getPlayer())))
-    		return true;
-    	return false;
+    	return (( npc==null || getNpc()==null || npc==getNpc() ) && ( player==null || getPlayer()==null || player==getPlayer() ));
     }
 
     // =========================================================