[Arianne-commits] stendhal/src/games/stendhal/server/core/engine/dbcommand StoreMessageCommand.java, 1.5, 1.6

[Hendrik B. <nh...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/core/engine/dbcommand
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28124/src/games/stendhal/server/core/engine/dbcommand

Modified Files:
	StoreMessageCommand.java 
Log Message:
handle ignore list

Index: StoreMessageCommand.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/core/engine/dbcommand/StoreMessageCommand.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StoreMessageCommand.java	25 Feb 2011 07:46:44 -0000	1.5
--- StoreMessageCommand.java	12 Jan 2014 22:01:51 -0000	1.6
***************
*** 13,16 ****
--- 13,17 ----
  
  import games.stendhal.server.core.engine.db.PostmanDAO;
+ import games.stendhal.server.core.engine.db.StendhalBuddyDAO;
  
  import java.sql.SQLException;
***************
*** 34,37 ****
--- 35,39 ----
  	private final String messagetype;
  	private String accountName;
+ 	private boolean ignored = false;
  
  	/**
***************
*** 52,61 ****
  	@Override
  	public void execute(DBTransaction transaction) throws SQLException {
! 		CharacterDAO characterdao = DAORegister.get().get(CharacterDAO.class);
! 		accountName = characterdao.getAccountName(transaction, target);
! 		if (accountName != null) {
! 			PostmanDAO postmandao = DAORegister.get().get(PostmanDAO.class);
! 			postmandao.storeMessage(transaction, source, target, message, messagetype);
  		}
  	}
  
--- 54,73 ----
  	@Override
  	public void execute(DBTransaction transaction) throws SQLException {
! 		CharacterDAO characterDAO = DAORegister.get().get(CharacterDAO.class);
! 		accountName = characterDAO.getAccountName(transaction, target);
! 		if (accountName == null) {
! 			return;
  		}
+ 
+ 		if (messagetype.equals("P")) {
+ 			StendhalBuddyDAO buddyDAO = DAORegister.get().get(StendhalBuddyDAO.class);
+ 			if (buddyDAO.isIgnored(transaction, target, source)) {
+ 				ignored = true;
+ 				return;
+ 			}
+ 		}
+ 
+ 		PostmanDAO postmanDAO = DAORegister.get().get(PostmanDAO.class);
+ 		postmanDAO.storeMessage(transaction, source, target, message, messagetype);
  	}
  
***************
*** 70,73 ****
--- 82,94 ----
  
  	/**
+ 	 * is ignored
+ 	 *
+ 	 * @return ignored
+ 	 */
+ 	public boolean isIgnored() {
+ 		return ignored;
+ 	}
+ 
+ 	/**
  	 * To access the character name we queried
  	 *