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

Removed thread package.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-08-23 17:09:37 +00:00
parent d60dd8338f
commit d2deb75d85
23 changed files with 20 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/DeadlockDetector.java → L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/DeadlockDetector.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.thread.daemons;
package org.l2jmobius.commons.util;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
@ -23,8 +23,6 @@ import java.util.List;
import java.util.Set;
import java.util.logging.Logger;
import org.l2jmobius.commons.util.Util;
/**
* @author ProGramMoS
* @version 0.4 Stable

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java
View File

@ -35,6 +35,7 @@ import org.l2jmobius.commons.enums.ServerMode;
import org.l2jmobius.commons.mmocore.NetcoreConfig;
import org.l2jmobius.commons.mmocore.SelectorConfig;
import org.l2jmobius.commons.mmocore.SelectorThread;
import org.l2jmobius.commons.util.DeadlockDetector;
import org.l2jmobius.commons.util.IPv4Filter;
import org.l2jmobius.commons.util.Util;
import org.l2jmobius.gameserver.cache.CrestCache;
@ -118,6 +119,7 @@ import org.l2jmobius.gameserver.model.entity.Announcements;
import org.l2jmobius.gameserver.model.entity.Hero;
import org.l2jmobius.gameserver.model.entity.MonsterRace;
import org.l2jmobius.gameserver.model.entity.event.Lottery;
import org.l2jmobius.gameserver.model.entity.event.PcPoint;
import org.l2jmobius.gameserver.model.entity.event.manager.EventManager;
import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad;
import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns;
@ -133,10 +135,6 @@ import org.l2jmobius.gameserver.script.EventDroplist;
import org.l2jmobius.gameserver.script.faenor.FaenorScriptEngine;
import org.l2jmobius.gameserver.scripting.ScriptEngineManager;
import org.l2jmobius.gameserver.taskmanager.TaskManager;
import org.l2jmobius.gameserver.thread.LoginServerThread;
import org.l2jmobius.gameserver.thread.daemons.DeadlockDetector;
import org.l2jmobius.gameserver.thread.daemons.ItemsAutoDestroy;
import org.l2jmobius.gameserver.thread.daemons.PcPoint;
import org.l2jmobius.gameserver.ui.Gui;
import org.l2jmobius.telnet.TelnetStatusThread;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java → L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ItemsAutoDestroy.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.thread.daemons;
package org.l2jmobius.gameserver;
import java.util.Collection;
import java.util.concurrent.ConcurrentHashMap;

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/LoginServerThread.java → L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.thread;
package org.l2jmobius.gameserver;
import java.io.BufferedOutputStream;
import java.io.IOException;
@ -37,7 +37,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.crypt.NewCrypt;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.GameClient;

1
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
View File

@ -42,7 +42,6 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.gameserverpackets.ServerStatus;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.thread.LoginServerThread;
/**
* This class provides the functions for shutting down and restarting the server.<br>

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/OfflineTradeTable.java
View File

@ -24,6 +24,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.instancemanager.PlayerCountManager;
import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.ManufactureList;
@ -33,7 +34,6 @@ import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.GameClient.GameClientState;
import org.l2jmobius.gameserver.thread.LoginServerThread;
/**
* @author Shyla

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminBan.java
View File

@ -23,12 +23,12 @@ import java.util.StringTokenizer;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.LoginServerThread;
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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
import org.l2jmobius.gameserver.thread.LoginServerThread;
import org.l2jmobius.gameserver.util.BuilderUtil;
import org.l2jmobius.gameserver.util.GMAudit;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminLogin.java
View File

@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers;
import java.util.StringTokenizer;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.gameserverpackets.ServerStatus;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.thread.LoginServerThread;
import org.l2jmobius.gameserver.util.BuilderUtil;
/**

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMenu.java
View File

@ -24,6 +24,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
@ -32,7 +33,6 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.thread.LoginServerThread;
import org.l2jmobius.gameserver.util.BuilderUtil;
/**

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java
View File

@ -27,11 +27,11 @@ 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.ItemsAutoDestroy;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.ItemInstance;
import org.l2jmobius.gameserver.model.items.type.EtcItemType;
import org.l2jmobius.gameserver.thread.daemons.ItemsAutoDestroy;
/**
* This class manage all items on ground

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.ai.AttackableAI;
import org.l2jmobius.gameserver.ai.CreatureAI;
import org.l2jmobius.gameserver.ai.CtrlEvent;
@ -64,7 +65,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.script.EventDroplist;
import org.l2jmobius.gameserver.script.EventDroplist.DateDrop;
import org.l2jmobius.gameserver.skills.Stats;
import org.l2jmobius.gameserver.thread.daemons.ItemsAutoDestroy;
import org.l2jmobius.gameserver.util.Util;
/**

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -41,6 +41,8 @@ import org.l2jmobius.commons.crypt.nProtect;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.RecipeController;
import org.l2jmobius.gameserver.ai.CreatureAI;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@ -223,8 +225,6 @@ import org.l2jmobius.gameserver.skills.Formulas;
import org.l2jmobius.gameserver.skills.Stats;
import org.l2jmobius.gameserver.skills.effects.EffectCharge;
import org.l2jmobius.gameserver.skills.handlers.SkillSummon;
import org.l2jmobius.gameserver.thread.LoginServerThread;
import org.l2jmobius.gameserver.thread.daemons.ItemsAutoDestroy;
import org.l2jmobius.gameserver.util.Broadcast;
import org.l2jmobius.gameserver.util.FloodProtectors;
import org.l2jmobius.gameserver.util.IllegalPlayerAction;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/PcPoint.java → L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/PcPoint.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.thread.daemons;
package org.l2jmobius.gameserver.model.entity.event;
import java.util.logging.Logger;

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java
View File

@ -38,6 +38,8 @@ import org.l2jmobius.commons.mmocore.MMOClient;
import org.l2jmobius.commons.mmocore.MMOConnection;
import org.l2jmobius.commons.mmocore.NetcoreConfig;
import org.l2jmobius.commons.mmocore.ReceivablePacket;
import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.LoginServerThread.SessionKey;
import org.l2jmobius.gameserver.datatables.OfflineTradeTable;
import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.datatables.sql.ClanTable;
@ -58,8 +60,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.GameServerPacket;
import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.network.serverpackets.ServerClose;
import org.l2jmobius.gameserver.thread.LoginServerThread;
import org.l2jmobius.gameserver.thread.LoginServerThread.SessionKey;
import org.l2jmobius.gameserver.util.EventData;
import org.l2jmobius.gameserver.util.FloodProtectors;

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java
View File

@ -16,9 +16,9 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.LoginServerThread.SessionKey;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.thread.LoginServerThread;
import org.l2jmobius.gameserver.thread.LoginServerThread.SessionKey;
public class AuthLogin extends GameClientPacket
{

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -95,7 +95,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.SignsSky;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
import org.l2jmobius.gameserver.thread.TaskPriority;
import org.l2jmobius.gameserver.util.BuilderUtil;
import org.l2jmobius.gameserver.util.Util;
@ -110,11 +109,6 @@ public class EnterWorld extends GameClientPacket
private long _daysleft;
SimpleDateFormat df = new SimpleDateFormat("dd MM yyyy");
public TaskPriority getPriority()
{
return TaskPriority.PR_URGENT;
}
@Override
protected void readImpl()
{

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
View File

@ -23,7 +23,6 @@ import org.l2jmobius.gameserver.model.actor.instance.BoatInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.items.type.WeaponType;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.thread.TaskPriority;
public class RequestMoveToLocationInVehicle extends GameClientPacket
{
@ -31,11 +30,6 @@ public class RequestMoveToLocationInVehicle extends GameClientPacket
private final Location _origin_pos = new Location(0, 0, 0);
private int _boatId;
public TaskPriority getPriority()
{
return TaskPriority.PR_HIGH;
}
@Override
protected void readImpl()
{

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
View File

@ -39,19 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SpawnItemPoly;
import org.l2jmobius.gameserver.network.serverpackets.StaticObject;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
import org.l2jmobius.gameserver.network.serverpackets.VehicleInfo;
import org.l2jmobius.gameserver.thread.TaskPriority;
public class RequestRecordInfo extends GameClientPacket
{
/**
* urgent messages, execute immediately
* @return
*/
public TaskPriority getPriority()
{
return TaskPriority.PR_NORMAL;
}
@Override
protected void readImpl()
{

7
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/gameserverpackets/GameServerBasePacket.java
View File

@ -19,8 +19,6 @@ package org.l2jmobius.gameserver.network.gameserverpackets;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.l2jmobius.gameserver.thread.TaskPriority;
/**
* @author -Wooden-
*/
@ -117,10 +115,5 @@ public abstract class GameServerBasePacket
return _bao.toByteArray();
}
public TaskPriority getPriority()
{
return TaskPriority.PR_HIGH;
}
public abstract byte[] getContent() throws IOException;
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/gameserverpackets/PlayerAuthRequest.java
View File

