[Arianne-commits] stendhal/src/games/stendhal/server/maps/quests PizzaDelivery.java, 1.42, 1.43

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

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16527/src/games/stendhal/server/maps/quests

Modified Files:
	PizzaDelivery.java 
Log Message:
Fixing bug ID: 2943188 - Leander dropping all pizza from a player who didn't deliver a pizza to an NPC. Now only drop NPC pizzas. Also fixed a typo/grammar error in another sentence and adjusted test to match new behaviour. 

Index: PizzaDelivery.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/PizzaDelivery.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** PizzaDelivery.java	7 May 2009 14:36:12 -0000	1.42
--- PizzaDelivery.java	10 Feb 2010 23:50:15 -0000	1.43
***************
*** 466,479 ****
  						final String customerName = questData[0];
  						if (isDeliveryTooLate(player)) {
! 							// If the player still carries the pizza,
  							// take it away because the baker is angry,
  							// and because the player probably won't
  							// deliver it anymore anyway.
! 							player.dropAll("pizza");
  							npc.say("I see you failed to deliver the pizza to "
  								+ customerName
  								+ " in time. Are you sure you will be more reliable this time?");
  						} else {
! 							npc.say("You still have to deliver a pizza "
  									+ customerName + ", and hurry!");
  							npc.setCurrentState(ConversationStates.ATTENDING);
--- 466,483 ----
  						final String customerName = questData[0];
  						if (isDeliveryTooLate(player)) {
! 							// If the player still carries any pizza due for an NPC,
  							// take it away because the baker is angry,
  							// and because the player probably won't
  							// deliver it anymore anyway.
! 							for (final Item pizza : player.getAllEquipped("pizza")) {
! 								if (pizza.getInfoString()!=null) {
! 									player.drop(pizza);
! 								}
! 							}
  							npc.say("I see you failed to deliver the pizza to "
  								+ customerName
  								+ " in time. Are you sure you will be more reliable this time?");
  						} else {
! 							npc.say("You still have to deliver a pizza to "
  									+ customerName + ", and hurry!");
  							npc.setCurrentState(ConversationStates.ATTENDING);