Index: C:/workspace/L2_GameServer/java/net/sf/l2j/loginserver/ClientThread.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/loginserver/ClientThread.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/loginserver/ClientThread.java (working copy) @@ -414,7 +414,7 @@ _bannedIPs.add(ip); int time = incorrectCount * incorrectCount * 1000; //System.out.println("Banning ip "+ip+" for "+time/1000.0+" seconds."); - ClientScheduler.getInstance().scheduleMed(new UnbanTask(ip), time); + ClientScheduler.getInstance().scheduleHigh(new UnbanTask(ip), time); } public static void addBannedIP(String ip) Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/ClientThread.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/ClientThread.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/ClientThread.java (working copy) @@ -95,7 +95,7 @@ { _sessionId = 0x12345678; _connection = new Connection(this, socket, _cryptkey); - _autoSaveInDB = ClientScheduler.getInstance().scheduleLowAtFixedRate( + _autoSaveInDB = ClientScheduler.getInstance().scheduleMedAtFixedRate( new AutoSaveTask(), 5*60*1000L, 15*60*1000L ); } Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/SelectorThread.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/SelectorThread.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/SelectorThread.java (working copy) @@ -139,7 +139,7 @@ if (Config.ASSERT) assert instance == null; if (Config.COUNT_PACKETS) { - packetMonitor = ClientScheduler.getInstance().scheduleLowAtFixedRate(new MonitorPackets(), 10000, 10000); + packetMonitor = ClientScheduler.getInstance().scheduleMedAtFixedRate(new MonitorPackets(), 10000, 10000); } instance = this; this._hostname = hostname; @@ -703,7 +703,7 @@ if(GameTimeController.getGameTicks() - player.getAttackEndTime() < 15 * GameTimeController.TICKS_PER_SECOND || player.isAttacked()) { c.onlyClose(); - ClientScheduler.getInstance().scheduleLow(new DisconnectionTask(c), 15000); + ClientScheduler.getInstance().scheduleMed(new DisconnectionTask(c), 15000); return; } } @@ -752,7 +752,7 @@ packetHistory.clear(); byteHistory.clear(); - packetMonitor = ClientScheduler.getInstance().scheduleLowAtFixedRate( + packetMonitor = ClientScheduler.getInstance().scheduleMedAtFixedRate( new Runnable() { public void run() Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestRestartPoint.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestRestartPoint.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestRestartPoint.java (working copy) @@ -122,21 +122,21 @@ && castle.getSiege().checkIsAttacker(activeChar.getClan())) { // Schedule respawn delay for attacker - ClientScheduler.getInstance().scheduleLow(new DeathTask(activeChar), castle.getSiege().getAttackerRespawnDelay()); + ClientScheduler.getInstance().scheduleMed(new DeathTask(activeChar), castle.getSiege().getAttackerRespawnDelay()); sm.addString("You will be re-spawned in " + castle.getSiege().getAttackerRespawnDelay()/1000 + " seconds"); activeChar.sendPacket(sm); } else { // Schedule respawn delay for defender with penalty for CT lose - ClientScheduler.getInstance().scheduleLow(new DeathTask(activeChar), castle.getSiege().getDefenderRespawnDelay()); + ClientScheduler.getInstance().scheduleMed(new DeathTask(activeChar), castle.getSiege().getDefenderRespawnDelay()); sm.addString("You will be re-spawned in " + castle.getSiege().getDefenderRespawnDelay()/1000 + " seconds"); activeChar.sendPacket(sm); } return; } - ClientScheduler.getInstance().scheduleLow(new DeathTask(activeChar), 1); + ClientScheduler.getInstance().scheduleMed(new DeathTask(activeChar), 1); } Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java (working copy) @@ -5524,7 +5524,7 @@ { _inventoryDisable = true; - ClientScheduler.getInstance().scheduleMed(new InventoryEnable(), 1500); + ClientScheduler.getInstance().scheduleHigh(new InventoryEnable(), 1500); } /** Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/model/L2Character.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/model/L2Character.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/model/L2Character.java (working copy) @@ -418,7 +418,7 @@ { // If L2PcInstance doesn't have enough MP, stop the attack - ClientScheduler.getInstance().scheduleMed(new NotifyAITask(CtrlEvent.EVT_READY_TO_ACT), 1000); + ClientScheduler.getInstance().scheduleHigh(new NotifyAITask(CtrlEvent.EVT_READY_TO_ACT), 1000); sendPacket(new SystemMessage(SystemMessage.NOT_ENOUGH_MP)); @@ -524,7 +524,7 @@ int reuse = weaponItem==null ? 0 : weaponItem.getAttackReuseDelay(); // Notify AI with EVT_READY_TO_ACT - ClientScheduler.getInstance().scheduleMed(new NotifyAITask(CtrlEvent.EVT_READY_TO_ACT), sAtk+reuse); + ClientScheduler.getInstance().scheduleHigh(new NotifyAITask(CtrlEvent.EVT_READY_TO_ACT), sAtk+reuse); } /** @@ -3329,7 +3329,7 @@ // Create a task to notify the AI that L2Character arrives at a check point of the movement if (tm > 3000) - ClientScheduler.getInstance().scheduleMed( new NotifyAITask(CtrlEvent.EVT_ARRIVED_REVALIDATE), 2000); + ClientScheduler.getInstance().scheduleHigh( new NotifyAITask(CtrlEvent.EVT_ARRIVED_REVALIDATE), 2000); // the CtrlEvent.EVT_ARRIVED will be sent when the character will actually arrive // to destination by GameTimeController @@ -3436,7 +3436,7 @@ // { // if (_currentAttackTask == null )//&& !isInCombat()) // { -// _currentAttackTask = ClientScheduler.getInstance().scheduleMed(new AttackTask(), 0); +// _currentAttackTask = ClientScheduler.getInstance().scheduleHigh(new AttackTask(), 0); // } // else // { Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/ScrollOfEscape.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/ScrollOfEscape.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/ScrollOfEscape.java (working copy) @@ -88,7 +88,7 @@ EscapeFinalizer ef = new EscapeFinalizer(activeChar, item.getItemId()); // continue execution later - activeChar.setSkillCast(ClientScheduler.getInstance().scheduleLow(ef, skill.getSkillTime())); + activeChar.setSkillCast(ClientScheduler.getInstance().scheduleMed(ef, skill.getSkillTime())); activeChar.setSkillCastEndTime(10+GameTimeController.getGameTicks()+skill.getSkillTime()/GameTimeController.MILLIS_IN_TICK); } Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/MysteryPotion.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/MysteryPotion.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/MysteryPotion.java (working copy) @@ -59,7 +59,7 @@ activeChar.sendPacket(sm); MysteryPotionStop mp = new MysteryPotionStop(playable); - ClientScheduler.getInstance().scheduleLow(mp, _effectDuration); + ClientScheduler.getInstance().scheduleMed(mp, _effectDuration); } public class MysteryPotionStop implements Runnable Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/SoulCrystals.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/SoulCrystals.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/SoulCrystals.java (working copy) @@ -85,7 +85,7 @@ // Continue execution later CrystalFinalizer cf = new CrystalFinalizer(activeChar, target, crystalId); - ClientScheduler.getInstance().scheduleLow(cf, skill.getSkillTime()); + ClientScheduler.getInstance().scheduleMed(cf, skill.getSkillTime()); } Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/PetSummon.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/PetSummon.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/PetSummon.java (working copy) @@ -167,13 +167,13 @@ newpet.startFeed( false ); // continue execution in 1 seconds - ClientScheduler.getInstance().scheduleLow(new SummonFinalizer(activeChar, newpet), 900); + ClientScheduler.getInstance().scheduleMed(new SummonFinalizer(activeChar, newpet), 900); // if pet died of hunger last time it was summoned if ( newpet.getCurrentFed() <= 0 ) { // wait 1 minute for owner to feed - ClientScheduler.getInstance().scheduleLow(new FeedWait(activeChar, newpet), 60000); + ClientScheduler.getInstance().scheduleMed(new FeedWait(activeChar, newpet), 60000); } else { Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/ScrollOfResurrection.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/ScrollOfResurrection.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/ScrollOfResurrection.java (working copy) @@ -141,7 +141,7 @@ activeChar.destroyItem("Consume", item.getObjectId(), 1, null, false); //ResurrectFinalizer rf = new ResurrectFinalizer(target); // continue execution later - //ClientScheduler.getInstance().scheduleLow(rf, skill.getSkillTime() - 200); + //ClientScheduler.getInstance().scheduleMed(rf, skill.getSkillTime() - 200); } } } Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/usercommandhandlers/Escape.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/usercommandhandlers/Escape.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/handler/usercommandhandlers/Escape.java (working copy) @@ -64,7 +64,7 @@ EscapeFinalizer ef = new EscapeFinalizer(activeChar); // continue execution later - ClientScheduler.getInstance().scheduleLow(ef, unstuckTimer); + ClientScheduler.getInstance().scheduleMed(ef, unstuckTimer); return true; } Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/CastleUpdater.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/CastleUpdater.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/CastleUpdater.java (working copy) @@ -61,7 +61,7 @@ // re-run again in 1 hours CastleUpdater cu = new CastleUpdater(_clan, _RunCount); - ClientScheduler.getInstance().scheduleLow(cu, 3600000); + ClientScheduler.getInstance().scheduleMed(cu, 3600000); } } catch (Throwable e) { e.printStackTrace(); Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/ai/L2AttackableAI.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/ai/L2AttackableAI.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/ai/L2AttackableAI.java (working copy) @@ -242,7 +242,7 @@ // If not idle - create an AI task (schedule onEvtThink repeatedly) if (aiTask == null) { - aiTask = ClientScheduler.getInstance().scheduleLowAtFixedRate(this, 1000, 1000); + aiTask = ClientScheduler.getInstance().scheduleHighAtFixedRate(this, 1000, 1000); } } Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/ai/L2SiegeGuardAI.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/ai/L2SiegeGuardAI.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/ai/L2SiegeGuardAI.java (working copy) @@ -200,7 +200,7 @@ // If not idle - create an AI task (schedule onEvtThink repeatedly) if (aiTask == null) { - aiTask = ClientScheduler.getInstance().scheduleLowAtFixedRate(this, 1000, 1000); + aiTask = ClientScheduler.getInstance().scheduleMedAtFixedRate(this, 1000, 1000); } } Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/taskmanager/DecayTaskManager.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/taskmanager/DecayTaskManager.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/taskmanager/DecayTaskManager.java (working copy) @@ -17,8 +17,8 @@ */ public class DecayTaskManager { - private Map _decayTasks = new FastMap().setShared(true); - private FastList _actorsToRemove = new FastList(); // put this as a field to avoid newing it every time + protected Map _decayTasks = new FastMap().setShared(true); + protected FastList _actorsToRemove = new FastList(); // put this as a field to avoid newing it every time public static DecayTaskManager _instance; @@ -54,7 +54,7 @@ catch(NoSuchElementException e){} } - private class DecayScheduler implements Runnable + protected class DecayScheduler implements Runnable { public void run() { Index: C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/GameTimeController.java =================================================================== --- C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/GameTimeController.java (revision 1754) +++ C:/workspace/L2_GameServer/java/net/sf/l2j/gameserver/GameTimeController.java (working copy) @@ -72,8 +72,8 @@ _timer = new TimerThread(); _timer.start(); - ClientScheduler.getInstance().scheduleLowAtFixedRate(new TimerWatcher(), 0, 1000); - ClientScheduler.getInstance().scheduleLowAtFixedRate(new BroadcastSunState(), 0, 60 * 60 * 1000); + ClientScheduler.getInstance().scheduleMedAtFixedRate(new TimerWatcher(), 0, 1000); + ClientScheduler.getInstance().scheduleMedAtFixedRate(new BroadcastSunState(), 0, 60 * 60 * 1000); } public boolean isNowNight() @@ -147,7 +147,7 @@ // Create a task to update the _knownObject and _knowPlayers of each L2Character that finished its movement and of their already known L2Object // then notify AI with EVT_ARRIVED if (ended != null) - ClientScheduler.getInstance().scheduleLow(new MovingObjectArrived(ended), 10); + ClientScheduler.getInstance().scheduleMed(new MovingObjectArrived(ended), 10); }