@ -16,7 +16,7 @@
*/
package org.l2jmobius.gameserver.network.gameserverpackets;
import org.l2jmobius.gameserver.thread.LoginServerThread.SessionKey;
import org.l2jmobius.gameserver.LoginServerThread.SessionKey;
/**
* @author -Wooden-

7
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/loginserverpackets/LoginServerBasePacket.java
View File

@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.network.loginserverpackets;
import org.l2jmobius.gameserver.thread.TaskPriority;
/**
* @author -Wooden-
*/
@ -93,9 +91,4 @@ public abstract class LoginServerBasePacket
_off += length;
return result;
}
public TaskPriority getPriority()
{
return TaskPriority.PR_HIGH;
}
}

27
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/TaskPriority.java
View File

@ -1,27 +0,0 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.thread;
/**
* @author mkizub
*/
public enum TaskPriority
{
PR_NORMAL,
PR_HIGH,
PR_URGENT
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java
View File

@ -47,6 +47,7 @@ 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.LoginServerThread;
import org.l2jmobius.gameserver.Shutdown;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.datatables.SkillTable;
@ -81,7 +82,6 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
import org.l2jmobius.gameserver.taskmanager.DecayTaskManager;
import org.l2jmobius.gameserver.thread.LoginServerThread;
import org.l2jmobius.gameserver.util.GMAudit;
public class GameStatusThread extends Thread