From: Astrid S. <ast...@us...> - 2008-04-14 10:51:24
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/core/engine In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv8123/src/games/stendhal/server/core/engine Modified Files: StendhalRPWorld.java Log Message: extracted method as stated in todo Index: StendhalRPWorld.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/core/engine/StendhalRPWorld.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** StendhalRPWorld.java 11 Mar 2008 13:46:16 -0000 1.20 --- StendhalRPWorld.java 14 Apr 2008 10:51:27 -0000 1.21 *************** *** 139,170 **** } - // /** - // * Returns the pathfinder. The return value is undefined until onInit() is - // * called. - // * - // * @return the pathfinder - // */ - // public PathfinderThread getPathfinder() { - // return pathfinderThread; - // } - // - // /** - // * checks if the pathfinder thread is still alive. If it is not, it is - // * restarted. - // */ - // public void checkPathfinder() { - // if ((pathfinderThread == null) || !pathfinderThread.isAlive()) { - // logger.error("Pathfinderthread died"); - // pathfinderThread = new PathfinderThread(this); - // pathfinderThread.start(); - // } - // } - protected void createRPClasses() { - /* - * TODO: Refactor Do as Chadf proposed so the classes self initialize. - * This method is prone to be forgotten on addition of new classes. - */ Entity.generateRPClass(); --- 139,144 ---- *************** *** 256,276 **** loader.load(); ! /* ! * TODO: Refactor Extract to new method. ! */ ! /** ! * After all the zones has been loaded, check how many portals are ! * unpaired ! */ ! for (IRPZone zone : this) { ! for (Portal portal : ((StendhalRPZone) zone).getPortals()) { ! validatePortal(portal); ! } ! } - // TODO: make sure this is the proper place for this + way to do - // this - // make sure that it is always initialized on server startup so that - // its LoginListener does not miss anyone. SingletonRepository.getGagManager(); } catch (Exception e) { --- 230,235 ---- loader.load(); ! validatePortals(); SingletonRepository.getGagManager(); } catch (Exception e) { *************** *** 279,282 **** --- 238,253 ---- } + /** + * Checks for unpaired portals. + */ + private void validatePortals() { + + for (IRPZone zone : this) { + for (Portal portal : ((StendhalRPZone) zone).getPortals()) { + validatePortal(portal); + } + } + } + @Override public void onFinish() { |