ThreadPool manager rework.

This commit is contained in:
MobiusDev
2017-08-23 05:23:31 +00:00
parent 374c53df4b
commit b77de360af
718 changed files with 3180 additions and 7193 deletions

View File

@@ -76,7 +76,7 @@ public final class Chimeras extends AbstractNpcAI
if (!npc.isInsideRadius(loc, 200, false, false))
{
npc.getSpawn().setLocation(loc);
ThreadPoolManager.getInstance().scheduleGeneral(new Teleport(npc, loc), 100);
ThreadPoolManager.schedule(new Teleport(npc, loc), 100);
}
}
return super.onSpawn(npc);

View File

@@ -557,7 +557,7 @@ public final class TowerOfNaia extends AbstractNpcAI
{
removeForeigners(npcId, party);
startRoom(npcId);
ThreadPoolManager.getInstance().scheduleGeneral(new StopRoomTask(npcId), 300000);
ThreadPoolManager.schedule(new StopRoomTask(npcId), 300000);
}
else
{
@@ -847,7 +847,7 @@ public final class TowerOfNaia extends AbstractNpcAI
}
else
{
ThreadPoolManager.getInstance().scheduleGeneral(() -> addSpawn(MUTATED_ELPY, -45474, 247450, -13994, 49152, false, 0, false), respawnTime - System.currentTimeMillis());
ThreadPoolManager.schedule(() -> addSpawn(MUTATED_ELPY, -45474, 247450, -13994, 49152, false, 0, false), respawnTime - System.currentTimeMillis());
}
}

View File

@@ -1207,7 +1207,7 @@ public final class TullyWorkshop extends AbstractNpcAI
DoorData.getInstance().getDoor(19260052).openMe();
countdownTime = 600000;
_countdown = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(() ->
_countdown = ThreadPoolManager.scheduleAtFixedRate(() ->
{
countdownTime -= 10000;
L2Npc _npc = null;
@@ -1570,20 +1570,20 @@ public final class TullyWorkshop extends AbstractNpcAI
{
DoorData.getInstance().getDoor(20250005).openMe();
DoorData.getInstance().getDoor(20250004).openMe();
ThreadPoolManager.getInstance().scheduleGeneral(new DoorTask(new int[]
ThreadPoolManager.schedule(new DoorTask(new int[]
{
20250006,
20250007
}, STATE_OPEN), 2000);
ThreadPoolManager.getInstance().scheduleGeneral(new DoorTask(new int[]
ThreadPoolManager.schedule(new DoorTask(new int[]
{
20250778
}, STATE_CLOSE), 3000);
ThreadPoolManager.getInstance().scheduleGeneral(new DoorTask(new int[]
ThreadPoolManager.schedule(new DoorTask(new int[]
{
20250777
}, STATE_CLOSE), 6000);
ThreadPoolManager.getInstance().scheduleGeneral(new DoorTask(new int[]
ThreadPoolManager.schedule(new DoorTask(new int[]
{
20250009,
20250008
@@ -1594,12 +1594,12 @@ public final class TullyWorkshop extends AbstractNpcAI
{
DoorData.getInstance().getDoor(20250009).closeMe();
DoorData.getInstance().getDoor(20250008).closeMe();
ThreadPoolManager.getInstance().scheduleGeneral(new DoorTask(new int[]
ThreadPoolManager.schedule(new DoorTask(new int[]
{
20250777,
20250778
}, STATE_OPEN), 1000);
ThreadPoolManager.getInstance().scheduleGeneral(new DoorTask(new int[]
ThreadPoolManager.schedule(new DoorTask(new int[]
{
20250005,
20250004,

View File

@@ -167,7 +167,7 @@ public final class UrbanArea extends AbstractInstance
final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId());
inst.setDuration(5 * 60000);
inst.setEmptyDestroyTime(0);
ThreadPoolManager.getInstance().scheduleGeneral(new ExitInstance(party, world), 285000);
ThreadPoolManager.schedule(new ExitInstance(party, world), 285000);
htmltext = "32343-02d.htm";
}
}
@@ -221,7 +221,7 @@ public final class UrbanArea extends AbstractInstance
world.activeAmaskariCall.cancel(true);
}
world.activeAmaskariCall = ThreadPoolManager.getInstance().scheduleGeneral(new CallAmaskari(npc), 25000);
world.activeAmaskariCall = ThreadPoolManager.schedule(new CallAmaskari(npc), 25000);
}
}
}
@@ -267,7 +267,7 @@ public final class UrbanArea extends AbstractInstance
{
world.activeAmaskariCall.cancel(true);
}
world.activeAmaskariCall = ThreadPoolManager.getInstance().scheduleGeneral(new CallAmaskari(npc), 25000);
world.activeAmaskariCall = ThreadPoolManager.schedule(new CallAmaskari(npc), 25000);
}
}
}
@@ -313,7 +313,7 @@ public final class UrbanArea extends AbstractInstance
{
world.activeAmaskariCall.cancel(true);
}
world.activeAmaskariCall = ThreadPoolManager.getInstance().scheduleGeneral(new CallAmaskari(npc), 25000);
world.activeAmaskariCall = ThreadPoolManager.schedule(new CallAmaskari(npc), 25000);
}
}
}