lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Threadpool refactoring.

Browse Source
This commit is contained in:
MobiusDev
2018-04-02 14:50:53 +00:00
parent 317478a66d
commit 0c201f75e7
1127 changed files with 5204 additions and 5174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java vendored
View File

@@ -25,7 +25,7 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPoolManager;
import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.datatables.SkillTable;
@@ -263,11 +263,11 @@ public class Antharas extends Quest
_antharas.setCurrentHpMp(hp, mp);
_LastAction = System.currentTimeMillis();
// Start repeating timer to check for inactivity
_activityCheckTask = ThreadPoolManager.scheduleAtFixedRate(new CheckActivity(), 60000, 60000);
_activityCheckTask = ThreadPool.scheduleAtFixedRate(new CheckActivity(), 60000, 60000);
}
else if (status == DEAD)
{
ThreadPoolManager.schedule(new UnlockAntharas(ANTHARASOLDID), respawnTime - System.currentTimeMillis());
ThreadPool.schedule(new UnlockAntharas(ANTHARASOLDID), respawnTime - System.currentTimeMillis());
}
else if (status == DORMANT)
{
@@ -316,7 +316,7 @@ public class Antharas extends Quest
_antharas.setCurrentHpMp(hp, mp);
_LastAction = System.currentTimeMillis();
// Start repeating timer to check for inactivity
_activityCheckTask = ThreadPoolManager.scheduleAtFixedRate(new CheckActivity(), 60000, 60000);
_activityCheckTask = ThreadPool.scheduleAtFixedRate(new CheckActivity(), 60000, 60000);
}
else if ((antharasId != 0) && (status == DEAD))
{
@@ -331,7 +331,7 @@ public class Antharas extends Quest
}
else
{
ThreadPoolManager.schedule(new UnlockAntharas(antharasId), respawnTime - System.currentTimeMillis());
ThreadPool.schedule(new UnlockAntharas(antharasId), respawnTime - System.currentTimeMillis());
}
}
}
@@ -372,7 +372,7 @@ public class Antharas extends Quest
if (_monsterSpawnTask == null)
{
GrandBossManager.getInstance().setBossStatus(ANTHARASOLDID, WAITING);
_monsterSpawnTask = ThreadPoolManager.schedule(new AntharasSpawn(1), 60000 * Config.ANTHARAS_WAIT_TIME);
_monsterSpawnTask = ThreadPool.schedule(new AntharasSpawn(1), 60000 * Config.ANTHARAS_WAIT_TIME);
}
}
}
@@ -404,7 +404,7 @@ public class Antharas extends Quest
}
// Spawn mobs.
_mobsSpawnTask = ThreadPoolManager.scheduleAtFixedRate(new MobsSpawn(), intervalOfMobs, intervalOfMobs);
_mobsSpawnTask = ThreadPool.scheduleAtFixedRate(new MobsSpawn(), intervalOfMobs, intervalOfMobs);
}
// Do spawn Antharas.
@@ -462,7 +462,7 @@ public class Antharas extends Quest
GrandBossManager.getInstance().setBossStatus(npcId, FIGHTING);
_LastAction = System.currentTimeMillis();
// Start repeating timer to check for inactivity
_activityCheckTask = ThreadPoolManager.scheduleAtFixedRate(new CheckActivity(), 60000, 60000);
_activityCheckTask = ThreadPool.scheduleAtFixedRate(new CheckActivity(), 60000, 60000);
// Setting 1st time of minions spawn task.
if (!FWA_OLDANTHARAS)
{
@@ -474,7 +474,7 @@ public class Antharas extends Quest
_socialTask.cancel(true);
_socialTask = null;
}
_socialTask = ThreadPoolManager.schedule(new AntharasSpawn(2), 16);
_socialTask = ThreadPool.schedule(new AntharasSpawn(2), 16);
break;
}
case 2:
@@ -487,7 +487,7 @@ public class Antharas extends Quest
_socialTask.cancel(true);
_socialTask = null;
}
_socialTask = ThreadPoolManager.schedule(new AntharasSpawn(3), 3000);
_socialTask = ThreadPool.schedule(new AntharasSpawn(3), 3000);
break;
}
case 3:
@@ -500,7 +500,7 @@ public class Antharas extends Quest
_socialTask.cancel(true);
_socialTask = null;
}
_socialTask = ThreadPoolManager.schedule(new AntharasSpawn(4), 10000);
_socialTask = ThreadPool.schedule(new AntharasSpawn(4), 10000);
break;
}
case 4:
@@ -512,7 +512,7 @@ public class Antharas extends Quest
_socialTask.cancel(true);
_socialTask = null;
}
_socialTask = ThreadPoolManager.schedule(new AntharasSpawn(5), 200);
_socialTask = ThreadPool.schedule(new AntharasSpawn(5), 200);
break;
}
case 5:
@@ -525,7 +525,7 @@ public class Antharas extends Quest
_socialTask.cancel(true);
_socialTask = null;
}
_socialTask = ThreadPoolManager.schedule(new AntharasSpawn(6), 10800);
_socialTask = ThreadPool.schedule(new AntharasSpawn(6), 10800);
break;
}
case 6:
@@ -538,18 +538,18 @@ public class Antharas extends Quest
_socialTask.cancel(true);
_socialTask = null;
}
_socialTask = ThreadPoolManager.schedule(new AntharasSpawn(7), 1900);
_socialTask = ThreadPool.schedule(new AntharasSpawn(7), 1900);
break;
}
case 7:
{
_antharas.abortCast();
_mobiliseTask = ThreadPoolManager.schedule(new SetMobilised(_antharas), 16);
_mobiliseTask = ThreadPool.schedule(new SetMobilised(_antharas), 16);
// Move at random.
if (FWA_MOVEATRANDOM)
{
final Location pos = new Location(Rnd.get(175000, 178500), Rnd.get(112400, 116000), -7707, 0);
_moveAtRandomTask = ThreadPoolManager.schedule(new MoveAtRandom(_antharas, pos), 500);
_moveAtRandomTask = ThreadPool.schedule(new MoveAtRandom(_antharas, pos), 500);
}
if (_socialTask != null)
{
@@ -668,7 +668,7 @@ public class Antharas extends Quest
{
if ((_selfDestructionTask == null) && !npc.isDead())
{
_selfDestructionTask = ThreadPoolManager.schedule(new SelfDestructionOfBomber(npc), FWA_SELFDESTRUCTTIME);
_selfDestructionTask = ThreadPool.schedule(new SelfDestructionOfBomber(npc), FWA_SELFDESTRUCTTIME);
}
break;
}
@@ -842,7 +842,7 @@ public class Antharas extends Quest
if (_type == 0)
{
spawnCube();
_cubeSpawnTask = ThreadPoolManager.schedule(new CubeSpawn(1), 1800000);
_cubeSpawnTask = ThreadPool.schedule(new CubeSpawn(1), 1800000);
}
else
{
@@ -967,10 +967,10 @@ public class Antharas extends Quest
if (!npc.getSpawn().is_customBossInstance())
{
_cubeSpawnTask = ThreadPoolManager.schedule(new CubeSpawn(0), 10000);
_cubeSpawnTask = ThreadPool.schedule(new CubeSpawn(0), 10000);
GrandBossManager.getInstance().setBossStatus(npc.getNpcId(), DEAD);
final long respawnTime = (Config.ANTHARAS_RESP_FIRST + Rnd.get(Config.ANTHARAS_RESP_SECOND)) * 3600000;
ThreadPoolManager.schedule(new UnlockAntharas(npc.getNpcId()), respawnTime);
ThreadPool.schedule(new UnlockAntharas(npc.getNpcId()), respawnTime);
// also save the respawn time so that the info is maintained past reboots
final StatsSet info = GrandBossManager.getInstance().getStatsSet(npc.getNpcId());
info.set("respawn_time", (System.currentTimeMillis() + respawnTime));

8
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java vendored
View File

@@ -26,7 +26,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPoolManager;
import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.datatables.SkillTable;
import com.l2jmobius.gameserver.geodata.GeoData;
@@ -175,7 +175,7 @@ public class Baium extends Quest
}
GrandBossManager.getInstance().addBoss(baium);
final L2NpcInstance _baium = baium;
ThreadPoolManager.schedule(() ->
ThreadPool.schedule(() ->
{
try
{
@@ -244,7 +244,7 @@ public class Baium extends Quest
startQuestTimer("skill_range", 500, npc, null, true);
final L2NpcInstance baium = npc;
ThreadPoolManager.schedule(() ->
ThreadPool.schedule(() ->
{
try
{
@@ -338,7 +338,7 @@ public class Baium extends Quest
final L2GrandBossInstance baium = (L2GrandBossInstance) addSpawn(LIVE_BAIUM, npc);
GrandBossManager.getInstance().addBoss(baium);
final L2NpcInstance _baium = baium;
ThreadPoolManager.schedule(() ->
ThreadPool.schedule(() ->
{
try
{

6
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java vendored
View File

@@ -21,7 +21,7 @@ import java.util.Collection;
import java.util.List;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPoolManager;
import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.datatables.SkillTable;
@@ -128,7 +128,7 @@ public class Valakas extends Quest
GrandBossManager.getInstance().addBoss(valakas);
final L2NpcInstance _valakas = valakas;
ThreadPoolManager.schedule(() ->
ThreadPool.schedule(() ->
{
try
{
@@ -350,7 +350,7 @@ public class Valakas extends Quest
lastAttackTime = System.currentTimeMillis();
final L2NpcInstance _valakas = valakas;
ThreadPoolManager.schedule(() ->
ThreadPool.schedule(() ->
{
try
{

64
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java vendored
View File

@@ -29,7 +29,7 @@ import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPoolManager;
import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.database.DatabaseFactory;
import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.ai.CtrlIntention;
@@ -239,14 +239,14 @@ public class VanHalter extends Quest
{
_timeUpTask.cancel(false);
}
_timeUpTask = ThreadPoolManager.schedule(new TimeUp(), Config.HPH_ACTIVITYTIMEOFHALTER);
_timeUpTask = ThreadPool.schedule(new TimeUp(), Config.HPH_ACTIVITYTIMEOFHALTER);
// Set bleeding to palyers.
if (_setBleedTask != null)
{
_setBleedTask.cancel(false);
}
_setBleedTask = ThreadPoolManager.schedule(new Bleeding(), 2000);
_setBleedTask = ThreadPool.schedule(new Bleeding(), 2000);
final Integer status = GrandBossManager.getInstance().getBossStatus(29062);
if (status == INTERVAL)
@@ -896,7 +896,7 @@ public class VanHalter extends Quest
{
if ((_lockUpDoorOfAltarTask == null) && !_isLocked && _isCaptainSpawned)
{
_lockUpDoorOfAltarTask = ThreadPoolManager.schedule(new LockUpDoorOfAltar(), Config.HPH_TIMEOFLOCKUPDOOROFALTAR);
_lockUpDoorOfAltarTask = ThreadPool.schedule(new LockUpDoorOfAltar(), Config.HPH_TIMEOFLOCKUPDOOROFALTAR);
}
}
@@ -934,7 +934,7 @@ public class VanHalter extends Quest
_closeDoorOfAltarTask.cancel(false);
}
_closeDoorOfAltarTask = null;
_closeDoorOfAltarTask = ThreadPoolManager.schedule(new CloseDoorOfAltar(), Config.HPH_INTERVALOFDOOROFALTER);
_closeDoorOfAltarTask = ThreadPool.schedule(new CloseDoorOfAltar(), Config.HPH_INTERVALOFDOOROFALTER);
}
else
{
@@ -969,7 +969,7 @@ public class VanHalter extends Quest
_openDoorOfAltarTask.cancel(false);
}
_openDoorOfAltarTask = null;
_openDoorOfAltarTask = ThreadPoolManager.schedule(new OpenDoorOfAltar(), Config.HPH_INTERVALOFDOOROFALTER);
_openDoorOfAltarTask = ThreadPool.schedule(new OpenDoorOfAltar(), Config.HPH_INTERVALOFDOOROFALTER);
}
else
{
@@ -1065,7 +1065,7 @@ public class VanHalter extends Quest
}
_timeUpTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(1), Config.HPH_APPTIMEOFHALTER);
_movieTask = ThreadPool.schedule(new Movie(1), Config.HPH_APPTIMEOFHALTER);
}
// Start fight against High Priestess van Halter.
@@ -1075,7 +1075,7 @@ public class VanHalter extends Quest
{
_timeUpTask.cancel(false);
}
_timeUpTask = ThreadPoolManager.schedule(new TimeUp(), Config.HPH_FIGHTTIMEOFHALTER);
_timeUpTask = ThreadPool.schedule(new TimeUp(), Config.HPH_FIGHTTIMEOFHALTER);
final Map<Integer, L2PcInstance> _targets = new HashMap<>();
int i = 0;
@@ -1095,8 +1095,8 @@ public class VanHalter extends Quest
if (!_isHelperCalled)
{
_isHelperCalled = true;
_halterEscapeTask = ThreadPoolManager.schedule(new HalterEscape(), 500);
_callRoyalGuardHelperTask = ThreadPoolManager.schedule(new CallRoyalGuardHelper(), 1000);
_halterEscapeTask = ThreadPool.schedule(new HalterEscape(), 500);
_callRoyalGuardHelperTask = ThreadPool.schedule(new CallRoyalGuardHelper(), 1000);
}
}
@@ -1113,7 +1113,7 @@ public class VanHalter extends Quest
{
_callRoyalGuardHelperTask.cancel(false);
}
_callRoyalGuardHelperTask = ThreadPoolManager.schedule(new CallRoyalGuardHelper(), Config.HPH_CALLROYALGUARDHELPERINTERVAL);
_callRoyalGuardHelperTask = ThreadPool.schedule(new CallRoyalGuardHelper(), Config.HPH_CALLROYALGUARDHELPERINTERVAL);
}
else
{
@@ -1171,7 +1171,7 @@ public class VanHalter extends Quest
{
_halterEscapeTask.cancel(false);
}
_halterEscapeTask = ThreadPoolManager.schedule(new HalterEscape(), 5000);
_halterEscapeTask = ThreadPool.schedule(new HalterEscape(), 5000);
}
else
{
@@ -1243,7 +1243,7 @@ public class VanHalter extends Quest
{
_setBleedTask.cancel(false);
}
_setBleedTask = ThreadPoolManager.schedule(new Bleeding(), 2000);
_setBleedTask = ThreadPool.schedule(new Bleeding(), 2000);
}
}
@@ -1334,7 +1334,7 @@ public class VanHalter extends Quest
final StatsSet info = GrandBossManager.getInstance().getStatsSet(29062);
final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
_intervalTask = ThreadPoolManager.schedule(new Interval(), temp);
_intervalTask = ThreadPool.schedule(new Interval(), temp);
}
// Interval.
@@ -1433,7 +1433,7 @@ public class VanHalter extends Quest
{
_timeUpTask.cancel(false);
}
_timeUpTask = ThreadPoolManager.schedule(new TimeUp(), Config.HPH_ACTIVITYTIMEOFHALTER);
_timeUpTask = ThreadPool.schedule(new TimeUp(), Config.HPH_ACTIVITYTIMEOFHALTER);
}
// Time up.
@@ -1482,7 +1482,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(2), 16);
_movieTask = ThreadPool.schedule(new Movie(2), 16);
break;
}
case 2:
@@ -1501,7 +1501,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(3), 1);
_movieTask = ThreadPool.schedule(new Movie(3), 1);
break;
}
case 3:
@@ -1520,7 +1520,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(4), 1500);
_movieTask = ThreadPool.schedule(new Movie(4), 1500);
break;
}
case 4:
@@ -1539,7 +1539,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(5), 1);
_movieTask = ThreadPool.schedule(new Movie(5), 1);
break;
}
case 5:
@@ -1558,7 +1558,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(6), 1500);
_movieTask = ThreadPool.schedule(new Movie(6), 1500);
break;
}
case 6:
@@ -1577,7 +1577,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(7), 1);
_movieTask = ThreadPool.schedule(new Movie(7), 1);
break;
}
case 7:
@@ -1596,7 +1596,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(8), 1500);
_movieTask = ThreadPool.schedule(new Movie(8), 1500);
break;
}
case 8:
@@ -1615,7 +1615,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(9), 1);
_movieTask = ThreadPool.schedule(new Movie(9), 1);
break;
}
case 9:
@@ -1634,7 +1634,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(10), 1500);
_movieTask = ThreadPool.schedule(new Movie(10), 1500);
break;
}
case 10:
@@ -1653,7 +1653,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(11), 1);
_movieTask = ThreadPool.schedule(new Movie(11), 1);
break;
}
case 11:
@@ -1672,7 +1672,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(12), 2000);
_movieTask = ThreadPool.schedule(new Movie(12), 2000);
break;
}
case 12:
@@ -1691,7 +1691,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(13), 1000);
_movieTask = ThreadPool.schedule(new Movie(13), 1000);
break;
}
case 13:
@@ -1709,7 +1709,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(14), 4700);
_movieTask = ThreadPool.schedule(new Movie(14), 4700);
break;
}
case 14:
@@ -1722,7 +1722,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(15), 4300);
_movieTask = ThreadPool.schedule(new Movie(15), 4300);
break;
}
case 15:
@@ -1743,7 +1743,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(16), 2000);
_movieTask = ThreadPool.schedule(new Movie(16), 2000);
break;
}
case 16:
@@ -1762,7 +1762,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(17), 6000);
_movieTask = ThreadPool.schedule(new Movie(17), 6000);
break;
}
case 17:
@@ -1776,7 +1776,7 @@ public class VanHalter extends Quest
_movieTask.cancel(false);
}
_movieTask = null;
_movieTask = ThreadPoolManager.schedule(new Movie(18), 1000);
_movieTask = ThreadPool.schedule(new Movie(18), 1000);
break;
}
case 18:

6
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java vendored
View File

@@ -19,7 +19,7 @@ package ai.bosses;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPoolManager;
import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.ai.CtrlIntention;
@@ -130,7 +130,7 @@ public class Zaken extends Quest
super(questId, name, descr);
// Zaken doors handling
ThreadPoolManager.scheduleAtFixedRate(() ->
ThreadPool.scheduleAtFixedRate(() ->
{
try
{
@@ -138,7 +138,7 @@ public class Zaken extends Quest
{
LOGGER.info("Zaken door id 21240006 opened, game time 00.00.");
DoorTable.getInstance().getDoor(21240006).openMe();
ThreadPoolManager.schedule(() ->
ThreadPool.schedule(() ->
{
try
{