diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java index 6cfe224d2b..4305e3b463 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.BuyList; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/Announcements.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/Announcements.java index 098dd36415..8d6f4a76f0 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/Announcements.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/Announcements.java @@ -17,12 +17,12 @@ */ package org.l2jmobius.gameserver; -import java.io.BufferedReader; import java.io.File; +import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.io.InputStreamReader; import java.io.LineNumberReader; import java.util.ArrayList; import java.util.List; @@ -59,14 +59,7 @@ public class Announcements File file = new File("data/announcements.txt"); if (file.exists()) { - try - { - readFromDisk(file); - } - catch (IOException e) - { - e.printStackTrace(); - } + readFromDisk(file); } else { @@ -118,15 +111,14 @@ public class Announcements saveToDisk(); } - private void readFromDisk(File file) throws IOException + private void readFromDisk(File file) { - BufferedReader lnr = null; int i = 0; String line = null; try { - lnr = new LineNumberReader(new FileReader(file)); - while ((line = ((LineNumberReader) lnr).readLine()) != null) + LineNumberReader lnr = new LineNumberReader(new InputStreamReader(new FileInputStream(file))); + while ((line = lnr.readLine()) != null) { StringTokenizer st = new StringTokenizer(line, "\n\r"); if (!st.hasMoreTokens()) @@ -139,80 +131,32 @@ public class Announcements } _log.config("Loaded " + i + " announcements."); lnr.close(); - return; } catch (FileNotFoundException e) { - try - { - if (lnr != null) - { - lnr.close(); - } - return; - } - catch (IOException e1) - { - try - { - e1.printStackTrace(); - } - catch (Throwable throwable) - { - try - { - lnr.close(); - throw throwable; - } - catch (Exception e2) - { - // empty catch block - } - throw throwable; - } - try - { - lnr.close(); - return; - } - catch (Exception e2) - { - return; - } - } + _log.warning("File announcements.txt does not exist."); + } + catch (Exception e) + { + _log.warning("There was a problem loading annoucements."); } } private void saveToDisk() { - File file = new File("data/announcements.txt"); - FileWriter save = null; try { - save = new FileWriter(file); + FileWriter save = new FileWriter(new File("data/announcements.txt")); for (int i = 0; i < _announcements.size(); ++i) { save.write(_announcements.get(i).toString()); save.write("\r\n"); } + save.close(); } catch (IOException e) { _log.warning("Saving the announcements file has failed: " + e); - e.printStackTrace(); - } - finally - { - try - { - if (save != null) - { - save.close(); - } - } - catch (Exception e1) - { - } } } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameServer.java index fa848846de..c0562c40a2 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameServer.java @@ -49,7 +49,9 @@ import org.l2jmobius.gameserver.handler.itemhandlers.SoulShots; import org.l2jmobius.gameserver.handler.itemhandlers.WorldMap; import org.l2jmobius.gameserver.handler.skillhandlers.DamageSkill; import org.l2jmobius.gameserver.handler.skillhandlers.HealSkill; +import org.l2jmobius.gameserver.managers.GmListManager; import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.loginserver.LoginController; public class GameServer extends Thread @@ -81,7 +83,7 @@ public class GameServer extends Thread protected final Announcements _announcements; protected final MapRegionTable _mapRegions; protected final PriceListTable _pricelist; - protected final GmListTable _gmList; + protected final GmListManager _gmList; public static void main(String[] args) throws Exception { @@ -185,6 +187,6 @@ public class GameServer extends Thread _skillHandler = SkillHandler.getInstance(); _skillHandler.registerSkillHandler(new HealSkill()); _skillHandler.registerSkillHandler(new DamageSkill()); - _gmList = GmListTable.getInstance(); + _gmList = GmListManager.getInstance(); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/CommunityBoard.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/CommunityBoardManager.java similarity index 96% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/CommunityBoard.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/CommunityBoardManager.java index 9580fe6ab7..9346a83efb 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/CommunityBoard.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/CommunityBoardManager.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.gameserver; +package org.l2jmobius.gameserver.managers; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -23,24 +23,26 @@ import java.util.Collection; import java.util.StringTokenizer; import org.l2jmobius.Config; +import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.data.CharTemplateTable; import org.l2jmobius.gameserver.data.ExperienceTable; import org.l2jmobius.gameserver.model.Clan; import org.l2jmobius.gameserver.model.ClanMember; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.ShowBoard; -public class CommunityBoard +public class CommunityBoardManager { - private static CommunityBoard _instance; + private static CommunityBoardManager _instance; - public static CommunityBoard getInstance() + public static CommunityBoardManager getInstance() { if (_instance == null) { - _instance = new CommunityBoard(); + _instance = new CommunityBoardManager(); } return _instance; } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GmListTable.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/GmListManager.java similarity index 87% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GmListTable.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/GmListManager.java index dcd8b3eef8..dc26cf9f61 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GmListTable.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/GmListManager.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.gameserver; +package org.l2jmobius.gameserver.managers; import java.util.ArrayList; import java.util.List; @@ -25,22 +25,22 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.serverpackets.ServerBasePacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -public class GmListTable +public class GmListManager { - private static Logger _log = Logger.getLogger(GmListTable.class.getName()); - private static GmListTable _instance; + private static Logger _log = Logger.getLogger(GmListManager.class.getName()); + private static GmListManager _instance; private final List _gmList = new ArrayList<>(); - public static GmListTable getInstance() + public static GmListManager getInstance() { if (_instance == null) { - _instance = new GmListTable(); + _instance = new GmListManager(); } return _instance; } - private GmListTable() + private GmListManager() { } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/PlayerCountManager.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/PlayerCountManager.java similarity index 93% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/PlayerCountManager.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/PlayerCountManager.java index 80e6a4119c..9178299125 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/PlayerCountManager.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/PlayerCountManager.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; +package org.l2jmobius.gameserver.managers; /** * @author Mobius diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java index 89b66e162c..0f6ad68dbe 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.PlayerCountManager; +import org.l2jmobius.gameserver.managers.PlayerCountManager; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java index a656071c5c..baf6d4408e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java @@ -21,8 +21,8 @@ import java.io.Serializable; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class WorldObject implements Serializable diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java index a66aa3c99e..c87397a9f4 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java @@ -23,10 +23,10 @@ import java.util.Timer; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ChangeMoveType; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 66d5e38d17..d2013d2faa 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -26,8 +26,6 @@ import java.util.TimerTask; import java.util.TreeMap; import java.util.logging.Logger; -import org.l2jmobius.gameserver.Connection; -import org.l2jmobius.gameserver.GmListTable; import org.l2jmobius.gameserver.data.CharStatsTable; import org.l2jmobius.gameserver.data.CharTemplateTable; import org.l2jmobius.gameserver.data.ExperienceTable; @@ -36,6 +34,7 @@ import org.l2jmobius.gameserver.data.LevelUpData; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.handler.SkillHandler; +import org.l2jmobius.gameserver.managers.GmListManager; import org.l2jmobius.gameserver.model.Clan; import org.l2jmobius.gameserver.model.Inventory; import org.l2jmobius.gameserver.model.LvlupData; @@ -49,6 +48,7 @@ import org.l2jmobius.gameserver.model.Warehouse; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; @@ -1014,7 +1014,7 @@ public class PlayerInstance extends Creature } if (isGM()) { - GmListTable.getInstance().deleteGm(this); + GmListManager.getInstance().deleteGm(this); } removeAllKnownObjects(); setNetConnection(null); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ClientThread.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java similarity index 99% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ClientThread.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java index 228617f60c..3dd5e25150 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ClientThread.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.gameserver; +package org.l2jmobius.gameserver.network; import java.io.BufferedReader; import java.io.File; @@ -30,6 +30,7 @@ import java.util.List; import java.util.StringTokenizer; import java.util.logging.Logger; +import org.l2jmobius.gameserver.IdFactory; import org.l2jmobius.gameserver.data.CharNameTable; import org.l2jmobius.gameserver.data.ClanTable; import org.l2jmobius.gameserver.data.ItemTable; @@ -40,7 +41,6 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.network.PacketHandler; import org.l2jmobius.gameserver.templates.Item; import org.l2jmobius.loginserver.LoginController; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/Connection.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/Connection.java similarity index 97% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/Connection.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/Connection.java index e7870324c8..5da25525e8 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/Connection.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/Connection.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.gameserver; +package org.l2jmobius.gameserver.network; import java.io.BufferedOutputStream; import java.io.IOException; @@ -58,7 +58,7 @@ public class Connection length = (lengthHi * 256) + lengthLo; if (lengthHi < 0) { - _log.warning("client terminated connection"); + // _log.warning("client terminated connection"); throw new IOException("EOF"); } byte[] incoming = new byte[length]; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/Crypt.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/Crypt.java similarity index 98% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/Crypt.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/Crypt.java index 0ab43b52f3..0a72ad86ac 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/Crypt.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/Crypt.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.gameserver; +package org.l2jmobius.gameserver.network; public class Crypt { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java index 1e19bbc127..0426b4ea8b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.network.clientpackets.Action; import org.l2jmobius.gameserver.network.clientpackets.AddTradeItem; import org.l2jmobius.gameserver.network.clientpackets.AnswerTradeRequest; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 57b1703696..f69bfb2ed3 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.logging.Logger; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class Action extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 5b4ac48651..119f556c60 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -17,10 +17,10 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.SendTradeDone; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java index a8b3b04161..902aedb30f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java @@ -17,9 +17,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.SendTradeDone; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.TradeStart; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java index 7b289e7abd..6b971edff0 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Appearing.java @@ -19,8 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; -import org.l2jmobius.gameserver.Connection; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -28,6 +26,8 @@ import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; +import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.SpawnItem; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java index c8ff268c62..f7e5bef687 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java @@ -17,10 +17,10 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class AttackRequest extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 2120e1f616..72d9049c39 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.AuthLoginFail; import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; import org.l2jmobius.loginserver.LoginController; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeMoveType2.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeMoveType2.java index 2df18b1703..afdd63a276 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeMoveType2.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeMoveType2.java @@ -17,7 +17,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ChangeMoveType; public class ChangeMoveType2 extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeWaitType2.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeWaitType2.java index 062114c250..9b92cbbe83 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeWaitType2.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ChangeWaitType2.java @@ -17,7 +17,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; public class ChangeWaitType2 extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 56143558f6..92939c536a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -20,7 +20,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.FileNotFoundException; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.IdFactory; import org.l2jmobius.gameserver.data.CharNameTable; import org.l2jmobius.gameserver.data.CharTemplateTable; @@ -31,6 +30,7 @@ import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index f04bb1a512..17f3d7b0a0 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; -import org.l2jmobius.gameserver.Connection; +import org.l2jmobius.gameserver.network.ClientThread; +import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java index 8a6ea65e4a..9303001bbb 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; public class CharacterRestore extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java index 36ae0c4575..42dabd1011 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; public class CharacterSelected extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index e8878d8f68..e9214815e5 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -20,13 +20,13 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; import org.l2jmobius.gameserver.Announcements; -import org.l2jmobius.gameserver.ClientThread; -import org.l2jmobius.gameserver.Connection; -import org.l2jmobius.gameserver.GmListTable; +import org.l2jmobius.gameserver.managers.GmListManager; import org.l2jmobius.gameserver.model.Clan; import org.l2jmobius.gameserver.model.ShortCut; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; +import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.Die; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; @@ -45,7 +45,7 @@ public class EnterWorld extends ClientBasePacket if (client.getAccessLevel() >= 100) { activeChar.setIsGM(true); - GmListTable.getInstance().addGm(activeChar); + GmListManager.getInstance().addGm(activeChar); } SystemMessage sm = new SystemMessage(34); con.sendPacket(sm); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/FinishRotating.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/FinishRotating.java index e31b539c43..5822ee2575 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/FinishRotating.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/FinishRotating.java @@ -17,7 +17,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.StopRotation; public class FinishRotating extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 3f9d53169a..704a096114 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; public class Logout extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index f3fc02941f..73a56ac04b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -17,8 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AttackCanceld; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java index 09bacf4eb8..5d757528e4 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/NewCharacter.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.data.CharTemplateTable; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CharTemplates; import org.l2jmobius.gameserver.templates.CharTemplate; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 480ab27e27..35125d580f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -20,8 +20,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.ClientThread; -import org.l2jmobius.gameserver.Connection; +import org.l2jmobius.gameserver.network.ClientThread; +import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.KeyPacket; public class ProtocolVersion extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index e70472f8ee..cd852c2c83 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -17,9 +17,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ChangeMoveType; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java index 20100e0392..f7b4161234 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java @@ -20,7 +20,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.File; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.AllyCrest; public class RequestAllyCrest extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java index 4d03b1d442..9bf09199e7 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java @@ -17,8 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.JoinParty; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java index 11e502cd7a..b73540ffed 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java @@ -17,9 +17,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.Clan; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; import org.l2jmobius.gameserver.network.serverpackets.JoinPledge; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java index 321a40561e..9a01227650 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java @@ -19,13 +19,13 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.SkillTreeTable; import org.l2jmobius.gameserver.model.ShortCut; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.AquireSkillList; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java index 0d5f831951..57af88a67f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java @@ -19,13 +19,13 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; -import org.l2jmobius.gameserver.Connection; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.SkillTreeTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; +import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.AquireSkillInfo; public class RequestAquireSkillInfo extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index 45099e2937..86f1ba45df 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -19,13 +19,13 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; -import org.l2jmobius.gameserver.Connection; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.TradeController; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; +import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 853e4f5d43..1792f5169a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.gameserver.AdminCommands; -import org.l2jmobius.gameserver.ClientThread; -import org.l2jmobius.gameserver.CommunityBoard; +import org.l2jmobius.gameserver.managers.CommunityBoardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.NpcInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; public class RequestBypassToServer extends ClientBasePacket { @@ -55,7 +55,7 @@ public class RequestBypassToServer extends ClientBasePacket } else if (command.startsWith("bbs_")) { - CommunityBoard.getInstance().handleCommands(client, command); + CommunityBoardManager.getInstance().handleCommands(client, command); } } catch (Exception e) diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java index d629e07bac..9a5fe33b82 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java @@ -17,7 +17,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.PetInfo; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 948ae1d871..5bbc7c4444 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -17,10 +17,10 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index b72d690282..f6a05a1b02 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -19,12 +19,12 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; -import org.l2jmobius.gameserver.Connection; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; +import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.DropItem; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java index 0a25fb6206..b7d7782753 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java @@ -17,9 +17,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.GMViewCharacterInfo; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.network.serverpackets.GMViewPledgeInfo; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 12e18e1736..9e75ebc73c 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -17,9 +17,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.Inventory; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.PetInventoryUpdate; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index eee29d3ad7..f16e52c84a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -17,9 +17,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.Inventory; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java index a809692112..f303dce48d 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java @@ -17,9 +17,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java index d59fac99d5..9a1fba7dec 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGmList.java @@ -17,8 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; -import org.l2jmobius.gameserver.GmListTable; +import org.l2jmobius.gameserver.managers.GmListManager; +import org.l2jmobius.gameserver.network.ClientThread; public class RequestGmList extends ClientBasePacket { @@ -27,7 +27,7 @@ public class RequestGmList extends ClientBasePacket public RequestGmList(byte[] decrypt, ClientThread client) { super(decrypt); - GmListTable.getInstance().sendListToPlayer(client.getActiveChar()); + GmListManager.getInstance().sendListToPlayer(client.getActiveChar()); } @Override diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java index c20618a328..095a9ca68e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ItemList; public class RequestItemList extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java index 2281a57037..b6166cd87f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java @@ -17,10 +17,10 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.AskJoinParty; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java index d07d8b6d55..1c2927e01b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java @@ -17,10 +17,10 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.AskJoinPledge; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index db314d3358..ae9e42cabc 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -17,10 +17,10 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; public class RequestMagicSkillUse extends ClientBasePacket { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java index f3ae555909..11bb580c0e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java @@ -17,8 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; public class RequestOustPartyMember extends ClientBasePacket { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 4e619942e7..0bc086e16d 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -17,10 +17,10 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.Clan; import org.l2jmobius.gameserver.model.ClanMember; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDeleteAll; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java index 548cf204b5..6058348d65 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java @@ -17,7 +17,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; +import org.l2jmobius.gameserver.network.ClientThread; public class RequestPartyMatchConfig extends ClientBasePacket { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java index 509db47fff..ff7f8ee12e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.PartyMatchDetail; public class RequestPartyMatchDetail extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java index fa8a1a0a0a..0b21f21801 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.PartyMatchList; public class RequestPartyMatchList extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index ad2b845751..8823aef2e2 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -17,9 +17,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; +import org.l2jmobius.gameserver.network.ClientThread; public class RequestPetGetItem extends ClientBasePacket { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java index c1c3fdc13a..f80048a182 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java @@ -20,7 +20,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.File; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.PledgeCrest; public class RequestPledgeCrest extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java index 5931fe2a62..98887b1437 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java @@ -17,10 +17,10 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.data.ClanTable; import org.l2jmobius.gameserver.model.Clan; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.PledgeInfo; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java index d856428ba1..54ddba4cf3 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java @@ -17,9 +17,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.Clan; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; public class RequestPledgeMemberList extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuyManage.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuyManage.java index cc919e3949..227577a6ed 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuyManage.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuyManage.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.ArrayList; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; import org.l2jmobius.gameserver.network.serverpackets.PrivateSellListBuy; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManage.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManage.java index 9999e58f77..c48f12f173 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManage.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManage.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.ArrayList; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; import org.l2jmobius.gameserver.network.serverpackets.PrivateSellListSell; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java index 54e6640f9e..66dadcc6a2 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java @@ -17,8 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class RequestPrivateStoreQuitBuy extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java index 72d2674f55..a102e04e6a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java @@ -17,8 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class RequestPrivateStoreQuitSell extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java index 8e734b3754..a59961a511 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.QuestList; public class RequestQuestList extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index 3ced56054f..db90c086ad 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; import org.l2jmobius.gameserver.network.serverpackets.RestartResponse; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 6122ee8933..92f29d69b0 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; -import org.l2jmobius.gameserver.Connection; import org.l2jmobius.gameserver.data.MapRegionTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; +import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.Revive; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 84d61f4fd3..64efdc2e0b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -17,9 +17,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; public class RequestSellItem extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 0b750f2f2d..eb16c61901 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -21,9 +21,9 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.Clan; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java index 6103727ed8..2555a5e6fd 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java @@ -17,8 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; public class RequestShortCutDel extends ClientBasePacket { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java index 182c58369c..40babef98f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; -import org.l2jmobius.gameserver.Connection; import org.l2jmobius.gameserver.model.ShortCut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; +import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; public class RequestShortCutReg extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java index fc46d3d0cc..aabf1f88ac 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java @@ -17,8 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; -import org.l2jmobius.gameserver.CommunityBoard; +import org.l2jmobius.gameserver.managers.CommunityBoardManager; +import org.l2jmobius.gameserver.network.ClientThread; public class RequestShowBoard extends ClientBasePacket { @@ -29,7 +29,7 @@ public class RequestShowBoard extends ClientBasePacket super(decrypt); @SuppressWarnings("unused") int unknown = readD(); - CommunityBoard.getInstance().handleCommands(client, "bbs_default"); + CommunityBoardManager.getInstance().handleCommands(client, "bbs_default"); } @Override diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java index 0cb2d4fe09..116eeb81ec 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.SkillList; public class RequestSkillList extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSocialAction.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSocialAction.java index fd9966ebf4..ac9cda056b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSocialAction.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSocialAction.java @@ -17,8 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class RequestSocialAction extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java index 5d9936ec14..276af8e100 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected; public class RequestTargetCanceld extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 1a2d83a94c..545eef2a2f 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -17,9 +17,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index f9268fae7c..033644fe87 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -17,10 +17,10 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.Clan; import org.l2jmobius.gameserver.model.ClanMember; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDeleteAll; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index b3e50383cf..40bc849a1b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -20,9 +20,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Iterator; import java.util.Set; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java index 6dc383f222..dbf1256a5e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java @@ -18,10 +18,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.gameserver.AdminCommands; -import org.l2jmobius.gameserver.ClientThread; -import org.l2jmobius.gameserver.GmListTable; +import org.l2jmobius.gameserver.managers.GmListManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -63,7 +63,7 @@ public class SendBypassBuildCmd extends ClientBasePacket { String text = command.substring(7); CreatureSay cs = new CreatureSay(0, 9, activeChar.getName(), text); - GmListTable.getInstance().broadcastToGMs(cs); + GmListManager.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyBuyList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyBuyList.java index 3399512a65..597b0d1bed 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyBuyList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyBuyList.java @@ -20,10 +20,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyList.java index d676cc25a9..fc26838a67 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyList.java @@ -20,10 +20,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index bf5e3a93fd..46a6de8d90 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; -import org.l2jmobius.gameserver.ClientThread; -import org.l2jmobius.gameserver.Connection; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; +import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 4d1a8ff754..6299b587a8 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -17,11 +17,11 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index adf6b3d2b0..1da5f58760 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -20,9 +20,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; import org.l2jmobius.gameserver.network.serverpackets.PrivateStoreMsgBuy; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java index 663f1b8428..aacfd438c9 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java @@ -20,9 +20,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; import org.l2jmobius.gameserver.network.serverpackets.PrivateStoreMsgSell; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 7e2b081e16..dd7456fec4 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -17,8 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; public class SetPrivateStoreMsgBuy extends ClientBasePacket { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index e94c69493f..4ccc45c129 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -17,8 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; public class SetPrivateStoreMsgSell extends ClientBasePacket { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StartRotating.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StartRotating.java index 0db0734866..54fed182a8 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StartRotating.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StartRotating.java @@ -17,7 +17,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.BeginRotation; public class StartRotating extends ClientBasePacket diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StopMove.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StopMove.java index f183428406..a22ffe3f90 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StopMove.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/StopMove.java @@ -17,8 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.StopMoveWithLocation; import org.l2jmobius.gameserver.network.serverpackets.StopRotation; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java index f64b8f436c..06d242ad43 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java @@ -17,8 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.SendTradeDone; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java index d8fddfe138..ad75f8429a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java @@ -17,10 +17,10 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.SendTradeRequest; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index f7d25a63ab..35f2d9f13e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -20,11 +20,11 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; import java.util.List; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java index edbd009ebb..da8113ede0 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java @@ -21,11 +21,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.l2jmobius.gameserver.ClientThread; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.network.ClientThread; public class ValidatePosition extends ClientBasePacket { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 112dd67b04..20ad382571 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -32,7 +32,7 @@ import javax.swing.border.LineBorder; import org.l2jmobius.Config; import org.l2jmobius.gameserver.GameServer; -import org.l2jmobius.gameserver.PlayerCountManager; +import org.l2jmobius.gameserver.managers.PlayerCountManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.util.Locator; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginController.java index 912024cb1d..4f21fc1a86 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginController.java @@ -21,7 +21,7 @@ import java.net.Socket; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.Connection; +import org.l2jmobius.gameserver.network.Connection; public class LoginController { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginServer.java index 2dd8a5b7a9..e9671314e5 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginServer.java @@ -28,6 +28,8 @@ import java.net.Socket; import java.util.logging.Logger; import org.l2jmobius.Config; +import org.l2jmobius.loginserver.data.AccountData; +import org.l2jmobius.loginserver.network.ClientThread; public class LoginServer extends Thread { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/AccountData.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/data/AccountData.java similarity index 98% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/AccountData.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/data/AccountData.java index 4f2763f492..eb534ef2a2 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/AccountData.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/data/AccountData.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver; +package org.l2jmobius.loginserver.data; import java.io.File; import java.io.FileInputStream; @@ -33,6 +33,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; import org.l2jmobius.Config; +import org.l2jmobius.loginserver.network.HackingException; public class AccountData { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/BlowfishEngine.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/BlowfishEngine.java similarity index 99% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/BlowfishEngine.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/BlowfishEngine.java index 9994600602..5ea5243a8b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/BlowfishEngine.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/BlowfishEngine.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver; +package org.l2jmobius.loginserver.network; import java.io.IOException; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/ClientThread.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/ClientThread.java similarity index 92% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/ClientThread.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/ClientThread.java index 555d4902c8..56761ad495 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/ClientThread.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/ClientThread.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver; +package org.l2jmobius.loginserver.network; import java.io.BufferedOutputStream; import java.io.IOException; @@ -28,14 +28,16 @@ import java.util.List; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.loginserver.clientpackets.RequestAuthLogin; -import org.l2jmobius.loginserver.clientpackets.RequestServerLogin; -import org.l2jmobius.loginserver.serverpackets.Init; -import org.l2jmobius.loginserver.serverpackets.LoginFail; -import org.l2jmobius.loginserver.serverpackets.LoginOk; -import org.l2jmobius.loginserver.serverpackets.PlayOk; -import org.l2jmobius.loginserver.serverpackets.ServerBasePacket; -import org.l2jmobius.loginserver.serverpackets.ServerList; +import org.l2jmobius.loginserver.LoginController; +import org.l2jmobius.loginserver.data.AccountData; +import org.l2jmobius.loginserver.network.clientpackets.RequestAuthLogin; +import org.l2jmobius.loginserver.network.clientpackets.RequestServerLogin; +import org.l2jmobius.loginserver.network.serverpackets.Init; +import org.l2jmobius.loginserver.network.serverpackets.LoginFail; +import org.l2jmobius.loginserver.network.serverpackets.LoginOk; +import org.l2jmobius.loginserver.network.serverpackets.PlayOk; +import org.l2jmobius.loginserver.network.serverpackets.ServerBasePacket; +import org.l2jmobius.loginserver.network.serverpackets.ServerList; public class ClientThread extends Thread { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/HackingException.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/HackingException.java similarity index 95% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/HackingException.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/HackingException.java index f4146fddc2..799689a3fb 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/HackingException.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/HackingException.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver; +package org.l2jmobius.loginserver.network; public class HackingException extends Exception { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/NewCrypt.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/NewCrypt.java similarity index 98% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/NewCrypt.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/NewCrypt.java index 4a69bf2867..1097928f50 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/NewCrypt.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/NewCrypt.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver; +package org.l2jmobius.loginserver.network; import java.io.IOException; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/clientpackets/ClientBasePacket.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/ClientBasePacket.java similarity index 97% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/clientpackets/ClientBasePacket.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/ClientBasePacket.java index 16099ffc7b..e68a59a470 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/clientpackets/ClientBasePacket.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/ClientBasePacket.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver.clientpackets; +package org.l2jmobius.loginserver.network.clientpackets; public abstract class ClientBasePacket { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/clientpackets/RequestAuthLogin.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java similarity index 95% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/clientpackets/RequestAuthLogin.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java index 0bc884f988..2229a7039d 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/clientpackets/RequestAuthLogin.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver.clientpackets; +package org.l2jmobius.loginserver.network.clientpackets; public class RequestAuthLogin { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/clientpackets/RequestServerList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerList.java similarity index 96% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/clientpackets/RequestServerList.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerList.java index 933ef36dd3..ac01c5bb86 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/clientpackets/RequestServerList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerList.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver.clientpackets; +package org.l2jmobius.loginserver.network.clientpackets; public class RequestServerList { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/clientpackets/RequestServerLogin.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerLogin.java similarity index 96% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/clientpackets/RequestServerLogin.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerLogin.java index dca5a020bf..c07c62ef4a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/clientpackets/RequestServerLogin.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerLogin.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver.clientpackets; +package org.l2jmobius.loginserver.network.clientpackets; public class RequestServerLogin { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/Init.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/Init.java similarity index 94% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/Init.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 7f9fe51a4a..6b189e3c98 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/Init.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver.serverpackets; +package org.l2jmobius.loginserver.network.serverpackets; public class Init { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/LoginFail.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java similarity index 95% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/LoginFail.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index b5eea2ae2a..48861b47a3 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/LoginFail.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver.serverpackets; +package org.l2jmobius.loginserver.network.serverpackets; public class LoginFail extends ServerBasePacket { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/LoginOk.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginOk.java similarity index 94% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/LoginOk.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginOk.java index 010582bc72..f9bf3cc727 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/LoginOk.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginOk.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver.serverpackets; +package org.l2jmobius.loginserver.network.serverpackets; public class LoginOk extends ServerBasePacket { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/PlayFail.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayFail.java similarity index 95% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/PlayFail.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayFail.java index 09c2d120f4..af52100dbc 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/PlayFail.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayFail.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver.serverpackets; +package org.l2jmobius.loginserver.network.serverpackets; public class PlayFail extends ServerBasePacket { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/PlayOk.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayOk.java similarity index 94% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/PlayOk.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayOk.java index a6cc8fbf91..e8509f70ac 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/PlayOk.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayOk.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver.serverpackets; +package org.l2jmobius.loginserver.network.serverpackets; public class PlayOk extends ServerBasePacket { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/ServerBasePacket.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerBasePacket.java similarity index 97% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/ServerBasePacket.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerBasePacket.java index 6d28b3e0f9..a41594df84 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/ServerBasePacket.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerBasePacket.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver.serverpackets; +package org.l2jmobius.loginserver.network.serverpackets; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/ServerList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java similarity index 97% rename from L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/ServerList.java rename to L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java index eea77b1a80..cc92f9c797 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/serverpackets/ServerList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package org.l2jmobius.loginserver.serverpackets; +package org.l2jmobius.loginserver.network.serverpackets; import java.net.InetAddress; import java.net.UnknownHostException;