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

ThreadPool manager rework.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java vendored
View File

@@ -159,7 +159,7 @@ public final class FortressOfTheDead extends ClanHallSiegeEngine
{
cancelSiegeTask();
final long scheduleTime = (24 - hoursLeft) * 10 * 60000;
_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStarts(), scheduleTime);
_siegeTask = ThreadPoolManager.schedule(new SiegeStarts(), scheduleTime);
}
else
{

18
L2J_Mobius_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java vendored
View File

@@ -116,7 +116,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
if (_acceptedClans.size() >= 2)
{
_nextSiege = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStart(), 3600000);
_nextSiege = ThreadPoolManager.schedule(new SiegeStart(), 3600000);
_rainbow.updateSiegeStatus(SiegeStatus.WAITING_BATTLE);
}
else
@@ -140,7 +140,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
// XXX _rainbow.siegeStarts();
spawnGourds();
_siegeEnd = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeEnd(null), _rainbow.getSiegeLenght() - 120000);
_siegeEnd = ThreadPoolManager.schedule(new SiegeEnd(null), _rainbow.getSiegeLenght() - 120000);
}
}
@@ -178,10 +178,10 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
// XXX _rainbow.siegeEnds();
ThreadPoolManager.getInstance().scheduleGeneral(new SetFinalAttackers(), _rainbow.getNextSiegeTime());
ThreadPoolManager.schedule(new SetFinalAttackers(), _rainbow.getNextSiegeTime());
setRegistrationEndString((_rainbow.getNextSiegeTime() + System.currentTimeMillis()) - 3600000);
// Teleport out of the arenas is made 2 mins after game ends
ThreadPoolManager.getInstance().scheduleGeneral(new TeleportBack(), 120000);
ThreadPoolManager.schedule(new TeleportBack(), 120000);
}
}
@@ -287,7 +287,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
if (delay > -1)
{
setRegistrationEndString(delay - 3600000);
_nextSiege = ThreadPoolManager.getInstance().scheduleGeneral(new SetFinalAttackers(), delay);
_nextSiege = ThreadPoolManager.schedule(new SetFinalAttackers(), delay);
}
else
{
@@ -616,7 +616,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
{
_siegeEnd.cancel(false);
}
ThreadPoolManager.getInstance().executeGeneral(new SiegeEnd(clan));
ThreadPoolManager.execute(new SiegeEnd(clan));
}
}
@@ -896,7 +896,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
public static void launchSiege()
{
_nextSiege.cancel(false);
ThreadPoolManager.getInstance().executeGeneral(new SiegeStart());
ThreadPoolManager.execute(new SiegeStart());
}
@Override
@@ -906,7 +906,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
{
_siegeEnd.cancel(false);
}
ThreadPoolManager.getInstance().executeGeneral(new SiegeEnd(null));
ThreadPoolManager.execute(new SiegeEnd(null));
}
public static void updateAdminDate(long date)
@@ -923,7 +923,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
date -= 3600000;
setRegistrationEndString(date);
_nextSiege = ThreadPoolManager.getInstance().scheduleGeneral(new SetFinalAttackers(), _rainbow.getNextSiegeTime());
_nextSiege = ThreadPoolManager.schedule(new SetFinalAttackers(), _rainbow.getNextSiegeTime());
}
public static void main(String[] args)

6
L2J_Mobius_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java vendored
View File

@@ -402,7 +402,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
doUnSpawns(data);
}
ThreadPoolManager.getInstance().scheduleGeneral(() ->
ThreadPoolManager.schedule(() ->
{
for (int doorId : INNER_DOORS_TO_OPEN)
{
@@ -457,7 +457,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
Broadcast.toAllOnlinePlayers(msg);
_hall.updateSiegeStatus(SiegeStatus.WAITING_BATTLE);
_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStarts(), 3600000);
_siegeTask = ThreadPoolManager.schedule(new SiegeStarts(), 3600000);
}
@Override
@@ -499,7 +499,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
}
// Schedule open doors closement and siege start in 2 minutes
ThreadPoolManager.getInstance().scheduleGeneral(new CloseOutterDoorsTask(this), 300000);
ThreadPoolManager.schedule(new CloseOutterDoorsTask(this), 300000);
}
/**