[Arianne-commits] stendhal/src/games/stendhal/server/maps/semos/bank VaultRemover.java, NONE, 1.1.2.2 Vault.java, 1.2, 1.2.2.1

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

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/bank
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9175

Modified Files:
      Tag: VERSION_00_RELEASE_74
	Vault.java 
Added Files:
      Tag: VERSION_00_RELEASE_74
	VaultRemover.java 
Log Message:
backport hendrik's fix to vault removal


Index: Vault.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/semos/bank/Vault.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** Vault.java	7 May 2009 12:34:11 -0000	1.2
--- Vault.java	15 Jun 2009 17:48:03 -0000	1.2.2.1
***************
*** 8,11 ****
--- 8,12 ----
  import games.stendhal.server.core.engine.StendhalRPZone;
  import games.stendhal.server.core.events.MovementListener;
+ import games.stendhal.server.core.events.TurnNotifier;
  import games.stendhal.server.entity.ActiveEntity;
  import games.stendhal.server.entity.RPEntity;
***************
*** 68,72 ****
  		public void onEntered(final ActiveEntity entity,
  				final StendhalRPZone zone, final int newX, final int newY) {
! 
  		}
  
--- 69,73 ----
  		public void onEntered(final ActiveEntity entity,
  				final StendhalRPZone zone, final int newX, final int newY) {
! 			// ignore
  		}
  
***************
*** 152,156 ****
  				entity.put("y", "27");
  
! 				SingletonRepository.getRPWorld().removeZone(zone);
  			}
  		}
--- 153,157 ----
  				entity.put("y", "27");
  
! 				TurnNotifier.get().notifyInTurns(2, new VaultRemover(zone));
  			}
  		}
***************
*** 159,163 ****
  				final StendhalRPZone zone, final int oldX, final int oldY,
  				final int newX, final int newY) {
! 
  		}
  	}
--- 160,164 ----
  				final StendhalRPZone zone, final int oldX, final int oldY,
  				final int newX, final int newY) {
! 			// ignore
  		}
  	}

--- NEW FILE: VaultRemover.java ---
package games.stendhal.server.maps.semos.bank;

import games.stendhal.server.core.engine.SingletonRepository;
import games.stendhal.server.core.engine.StendhalRPZone;
import games.stendhal.server.core.events.TurnListener;

/**
 * removes the vault
 *
 * @author hendrik
 */
public class VaultRemover implements TurnListener {
	private StendhalRPZone zone;

	/**
	 * creates a new VaultRemover
	 *
	 * @param zone StendhalRPZone 
	 */
	public VaultRemover(StendhalRPZone zone) {
		this.zone = zone;
	}

	public void onTurnReached(int currentTurn) {
		SingletonRepository.getRPWorld().removeZone(zone);
	}

}