[Arianne-commits] stendhal/src/games/stendhal/server/actions/admin SupportAnswerAction.java, 1.30, 1.30.4.1 StoreMessageOnBehalfOfPlayerAction.java, 1.3, 1.3.4.1

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

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/admin
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv31082/src/games/stendhal/server/actions/admin

Modified Files:
      Tag: VERSION_00_RELEASE_86_REVISION_01
	SupportAnswerAction.java 
	StoreMessageOnBehalfOfPlayerAction.java 
Log Message:
use TurnListenerDecorator where required (fixes #3037636)

Index: SupportAnswerAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/admin/SupportAnswerAction.java,v
retrieving revision 1.30
retrieving revision 1.30.4.1
diff -C2 -d -r1.30 -r1.30.4.1
*** SupportAnswerAction.java	11 Jul 2010 22:53:22 -0000	1.30
--- SupportAnswerAction.java	31 Jul 2010 20:10:27 -0000	1.30.4.1
***************
*** 12,15 ****
--- 12,16 ----
  import games.stendhal.server.core.engine.dbcommand.StoreMessageCommand;
  import games.stendhal.server.core.events.TurnListener;
+ import games.stendhal.server.core.events.TurnListenerDecorator;
  import games.stendhal.server.core.events.TurnNotifier;
  import games.stendhal.server.entity.player.Player;
***************
*** 70,74 ****
  				DBCommand command = new StoreMessageCommand(player.getName(), action.get(TARGET), "In answer to your support question:\n" + reply + " \nIf you wish to reply, use /support.", "S");
  				DBCommandQueue.get().enqueueAndAwaitResult(command, handle);
! 				TurnNotifier.get().notifyInTurns(0, this);
  			}
  		}
--- 71,75 ----
  				DBCommand command = new StoreMessageCommand(player.getName(), action.get(TARGET), "In answer to your support question:\n" + reply + " \nIf you wish to reply, use /support.", "S");
  				DBCommandQueue.get().enqueueAndAwaitResult(command, handle);
! 				TurnNotifier.get().notifyInTurns(0, new TurnListenerDecorator(this));
  			}
  		}
***************
*** 84,88 ****
  		
  		if (checkcommand == null) {
! 			TurnNotifier.get().notifyInTurns(0, this);
  			return;
  		}
--- 85,89 ----
  		
  		if (checkcommand == null) {
! 			TurnNotifier.get().notifyInTurns(0, new TurnListenerDecorator(this));
  			return;
  		}

Index: StoreMessageOnBehalfOfPlayerAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/admin/StoreMessageOnBehalfOfPlayerAction.java,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -d -r1.3 -r1.3.4.1
*** StoreMessageOnBehalfOfPlayerAction.java	18 Jul 2010 21:41:04 -0000	1.3
--- StoreMessageOnBehalfOfPlayerAction.java	31 Jul 2010 20:10:27 -0000	1.3.4.1
***************
*** 8,11 ****
--- 8,12 ----
  import games.stendhal.server.core.engine.dbcommand.StoreMessageCommand;
  import games.stendhal.server.core.events.TurnListener;
+ import games.stendhal.server.core.events.TurnListenerDecorator;
  import games.stendhal.server.core.events.TurnNotifier;
  import games.stendhal.server.entity.player.Player;
***************
*** 37,41 ****
  			DBCommand command = new StoreMessageCommand(action.get("source"), action.get(TARGET), message, "P");
  			DBCommandQueue.get().enqueueAndAwaitResult(command, handle);
! 			TurnNotifier.get().notifyInTurns(0, this);
  		}
  	}
--- 38,42 ----
  			DBCommand command = new StoreMessageCommand(action.get("source"), action.get(TARGET), message, "P");
  			DBCommandQueue.get().enqueueAndAwaitResult(command, handle);
! 			TurnNotifier.get().notifyInTurns(0, new TurnListenerDecorator(this));
  		}
  	}
***************
*** 50,54 ****
  		
  		if (checkcommand == null) {
! 			TurnNotifier.get().notifyInTurns(0, this);
  			return;
  		}
--- 51,55 ----
  		
  		if (checkcommand == null) {
! 			TurnNotifier.get().notifyInTurns(0, new TurnListenerDecorator(this));
  			return;
  		}