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

GameTimeController class is a task manager.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-05-01 23:18:27 +00:00
parent 4669261eec
commit 6de03faace
647 changed files with 5966 additions and 5943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java vendored
View File

@@ -23,10 +23,10 @@ import java.util.concurrent.ScheduledFuture;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
import ai.AbstractNpcAI;
@@ -160,7 +160,7 @@ public class Parade extends AbstractNpcAI
private long timeLeftMilli(int hh, int mm, int ss)
{
final int now = (GameTimeController.getInstance().getGameTicks() * 60) / 100;
final int now = (GameTimeTaskManager.getInstance().getGameTicks() * 60) / 100;
int dd = ((hh * 3600) + (mm * 60) + ss) - (now % 86400);
if (dd < 0)
{

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java vendored
View File

@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.Map;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Location;
@@ -29,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.serverpackets.PlaySound;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
import ai.AbstractNpcAI;
@@ -285,7 +285,7 @@ public class TalentShow extends AbstractNpcAI
private void scheduleTimer()
{
final int gameTime = GameTimeController.getInstance().getGameTime();
final int gameTime = GameTimeTaskManager.getInstance().getGameTime();
final int hours = (gameTime / 60) % 24;
final int minutes = gameTime % 60;
int hourDiff;

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Shadai/Shadai.java vendored
View File

@@ -16,10 +16,10 @@
*/
package ai.areas.Hellbound.AI.NPC.Shadai;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
import ai.AbstractNpcAI;
@@ -47,12 +47,12 @@ public class Shadai extends AbstractNpcAI
{
Location coords = DAY_COORDS;
boolean mustRevalidate = false;
if ((npc.getX() != NIGHT_COORDS.getX()) && GameTimeController.getInstance().isNight())
if ((npc.getX() != NIGHT_COORDS.getX()) && GameTimeTaskManager.getInstance().isNight())
{
coords = NIGHT_COORDS;
mustRevalidate = true;
}
else if ((npc.getX() != DAY_COORDS.getX()) && !GameTimeController.getInstance().isNight())
else if ((npc.getX() != DAY_COORDS.getX()) && !GameTimeTaskManager.getInstance().isNight())
{
mustRevalidate = true;
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java vendored
View File

@@ -17,7 +17,6 @@
package ai.areas.SelMahumTrainingGrounds;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.ChatType;
@@ -28,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
import ai.AbstractNpcAI;
@@ -123,7 +123,7 @@ public class SelMahumSquad extends AbstractNpcAI
startQuestTimer("fire", 30000 + getRandom(5000), npc, null);
npc.setDisplayEffect(FIRE_EFFECT_NONE);
if (getRandom(GameTimeController.getInstance().isNight() ? 2 : 4) < 1)
if (getRandom(GameTimeTaskManager.getInstance().isNight() ? 2 : 4) < 1)
{
npc.setDisplayEffect(FIRE_EFFECT_BURN); // fire burns
npc.broadcastEvent("SCE_CAMPFIRE_START", 600, null);

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java vendored
View File

@@ -21,7 +21,6 @@ import java.util.Map;
import java.util.Map.Entry;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.actor.Npc;
@@ -29,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.siege.clanhalls.ClanHallSiegeEngine;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
/**
* Fortress of the Dead clan hall siege script.
@@ -151,7 +151,7 @@ public class FortressOfTheDead extends ClanHallSiegeEngine
public void startSiege()
{
// Siege must start at night
final int hoursLeft = (GameTimeController.getInstance().getGameTime() / 60) % 24;
final int hoursLeft = (GameTimeTaskManager.getInstance().getGameTime() / 60) % 24;
if ((hoursLeft < 0) || (hoursLeft > 6))
{
cancelSiegeTask();

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java vendored
View File

@@ -26,13 +26,13 @@ import java.util.concurrent.TimeUnit;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.xml.AdminData;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
/**
* @author St3eT
@@ -58,8 +58,8 @@ public class AdminServerInfo implements IAdminCommandHandler
html.replace("%os_name%", System.getProperty("os.name"));
html.replace("%os_ver%", System.getProperty("os.version"));
html.replace("%slots%", getPlayersCount("ALL") + "/" + Config.MAXIMUM_ONLINE_USERS);
html.replace("%gameTime%", GameTimeController.getInstance().getGameHour() + ":" + GameTimeController.getInstance().getGameMinute());
html.replace("%dayNight%", GameTimeController.getInstance().isNight() ? "Night" : "Day");
html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute());
html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day");
html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled");
html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis())));
html.replace("%serverUpTime%", getServerUpTime());

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java vendored
View File

@@ -19,12 +19,12 @@ package handlers.admincommandhandlers;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.Shutdown;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
import org.l2jmobius.gameserver.util.BuilderUtil;
import org.l2jmobius.gameserver.util.Util;
@@ -99,7 +99,7 @@ public class AdminShutdown implements IAdminCommandHandler
private void sendHtmlForm(PlayerInstance activeChar)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
final int t = GameTimeController.getInstance().getGameTime();
final int t = GameTimeTaskManager.getInstance().getGameTime();
final int h = t / 60;
final int m = t % 60;
final SimpleDateFormat format = new SimpleDateFormat("h:mm a");

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java vendored
View File

@@ -36,7 +36,6 @@ import java.util.logging.Logger;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.data.xml.AdminData;
import org.l2jmobius.gameserver.enums.ItemLocation;
@@ -49,6 +48,7 @@ import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket;
import org.l2jmobius.gameserver.network.telnet.ITelnetCommand;
import org.l2jmobius.gameserver.taskmanager.DecayTaskManager;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
import io.netty.channel.ChannelHandlerContext;
@@ -354,7 +354,7 @@ public class Debug implements ITelnetCommand
private static String gameTime()
{
final int t = GameTimeController.getInstance().getGameTime();
final int t = GameTimeTaskManager.getInstance().getGameTime();
final int h = t / 60;
final int m = t % 60;
final SimpleDateFormat format = new SimpleDateFormat("H:mm");

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Time.java vendored
View File

@@ -21,11 +21,11 @@ import java.util.Date;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.handler.IUserCommandHandler;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
/**
* Time user command.
@@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler
return false;
}
final int t = GameTimeController.getInstance().getGameTime();
final int t = GameTimeTaskManager.getInstance().getGameTime();
final String h = Integer.toString(((t / 60) % 24));
String m;
if ((t % 60) < 10)
@@ -60,7 +60,7 @@ public class Time implements IUserCommandHandler
}
SystemMessage sm;
if (GameTimeController.getInstance().isNight())
if (GameTimeTaskManager.getInstance().isNight())
{
sm = new SystemMessage(SystemMessageId.THE_CURRENT_TIME_IS_S1_S2_2);
sm.addString(h);

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java vendored
View File

@@ -18,7 +18,6 @@ package handlers.usercommandhandlers;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
@@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import org.l2jmobius.gameserver.network.serverpackets.SetupGauge;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
import org.l2jmobius.gameserver.util.Broadcast;
/**
@@ -75,7 +75,7 @@ public class Unstuck implements IUserCommandHandler
return false;
}
player.forceIsCasting(GameTimeController.getInstance().getGameTicks() + (unstuckTimer / GameTimeController.MILLIS_IN_TICK));
player.forceIsCasting(GameTimeTaskManager.getInstance().getGameTicks() + (unstuckTimer / GameTimeTaskManager.MILLIS_IN_TICK));
final Skill escape = SkillData.getInstance().getSkill(2099, 1); // 5 minutes escape
final Skill gmEscape = SkillData.getInstance().getSkill(2100, 1); // 1 second escape

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java vendored
View File

@@ -25,7 +25,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.PlayerAction;
@@ -46,6 +45,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import org.l2jmobius.gameserver.network.serverpackets.SetupGauge;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
import org.l2jmobius.gameserver.util.Broadcast;
/**
@@ -464,7 +464,7 @@ public class Wedding implements IVoicedCommandHandler
final EscapeFinalizer ef = new EscapeFinalizer(activeChar, partner.getLocation(), partner.isIn7sDungeon());
// continue execution later
activeChar.setSkillCast(ThreadPool.schedule(ef, teleportTimer));
activeChar.forceIsCasting(GameTimeController.getInstance().getGameTicks() + (teleportTimer / GameTimeController.MILLIS_IN_TICK));
activeChar.forceIsCasting(GameTimeTaskManager.getInstance().getGameTicks() + (teleportTimer / GameTimeTaskManager.MILLIS_IN_TICK));
return true;
}