Menu
▾
▴
[Arianne-commits] stendhal/src/games/stendhal/server/entity/item Money.java, 1.17, 1.17.2.1 ConsumableItem.java, 1.14, 1.14.2.1 Dice.java, 1.7, 1.7.2.1 Token.java, 1.6, 1.6.2.1 StackableItem.java, 1.21, 1.21.2.1 Food.java, 1.10, 1.10.2.1 Box.java, 1.6, 1.6.2.1 WeddingRing.java, 1.5, 1.5.2.1 Drink.java, 1.5, 1.5.2.1
|
From: Hendrik <nh...@us...> - 2007-04-16 18:42:51
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv19487/src/games/stendhal/server/entity/item Modified Files: Tag: VERSION_00_RELEASE_59 Money.java ConsumableItem.java Dice.java Token.java StackableItem.java Food.java Box.java WeddingRing.java Drink.java Log Message: added copy constructor because RPObject.clone does not work in maraurau 1.34 Index: Dice.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/Dice.java,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** Dice.java 23 Mar 2007 20:56:39 -0000 1.7 --- Dice.java 16 Apr 2007 18:40:37 -0000 1.7.2.1 *************** *** 15,18 **** --- 15,19 ---- import games.stendhal.common.Grammar; import games.stendhal.common.Rand; + import games.stendhal.server.entity.item.scroll.EmptyScroll; import games.stendhal.server.entity.npc.CroupierNPC; import games.stendhal.server.entity.npc.NPCList; *************** *** 41,44 **** --- 42,56 ---- } + /** + * Copy Constructor + * + * @param item item to copy + */ + public Dice(Dice item) { + super(item); + topFaces = item.topFaces; + croupierNPC = item.croupierNPC; + } + public void setCroupierNPC(CroupierNPC croupierNPC) { this.croupierNPC = croupierNPC; Index: Drink.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/Drink.java,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** Drink.java 23 Mar 2007 20:56:39 -0000 1.5 --- Drink.java 16 Apr 2007 18:41:55 -0000 1.5.2.1 *************** *** 20,22 **** --- 20,31 ---- super(name, clazz, subclass, attributes); } + + /** + * Copy Constructor + * + * @param item item to copy + */ + public Drink(Drink item) { + super(item); + } } \ No newline at end of file Index: Money.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/Money.java,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** Money.java 2 Apr 2007 15:33:46 -0000 1.17 --- Money.java 16 Apr 2007 18:39:36 -0000 1.17.2.1 *************** *** 31,34 **** --- 31,43 ---- } + /** + * Copy Constructor + * + * @param item item to copy + */ + public Money(Money item) { + super(item); + } + public Money(int quantity) { super("money", "money", "gold", null); Index: Token.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/Token.java,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** Token.java 23 Mar 2007 20:56:39 -0000 1.6 --- Token.java 16 Apr 2007 18:40:41 -0000 1.6.2.1 *************** *** 13,16 **** --- 13,17 ---- package games.stendhal.server.entity.item; + import games.stendhal.server.entity.item.scroll.TeleportScroll; import games.stendhal.server.entity.player.Player; *************** *** 51,54 **** --- 52,65 ---- } + /** + * Copy Constructor + * + * @param item item to copy + */ + public Token(Token item) { + super(item); + } + + @Override public void onPutOnGround(Player player) { Index: Food.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/Food.java,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -C2 -d -r1.10 -r1.10.2.1 *** Food.java 23 Mar 2007 20:56:39 -0000 1.10 --- Food.java 16 Apr 2007 18:40:53 -0000 1.10.2.1 *************** *** 20,22 **** --- 20,31 ---- super(name, clazz, subclass, attributes); } + + /** + * Copy Constructor + * + * @param item item to copy + */ + public Food(Food item) { + super(item); + } } \ No newline at end of file Index: Box.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/Box.java,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** Box.java 30 Mar 2007 18:16:49 -0000 1.6 --- Box.java 16 Apr 2007 18:40:54 -0000 1.6.2.1 *************** *** 43,46 **** --- 43,50 ---- super(name, clazz, subclass, attributes); } + + public Box(Box box) { + super(box); + } public void onUsed(RPEntity user) { Index: ConsumableItem.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/ConsumableItem.java,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -C2 -d -r1.14 -r1.14.2.1 *** ConsumableItem.java 23 Mar 2007 20:56:39 -0000 1.14 --- ConsumableItem.java 16 Apr 2007 18:40:28 -0000 1.14.2.1 *************** *** 17,20 **** --- 17,21 ---- import games.stendhal.server.events.UseListener; import games.stendhal.server.entity.RPEntity; + import games.stendhal.server.entity.item.scroll.EmptyScroll; import games.stendhal.server.entity.player.Player; *************** *** 45,48 **** --- 46,59 ---- } + /** + * Copy Constructor + * + * @param item item to copy + */ + public ConsumableItem(ConsumableItem item) { + super(item); + left = item.left; + } + public int getAmount() { return getInt("amount"); Index: StackableItem.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/StackableItem.java,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -C2 -d -r1.21 -r1.21.2.1 *** StackableItem.java 6 Apr 2007 00:46:42 -0000 1.21 --- StackableItem.java 16 Apr 2007 18:40:51 -0000 1.21.2.1 *************** *** 14,17 **** --- 14,18 ---- import games.stendhal.server.StendhalRPWorld; + import games.stendhal.server.entity.item.scroll.EmptyScroll; import java.util.Map; *************** *** 33,36 **** --- 34,47 ---- } + /** + * Copy Constructor + * + * @param item item to copy + */ + public StackableItem(StackableItem item) { + super(item); + quantity = item.quantity; + } + @Override public void update() throws AttributeNotFoundException { Index: WeddingRing.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/WeddingRing.java,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** WeddingRing.java 30 Mar 2007 18:16:49 -0000 1.5 --- WeddingRing.java 16 Apr 2007 18:41:21 -0000 1.5.2.1 *************** *** 20,23 **** --- 20,24 ---- import games.stendhal.server.entity.RPEntity; import games.stendhal.server.entity.item.scroll.Scroll; + import games.stendhal.server.entity.item.scroll.TeleportScroll; import games.stendhal.server.entity.player.Player; import games.stendhal.server.events.UseListener; *************** *** 54,57 **** --- 55,68 ---- } + /** + * Copy Constructor + * + * @param item item to copy + */ + public WeddingRing(WeddingRing item) { + super(item); + } + + public void onUsed(RPEntity user) { RPObject base = this; |