From d2deb75d853da1b90045755f1baab51b25d22a27 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 23 Aug 2019 17:09:37 +0000 Subject: [PATCH] Removed thread package. --- .../util}/DeadlockDetector.java | 4 +-- .../org/l2jmobius/gameserver/GameServer.java | 6 ++--- .../daemons => }/ItemsAutoDestroy.java | 2 +- .../{thread => }/LoginServerThread.java | 3 +-- .../org/l2jmobius/gameserver/Shutdown.java | 1 - .../datatables/OfflineTradeTable.java | 2 +- .../admincommandhandlers/AdminBan.java | 2 +- .../admincommandhandlers/AdminLogin.java | 2 +- .../admincommandhandlers/AdminMenu.java | 2 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/actor/instance/PlayerInstance.java | 4 +-- .../entity/event}/PcPoint.java | 2 +- .../gameserver/network/GameClient.java | 4 +-- .../network/clientpackets/AuthLogin.java | 4 +-- .../network/clientpackets/EnterWorld.java | 6 ----- .../RequestMoveToLocationInVehicle.java | 6 ----- .../clientpackets/RequestRecordInfo.java | 10 ------- .../GameServerBasePacket.java | 7 ----- .../gameserverpackets/PlayerAuthRequest.java | 2 +- .../LoginServerBasePacket.java | 7 ----- .../gameserver/thread/TaskPriority.java | 27 ------------------- .../l2jmobius/telnet/GameStatusThread.java | 2 +- 23 files changed, 20 insertions(+), 89 deletions(-) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/{gameserver/thread/daemons => commons/util}/DeadlockDetector.java (96%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{thread/daemons => }/ItemsAutoDestroy.java (98%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{thread => }/LoginServerThread.java (99%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/{thread/daemons => model/entity/event}/PcPoint.java (97%) delete mode 100644 L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/TaskPriority.java diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/DeadlockDetector.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/DeadlockDetector.java similarity index 96% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/DeadlockDetector.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/DeadlockDetector.java index 90c6104205..53b98b0963 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/DeadlockDetector.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/DeadlockDetector.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java index a9452f17ac..386728ec30 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java @@ -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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ItemsAutoDestroy.java similarity index 98% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ItemsAutoDestroy.java index e986679396..206a9085dd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ItemsAutoDestroy.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.thread.daemons; +package org.l2jmobius.gameserver; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/LoginServerThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java similarity index 99% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/LoginServerThread.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java index 42097e386d..945e794a14 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/LoginServerThread.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/LoginServerThread.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java index 548d97794f..8684d034d6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java @@ -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.
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/OfflineTradeTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/OfflineTradeTable.java index 8db669283b..71e4ff10cd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/OfflineTradeTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/OfflineTradeTable.java @@ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminBan.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminBan.java index 56b3999029..d4d6ea330b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminBan.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminBan.java @@ -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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminLogin.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminLogin.java index a798d27ec9..d4ae9b324d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminLogin.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminLogin.java @@ -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; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMenu.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMenu.java index f59e0def44..d9559bd96e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMenu.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMenu.java @@ -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; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 291a29b828..6277d26ffb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 2192a8982b..aaa28bf804 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -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; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 4e327eb621..ecba29cfe9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/PcPoint.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/PcPoint.java similarity index 97% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/PcPoint.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/PcPoint.java index 088bf20d3c..0e3815b696 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/PcPoint.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/PcPoint.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.thread.daemons; +package org.l2jmobius.gameserver.model.entity.event; import java.util.logging.Logger; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java index 9e63b403c7..d41196b1f4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java @@ -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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 61df60cadf..f095416ec9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java @@ -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 { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 05fe7c7bd6..a8dd037234 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -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() { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 2b00b72a80..8d856ab967 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -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() { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java index 7ed8b09977..2b50d8726c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java @@ -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() { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/gameserverpackets/GameServerBasePacket.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/gameserverpackets/GameServerBasePacket.java index 8954164904..cbe59c7bb4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/gameserverpackets/GameServerBasePacket.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/gameserverpackets/GameServerBasePacket.java @@ -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; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/gameserverpackets/PlayerAuthRequest.java index 6b143a8407..83ba8f7428 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/gameserverpackets/PlayerAuthRequest.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/gameserverpackets/PlayerAuthRequest.java @@ -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- diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/loginserverpackets/LoginServerBasePacket.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/loginserverpackets/LoginServerBasePacket.java index f3600a1333..a6dce16653 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/loginserverpackets/LoginServerBasePacket.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/loginserverpackets/LoginServerBasePacket.java @@ -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; - } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/TaskPriority.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/TaskPriority.java deleted file mode 100644 index e584e0ebf5..0000000000 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/TaskPriority.java +++ /dev/null @@ -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 . - */ -package org.l2jmobius.gameserver.thread; - -/** - * @author mkizub - */ -public enum TaskPriority -{ - PR_NORMAL, - PR_HIGH, - PR_URGENT -} diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java index a905201ef4..afadfd4a4a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java @@ -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