From: bluelads4 <blu...@us...> - 2014-04-26 07:56:31
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/tavern In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15565/src/games/stendhal/server/maps/semos/tavern Modified Files: RareWeaponsSellerNPC.java Log Message: Placing PcPegleg on chair, room is too small for walking around (Fixes: #5778 Stuck in McPegleg's path) Index: RareWeaponsSellerNPC.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/tavern/RareWeaponsSellerNPC.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** RareWeaponsSellerNPC.java 26 Apr 2013 21:37:21 -0000 1.22 --- RareWeaponsSellerNPC.java 26 Apr 2014 07:56:27 -0000 1.23 *************** *** 13,21 **** package games.stendhal.server.maps.semos.tavern; import games.stendhal.server.core.config.ZoneConfigurator; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPZone; ! import games.stendhal.server.core.pathfinder.FixedPath; ! import games.stendhal.server.core.pathfinder.Node; import games.stendhal.server.entity.npc.ConversationStates; import games.stendhal.server.entity.npc.ShopList; --- 13,21 ---- package games.stendhal.server.maps.semos.tavern; + import games.stendhal.common.Direction; import games.stendhal.server.core.config.ZoneConfigurator; import games.stendhal.server.core.engine.SingletonRepository; import games.stendhal.server.core.engine.StendhalRPZone; ! import games.stendhal.server.entity.RPEntity; import games.stendhal.server.entity.npc.ConversationStates; import games.stendhal.server.entity.npc.ShopList; *************** *** 25,30 **** import java.util.Arrays; - import java.util.LinkedList; - import java.util.List; import java.util.Map; --- 25,28 ---- *************** *** 52,61 **** @Override protected void createPath() { ! final List<Node> nodes = new LinkedList<Node>(); ! nodes.add(new Node(16, 3)); ! nodes.add(new Node(13, 3)); ! nodes.add(new Node(13, 2)); ! nodes.add(new Node(13, 3)); ! setPath(new FixedPath(nodes, true)); } --- 50,55 ---- @Override protected void createPath() { ! // McPegleg doesn't move (room too small) ! setPath(null); } *************** *** 77,80 **** --- 71,78 ---- new BuyerAdder().addBuyer(this, new BuyerBehaviour(shops.get("buyrare")), false); } + + protected void onGoodbye(RPEntity player) { + setDirection(Direction.DOWN); + } }; *************** *** 84,88 **** // Add our new NPC to the game world mcpegleg.setEntityClass("pirate_sailornpc"); ! mcpegleg.setPosition(16, 3); mcpegleg.initHP(100); zone.add(mcpegleg); --- 82,86 ---- // Add our new NPC to the game world mcpegleg.setEntityClass("pirate_sailornpc"); ! mcpegleg.setPosition(15, 4); mcpegleg.initHP(100); zone.add(mcpegleg); |