GameTimeController class is a task manager.

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

View File

@@ -19,13 +19,13 @@ package ai.others.Spawns;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.model.events.EventType;
import org.l2jmobius.gameserver.model.events.ListenerRegisterType;
import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
import org.l2jmobius.gameserver.model.events.annotations.RegisterType;
import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange;
import org.l2jmobius.gameserver.model.spawns.SpawnTemplate;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
import ai.AbstractNpcAI;
@@ -47,7 +47,7 @@ public class DayNightSpawns extends AbstractNpcAI
{
if (_templates.add(template))
{
manageSpawns(template, GameTimeController.getInstance().isNight());
manageSpawns(template, GameTimeTaskManager.getInstance().isNight());
}
}

View File

@@ -18,7 +18,6 @@ package ai.others.Spawns;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange;
import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate;
import org.l2jmobius.gameserver.model.spawns.SpawnGroup;
import org.l2jmobius.gameserver.model.spawns.SpawnTemplate;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
import ai.AbstractNpcAI;
@@ -97,7 +97,7 @@ public class EilhalderVonHellmann extends AbstractNpcAI
}
}
handleBoss(GameTimeController.getInstance().isNight());
handleBoss(GameTimeTaskManager.getInstance().isNight());
}
@RegisterEvent(EventType.ON_DAY_NIGHT_CHANGE)

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());

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(0, 1);
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");

View File

@@ -16,12 +16,12 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
/**
* @author Mobius
@@ -36,12 +36,12 @@ public class HitAtNight extends AbstractStatEffect
@Override
public void onStart(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
GameTimeController.getInstance().addShadowSenseCharacter(effected);
GameTimeTaskManager.getInstance().addShadowSenseCharacter(effected);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
GameTimeController.getInstance().removeShadowSenseCharacter(effected);
GameTimeTaskManager.getInstance().removeShadowSenseCharacter(effected);
}
}

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");

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);