[Arianne-commits] stendhal/src/games/stendhal/server/maps/abstrakt IL0_AdminPlayground.java, 1.4, 1.5

[Hendrik <nh...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/abstrakt
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11357/src/games/stendhal/server/maps/abstrakt

Modified Files:
	IL0_AdminPlayground.java 
Log Message:
replaced deprecated ScriptingSystem with TurnNotifier/TurnListener

Index: IL0_AdminPlayground.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/abstrakt/IL0_AdminPlayground.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IL0_AdminPlayground.java	29 Mar 2007 14:27:15 -0000	1.4
--- IL0_AdminPlayground.java	3 Apr 2007 21:59:15 -0000	1.5
***************
*** 120,128 ****
  		@Override
  		public void fire(Player player, String text, SpeakerNPC engine) {
! 			game.add(null, new TeleportScriptAction(player, engine, text, game));
  		}
  	}
  
! 	class TeleportScriptAction extends ScriptAction {
  		private ScriptInGroovy game;
  
--- 120,128 ----
  		@Override
  		public void fire(Player player, String text, SpeakerNPC engine) {
! 			TurnNotifier.get().notifyInTurns(0, new TeleportScriptAction(player, engine, text, game), null);
  		}
  	}
  
! 	class TeleportScriptAction implements TurnListener {
  		private ScriptInGroovy game;
  
***************
*** 152,157 ****
  		}
  
! 		@Override
! 		public void fire() {
  			counter++;
  			if (!beamed) {
--- 152,157 ----
  		}
  
! 		public void onTurnReached(int currentTurn, String message) {
! 			boolean keepRunning = true;
  			counter++;
  			if (!beamed) {
***************
*** 197,205 ****
  						inversedSpeed++;
  						if (inversedSpeed == 3) {
! 							game.remove(this);
  						}
  					}
  				}
  			}
  		}
  	}
--- 197,208 ----
  						inversedSpeed++;
  						if (inversedSpeed == 3) {
! 							keepRunning = false;
  						}
  					}
  				}
  			}
+ 			if (keepRunning) {
+ 				TurnNotifier.get().notifyInTurns(0, this, null);
+ 			}
  		}
  	}