[Megameknet-cvs] MegaMekNET/src/server/campaign CampaignMain.java,1.123,1.124
Status: Inactive
Brought to you by:
mcwizard
From: Immanuel S. <im...@us...> - 2005-04-09 12:56:47
|
Update of /cvsroot/megameknet/MegaMekNET/src/server/campaign In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10580/src/server/campaign Modified Files: CampaignMain.java Log Message: more cyclops changes Index: CampaignMain.java =================================================================== RCS file: /cvsroot/megameknet/MegaMekNET/src/server/campaign/CampaignMain.java,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** CampaignMain.java 9 Apr 2005 09:47:46 -0000 1.123 --- CampaignMain.java 9 Apr 2005 12:56:38 -0000 1.124 *************** *** 237,241 **** SXMLSaveVisitor saver = new SXMLSaveVisitor(); // Units ! saver.toXml("campaign/unit.xml", "units", CampaignMain.cm.units.values()); // Houses (one file for each house because memory concerns) for (Iterator it = data.getAllHouses().iterator(); it.hasNext();) { --- 237,242 ---- SXMLSaveVisitor saver = new SXMLSaveVisitor(); // Units ! updateUnitList(); ! saver.toXml("campaign/unit.xml", "units", units.values()); // Houses (one file for each house because memory concerns) for (Iterator it = data.getAllHouses().iterator(); it.hasNext();) { *************** *** 258,264 **** }); // Blackboard ! saver.toXml("campaign/blackboard.xml", CampaignMain.cm.getBlackBoard()); // Market ! saver.toXml("campaign/blackmarket.xml", CampaignMain.cm.getMarket()); // Planet environment saver.toXml("campaign/planetEnvironment.xml", "planetEnvironments", data.getAllTerrains()); --- 259,265 ---- }); // Blackboard ! saver.toXml("campaign/blackboard.xml", getBlackBoard()); // Market ! saver.toXml("campaign/blackmarket.xml", getMarket()); // Planet environment saver.toXml("campaign/planetEnvironment.xml", "planetEnvironments", data.getAllTerrains()); *************** *** 410,436 **** } - // generate a list of all units in the system. - for (Iterator it = getData().getAllHouses().iterator();it.hasNext();) { - SHouse house = (SHouse)it.next(); - for (Iterator pl = house.getMembers().values().iterator(); pl.hasNext();) { - for (Iterator un = ((SPlayer)pl.next()).getUnits().iterator(); un.hasNext();) { - SUnit u = (SUnit)un.next(); - units.put(new Integer(u.getId()), u); - } - } - for (Iterator ha = house.getHangar().values().iterator(); ha.hasNext();) { - for (Iterator ha2 = ((Vector)ha.next()).iterator(); ha2.hasNext();) { - for (Iterator ha3 = ((Vector)ha2.next()).iterator(); ha3.hasNext();) { - SUnit u = (SUnit)ha3.next(); - units.put(new Integer(u.getId()), u); - } - } - } - } - for (Iterator it = market.getAllUnits().iterator(); it.hasNext();) { - SUnit u = (SUnit)((MarketUnit)it.next()).getCmech(); - units.put(new Integer(u.getId()), u); - } - // saving in fresh xml format for the next run to make it better :) saveData(); --- 411,414 ---- *************** *** 491,495 **** rpcserver = new RPCServer(Integer.parseInt(getConfig("RPCPORT")), data); } ! /** * Stops the RPC server instance. --- 469,503 ---- rpcserver = new RPCServer(Integer.parseInt(getConfig("RPCPORT")), data); } ! ! /** ! * Updates the campaign intern unit list by iterating through all players ! * and houses and collect all units in the list. ! */ ! private void updateUnitList() { ! units = new HashMap(); ! // generate a list of all units in the system. ! for (Iterator it = getData().getAllHouses().iterator();it.hasNext();) { ! SHouse house = (SHouse)it.next(); ! for (Iterator pl = house.getMembers().values().iterator(); pl.hasNext();) { ! for (Iterator un = ((SPlayer)pl.next()).getUnits().iterator(); un.hasNext();) { ! SUnit u = (SUnit)un.next(); ! units.put(new Integer(u.getId()), u); ! } ! } ! for (Iterator ha = house.getHangar().values().iterator(); ha.hasNext();) { ! for (Iterator ha2 = ((Vector)ha.next()).iterator(); ha2.hasNext();) { ! for (Iterator ha3 = ((Vector)ha2.next()).iterator(); ha3.hasNext();) { ! SUnit u = (SUnit)ha3.next(); ! units.put(new Integer(u.getId()), u); ! } ! } ! } ! } ! for (Iterator it = market.getAllUnits().iterator(); it.hasNext();) { ! SUnit u = (SUnit)((MarketUnit)it.next()).getCmech(); ! units.put(new Integer(u.getId()), u); ! } ! } ! /** * Stops the RPC server instance. *************** *** 718,722 **** cmd.process(param, userName); } catch (IllegalUsageException e) { ! toUser("Illegal Arguments to command '"+cmdName+"'."+cmd.getUsage(), userName, true); } catch (RuntimeException e) { toUser("Your command has thrown an exception ("+e.getClass().getName()+"). Please do a bug report or inform a developer.", userName, true); --- 726,730 ---- cmd.process(param, userName); } catch (IllegalUsageException e) { ! toUser("Illegal Arguments to command '"+cmdName+"'. Usage: "+cmd.getUsage(), userName, true); } catch (RuntimeException e) { toUser("Your command has thrown an exception ("+e.getClass().getName()+"). Please do a bug report or inform a developer.", userName, true); *************** *** 960,971 **** while (ST.hasMoreElements()) { String mek = ST.nextToken().toLowerCase(); ! //Is one of the meks reported owned by the player? Then he ! // didn't ! // watch but play the game! if (mek.indexOf(Username.toLowerCase()) != -1) participated = true; ! //Graveyard meks and Destroyed meks count equal.. We do the ! // salvage ! // code ourselfes Meks.add(mek); } --- 968,977 ---- while (ST.hasMoreElements()) { String mek = ST.nextToken().toLowerCase(); ! // Is one of the meks reported owned by the player? Then he ! // didn't watch but play the game! if (mek.indexOf(Username.toLowerCase()) != -1) participated = true; ! // Graveyard meks and Destroyed meks count equal.. We do the ! // salvage code ourselfes Meks.add(mek); } *************** *** 1731,1758 **** } - // unit rebuild - units = new Hashtable(); - for (Iterator it = getData().getAllHouses().iterator();it.hasNext();) { - SHouse house = (SHouse)it.next(); - for (Iterator pl = house.getMembers().values().iterator(); pl.hasNext();) { - for (Iterator un = ((SPlayer)pl.next()).getUnits().iterator(); un.hasNext();) { - SUnit u = (SUnit)un.next(); - units.put(new Integer(u.getId()), u); - } - } - for (Iterator ha = house.getHangar().values().iterator(); ha.hasNext();) { - for (Iterator ha2 = ((Vector)ha.next()).iterator(); ha2.hasNext();) { - for (Iterator ha3 = ((Vector)ha2.next()).iterator(); ha3.hasNext();) { - SUnit u = (SUnit)ha3.next(); - units.put(new Integer(u.getId()), u); - } - } - } - } - for (Iterator it = market.getAllUnits().iterator(); it.hasNext();) { - SUnit u = (SUnit)((MarketUnit)it.next()).getCmech(); - units.put(new Integer(u.getId()), u); - } - //Purge inactive? - Every 100 ticks if (tickid % 100 == 0){ --- 1737,1740 ---- *************** *** 1765,1768 **** --- 1747,1752 ---- // serverDescriptions.save(getConfig("ServerDescription")); + saveData(); + System.gc(); } |