[Arianne-commits] stendhal/src/games/stendhal/server/maps/semos/tavern/market RemoveOfferChatAction.java, 1.6, 1.7

[Kimmo R. <ki...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/tavern/market
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10138/src/games/stendhal/server/maps/semos/tavern/market

Modified Files:
	RemoveOfferChatAction.java 
Log Message:
always return to attending


Index: RemoveOfferChatAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/tavern/market/RemoveOfferChatAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RemoveOfferChatAction.java	17 Oct 2009 11:20:20 -0000	1.6
--- RemoveOfferChatAction.java	19 Nov 2009 16:54:58 -0000	1.7
***************
*** 1,5 ****
  package games.stendhal.server.maps.semos.tavern.market;
  
- import games.stendhal.server.entity.npc.ConversationStates;
  import games.stendhal.server.entity.npc.SpeakerNPC;
  import games.stendhal.server.entity.npc.parser.Sentence;
--- 1,4 ----
***************
*** 19,23 ****
  			npc.say("Sorry, I did not understand you. "
  					+ sentence.getErrorString());
- 			npc.setCurrentState(ConversationStates.ATTENDING);
  		} else if (sentence.getExpressions().iterator().next().toString().equals("remove")){
  			handleSentence(player,sentence,npc);
--- 18,21 ----
***************
*** 38,49 ****
  				}
  				npc.say("You can only remove your own offers. Please say #show #mine to see only your offers.");
- 				npc.setCurrentState(ConversationStates.ATTENDING);
  				return;
  			}
  			npc.say("Sorry, please choose a number from those I told you to remove your offer.");
- 			npc.setCurrentState(ConversationStates.BUY_PRICE_OFFERED);
  		} catch (NumberFormatException e) {
  			npc.say("Sorry, please say #remove #number");
- 			npc.setCurrentState(ConversationStates.BUY_PRICE_OFFERED);
  		}
  		manager.getOfferMap().clear();
--- 36,44 ----