[Arianne-commits] stendhal/src/games/stendhal/server/entity/npc/behaviour/adder OutfitChangerAdder.java, 1.30, 1.31

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

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/npc/behaviour/adder
In directory vz-cvs-4.sog:/tmp/cvs-serv26307/src/games/stendhal/server/entity/npc/behaviour/adder

Modified Files:
	OutfitChangerAdder.java 
Log Message:
Fix #3486112 - outfits not expiring from magic city. the message about the expiry was wrong.

Index: OutfitChangerAdder.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/npc/behaviour/adder/OutfitChangerAdder.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** OutfitChangerAdder.java	25 Sep 2011 17:24:49 -0000	1.30
--- OutfitChangerAdder.java	21 Feb 2012 19:09:59 -0000	1.31
***************
*** 124,128 ****
  								// but it doesn't recognise it here ...
  							} else if (outfitBehaviour.getEndurance() != -1) {
! 								npc.say("Thanks! This will wear off in " +  TimeUtil.timeUntil((int) (outfitBehaviour.getEndurance())) + ".");
  							} else {
  								npc.say("Thanks!");
--- 124,129 ----
  								// but it doesn't recognise it here ...
  							} else if (outfitBehaviour.getEndurance() != -1) {
! 								// timeUntil takes a parameter in seconds so we multiply the endurance in minutes by 60
! 								npc.say("Thanks! This will wear off in " +  TimeUtil.timeUntil((int) (60*outfitBehaviour.getEndurance())) + ".");
  							} else {
  								npc.say("Thanks!");