[Arianne-commits] stendhal/src/games/stendhal/server/entity/player PlayerRPClass.java, 1.64, 1.65

[Astrid S. <ast...@us...>]

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

Modified Files:
	PlayerRPClass.java 
Log Message:
replaced stendhal.common.Pair with marauroa.common.Pair


Index: PlayerRPClass.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/player/PlayerRPClass.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** PlayerRPClass.java	20 Jul 2007 15:27:46 -0000	1.64
--- PlayerRPClass.java	20 Jul 2007 16:34:19 -0000	1.65
***************
*** 15,19 ****
  import games.stendhal.common.Debug;
  import games.stendhal.server.StendhalRPAction;
- import games.stendhal.server.StendhalRPRuleProcessor;
  import games.stendhal.server.StendhalRPWorld;
  import games.stendhal.server.StendhalRPZone;
--- 15,18 ----
***************
*** 404,408 ****
  
  				world.add(sheep);
! 				
  				/*
  				 * Sheep needs to be added to the NPC list.
--- 403,407 ----
  
  				world.add(sheep);
! 
  				/*
  				 * Sheep needs to be added to the NPC list.
***************
*** 451,455 ****
  				StendhalRPAction.placeat(zone, pet, x, y);
  //				zone.addPlayerAndFriends(cat);
! 		}		
  		StendhalRPAction.placeat(zone, player, x, y);
  //		zone.addPlayerAndFriends(player);
--- 450,454 ----
  				StendhalRPAction.placeat(zone, pet, x, y);
  //				zone.addPlayerAndFriends(cat);
! 		}
  		StendhalRPAction.placeat(zone, player, x, y);
  //		zone.addPlayerAndFriends(player);