[Arianne-commits] stendhal/src/games/stendhal/server/entity/npc SpeakerNPC.java, 1.67, 1.68

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

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/npc
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv4489/src/games/stendhal/server/entity/npc

Modified Files:
	SpeakerNPC.java 
Log Message:
fixed a bug which caused SpeakerNPC to talk to other people

Index: SpeakerNPC.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/npc/SpeakerNPC.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** SpeakerNPC.java	7 Jan 2007 04:25:24 -0000	1.67
--- SpeakerNPC.java	12 Jan 2007 21:37:09 -0000	1.68
***************
*** 606,619 ****
  		// TODO: don't check if it equals the text, but if it starts
  		// with it (case-insensitive)
! 		if (!player.equals(attending) && GREETING_MESSAGES.contains(text)) {
! 			logger.debug("Already attending a player");
! 			if (waitMessage != null) {
! 				say(waitMessage);
! 			}
! 
! 			if (waitAction != null) {
! 				waitAction.fire(player, text, this);
  			}
- 
  			return true;
  		}
--- 606,621 ----
  		// TODO: don't check if it equals the text, but if it starts
  		// with it (case-insensitive)
! 		if (!player.equals(attending)) {
! 			if (GREETING_MESSAGES.contains(text)) {
! 			
! 				logger.debug("Already attending a player");
! 				if (waitMessage != null) {
! 					say(waitMessage);
! 				}
! 	
! 				if (waitAction != null) {
! 					waitAction.fire(player, text, this);
! 				}
  			}
  			return true;
  		}