[Arianne-commits] stendhal/src/games/stendhal/server/entity/mapstuff/area MessagingArea.java, 1.6, 1.6.26.1

[Katie R. <ky...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/mapstuff/area
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3171/src/games/stendhal/server/entity/mapstuff/area

Modified Files:
      Tag: VERSION_00_RELEASE_86
	MessagingArea.java 
Log Message:
Backport kiheru's fix for [3031671] [Stendhal] zone/area entry message before welcome message

Index: MessagingArea.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/mapstuff/area/MessagingArea.java,v
retrieving revision 1.6
retrieving revision 1.6.26.1
diff -C2 -d -r1.6 -r1.6.26.1
*** MessagingArea.java	15 Nov 2009 20:35:41 -0000	1.6
--- MessagingArea.java	22 Jul 2010 18:56:58 -0000	1.6.26.1
***************
*** 40,44 ****
  	public void onEntered(final ActiveEntity entity, final StendhalRPZone zone, final int newX, final int newY) {
  		if ((enterMessage != null) && (entity instanceof Player)) {
! 			((Player) entity).sendPrivateText(NotificationType.SCENE_SETTING, enterMessage);
  		}
  	}
--- 40,46 ----
  	public void onEntered(final ActiveEntity entity, final StendhalRPZone zone, final int newX, final int newY) {
  		if ((enterMessage != null) && (entity instanceof Player)) {
! 			// needs to be delayed to avoid the message appearing before server
! 			// welcome on login
! 			new DelayedPlayerTextSender((Player) entity, enterMessage, NotificationType.SCENE_SETTING, 1);
  		}
  	}