From: Kimmo R. <ki...@us...> - 2012-07-25 09:50:58
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/bank In directory vz-cvs-4.sog:/tmp/cvs-serv30538/src/games/stendhal/server/maps/semos/bank Modified Files: Vault.java Log Message: Log item transfers at vault destruction. Bug [3158822] Index: Vault.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/bank/Vault.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Vault.java 2 Apr 2011 15:44:18 -0000 1.11 --- Vault.java 25 Jul 2012 09:50:55 -0000 1.12 *************** *** 23,27 **** import games.stendhal.server.core.events.TurnNotifier; import games.stendhal.server.entity.ActiveEntity; - import games.stendhal.server.entity.RPEntity; import games.stendhal.server.entity.item.Item; import games.stendhal.server.entity.mapstuff.area.WalkBlocker; --- 23,26 ---- *************** *** 96,102 **** // ignore items which are in the wastebin if (!(item.getX() == 2 && item.getY() == 5)) { String message; ! boolean equippedToBag = ((RPEntity) entity).equip( ! "bag", item); if (equippedToBag) { --- 95,101 ---- // ignore items which are in the wastebin if (!(item.getX() == 2 && item.getY() == 5)) { + Player player = (Player) entity; String message; ! boolean equippedToBag = player.equip("bag", item); if (equippedToBag) { *************** *** 105,112 **** + "returned to your bag."; ! new GameEvent(((RPEntity) entity).getName(), "equip", item.getName(), "vault", "bag", Integer.toString(item.getQuantity())).raise(); } else { ! boolean equippedToBank = ((RPEntity) entity).equip( ! "bank", item); if (equippedToBank) { message = Grammar.quantityplnoun(item.getQuantity(), item.getName(), "A") --- 104,112 ---- + "returned to your bag."; ! new GameEvent(player.getName(), "equip", item.getName(), "vault", "bag", Integer.toString(item.getQuantity())).raise(); ! // Make it look like a normal equip ! new ItemLogger().equipAction(player, item, new String[] {"ground", zone.getName(), item.getX() + " " + item.getY()}, new String[] {"slot", player.getName(), "bag"}); } else { ! boolean equippedToBank = player.equip("bank", item); if (equippedToBank) { message = Grammar.quantityplnoun(item.getQuantity(), item.getName(), "A") *************** *** 114,118 **** + "returned to your bank chest."; ! new GameEvent(((RPEntity) entity).getName(), "equip", item.getName(), "vault", "bank", Integer.toString(item.getQuantity())).raise(); } else { // the player lost their items --- 114,120 ---- + "returned to your bank chest."; ! new GameEvent(player.getName(), "equip", item.getName(), "vault", "bank", Integer.toString(item.getQuantity())).raise(); ! // Make it look like the player put it in the chest ! new ItemLogger().equipAction(player, item, new String[] {"ground", zone.getName(), item.getX() + " " + item.getY()}, new String[] {"slot", "a bank chest", "content"}); } else { // the player lost their items *************** *** 128,132 **** // tell the player the message ! notifyPlayer(((RPEntity) entity).getName(), message); } else { // the timeout method enters the zone and coords of item, this is useful, this is useful we will know it was in wastebin --- 130,134 ---- // tell the player the message ! notifyPlayer(player.getName(), message); } else { // the timeout method enters the zone and coords of item, this is useful, this is useful we will know it was in wastebin |