diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java index c868939eef..d898cefff2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java @@ -160,9 +160,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 87e05466dc..b7d98768d6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -306,7 +305,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -447,7 +446,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/World.java index 95e24f8c7b..5a8f963229 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/World.java @@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 37a304f345..03da421726 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -47,7 +47,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5701,7 +5700,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8adf6864a5..130b6aa724 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 099d9c42ad..3a67044966 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java index 343c4a0c6f..a3e9fe3f61 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java @@ -164,9 +164,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 87e05466dc..b7d98768d6 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -306,7 +305,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -447,7 +446,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/World.java index 95e24f8c7b..5a8f963229 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/World.java @@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index b170bebdc1..6ed9a3b374 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -47,7 +47,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5707,7 +5706,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8adf6864a5..130b6aa724 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 099d9c42ad..3a67044966 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java index 343c4a0c6f..a3e9fe3f61 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java @@ -164,9 +164,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 87e05466dc..b7d98768d6 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -306,7 +305,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -447,7 +446,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/World.java index 95e24f8c7b..5a8f963229 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/World.java @@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 3c34921f96..16b6e917f6 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -47,7 +47,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5709,7 +5708,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8adf6864a5..130b6aa724 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 099d9c42ad..3a67044966 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java index 4d8e2b663f..f0ff734284 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java @@ -164,9 +164,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 78aa5b5880..4a1cb2d77e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; @@ -310,7 +309,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -451,7 +450,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/World.java index 95e24f8c7b..5a8f963229 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/World.java @@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 5389755959..ef050c30ed 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -47,7 +47,6 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5703,7 +5702,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8adf6864a5..130b6aa724 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 099d9c42ad..3a67044966 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java index a0270f7685..e873102b19 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java @@ -165,9 +165,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 78aa5b5880..4a1cb2d77e 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; @@ -310,7 +309,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -451,7 +450,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/World.java index 95e24f8c7b..5a8f963229 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/World.java @@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 10c9d0e7be..cabe32ba8b 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -47,7 +47,6 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5683,7 +5682,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8adf6864a5..130b6aa724 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 099d9c42ad..3a67044966 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java index a0270f7685..e873102b19 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java @@ -165,9 +165,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 78aa5b5880..4a1cb2d77e 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; @@ -310,7 +309,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -451,7 +450,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/World.java index 95e24f8c7b..5a8f963229 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/World.java @@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 4e3a4f2009..a1dda79f22 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -47,7 +47,6 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5683,7 +5682,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8adf6864a5..130b6aa724 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 099d9c42ad..3a67044966 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java index 174ae5b355..74da698bf9 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java @@ -166,9 +166,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 78aa5b5880..4a1cb2d77e 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; @@ -310,7 +309,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -451,7 +450,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/World.java index 95e24f8c7b..5a8f963229 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/World.java @@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 92ed6b4838..413fc65f9f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -47,7 +47,6 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5684,7 +5683,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8adf6864a5..130b6aa724 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 099d9c42ad..3a67044966 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java index 43f1f0bc50..6d0d1c951b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java @@ -168,9 +168,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 78aa5b5880..4a1cb2d77e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; @@ -310,7 +309,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -451,7 +450,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/World.java index 95e24f8c7b..5a8f963229 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/World.java @@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 9fc800b078..1597b7a2dc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -46,7 +46,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5611,7 +5610,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8adf6864a5..130b6aa724 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 099d9c42ad..3a67044966 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); 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 2f573affa8..9b394f80fa 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameServer.java @@ -59,9 +59,6 @@ public class GameServer extends Thread { static Logger _log = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private ServerSocket _serverSocket; private final ItemTable _itemTable; 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 162d811c63..abf255c6f7 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 @@ -29,6 +29,9 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class World { + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + public static final int TILE_SIZE = 32768; public static final int TILE_X_MIN = 11; public static final int TILE_Y_MIN = 10; 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 9fdcc0011d..444160073e 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 @@ -117,12 +117,12 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getAllPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java index 804f4732f9..c2baf7d9ac 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java @@ -135,9 +135,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private static SelectorThread _selectorThread; private static LoginServerThread _loginThread; private static GamePacketHandler _gamePacketHandler; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/OfflineTradeTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/OfflineTradeTable.java index ad8ca7ea56..fa1fb988c7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/OfflineTradeTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/OfflineTradeTable.java @@ -24,7 +24,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.ManufactureList; @@ -288,7 +287,7 @@ public class OfflineTradeTable } rs.close(); stm.close(); - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info("Loaded " + nTraders + " offline traders."); } catch (Exception e) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminOnline.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminOnline.java index fb555823f3..7f8d2d0d22 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -95,7 +94,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/World.java index 365edd1eff..df908a76c5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/World.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -35,6 +34,9 @@ public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + public static final int SHIFT_BY = 12; // Geodata min/max tiles @@ -446,7 +448,7 @@ public class World { if (object.getActingPlayer().isInOfflineMode()) { - GameServer.OFFLINE_TRADE_COUNT--; + OFFLINE_TRADE_COUNT--; } if (!((PlayerInstance) object).isTeleporting()) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index ba99fdba68..27ee1085b6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -39,7 +39,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -7473,7 +7472,7 @@ public class PlayerInstance extends Playable store(); if (Config.OFFLINE_DISCONNECT_FINISHED) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; deleteMe(); if (_client != null) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java index c00bd3874e..a413312a6f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java @@ -36,7 +36,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.mmocore.MMOClient; import org.l2jmobius.commons.mmocore.MMOConnection; import org.l2jmobius.commons.mmocore.ReceivablePacket; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.datatables.OfflineTradeTable; @@ -752,7 +751,7 @@ public class GameClient extends MMOClient> implements } OfflineTradeTable.storeOffliner(player); - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; return; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 37765ecbb2..0af9a945cd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -129,13 +129,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getAllPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java index efcb16f12d..9179aab112 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java @@ -157,9 +157,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 87e05466dc..b7d98768d6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -306,7 +305,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -447,7 +446,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/World.java index b5119a459e..691c951a8e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/World.java @@ -44,6 +44,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index da3384565e..7c7ea10e6c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -46,7 +46,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -6050,7 +6049,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java index aa47508332..226310ca0a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 8a8fe649e4..d5200a7b34 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.Olympiad; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java index fa959df774..35fd281f12 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java @@ -158,9 +158,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 87e05466dc..b7d98768d6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -306,7 +305,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -447,7 +446,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/World.java index b5119a459e..691c951a8e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/World.java @@ -44,6 +44,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 4597a26f4d..76d625704f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -46,7 +46,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5947,7 +5946,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java index aa47508332..226310ca0a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index fb9715efb3..3296c2859d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java index b27e3ba505..a28fb418fc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java @@ -161,9 +161,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 87e05466dc..b7d98768d6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -306,7 +305,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -447,7 +446,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/World.java index 95e24f8c7b..5a8f963229 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/World.java @@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 78f1440faf..adff9b1d22 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -47,7 +47,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5672,7 +5671,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8adf6864a5..130b6aa724 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 099d9c42ad..3a67044966 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java index b27e3ba505..a28fb418fc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java @@ -161,9 +161,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 87e05466dc..b7d98768d6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -306,7 +305,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -447,7 +446,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/World.java index 95e24f8c7b..5a8f963229 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/World.java @@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 507be9d0ff..1ec44a7254 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -47,7 +47,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5672,7 +5671,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8adf6864a5..130b6aa724 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 099d9c42ad..3a67044966 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java index b27e3ba505..a28fb418fc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java @@ -161,9 +161,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 87e05466dc..b7d98768d6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -306,7 +305,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -447,7 +446,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/World.java index 95e24f8c7b..5a8f963229 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/World.java @@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index ea190d80c1..95bd780c0a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -47,7 +47,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5658,7 +5657,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8adf6864a5..130b6aa724 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 099d9c42ad..3a67044966 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java index 71cb117bc4..0e254b428c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java @@ -162,9 +162,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 87e05466dc..b7d98768d6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -306,7 +305,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -447,7 +446,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/World.java index 95e24f8c7b..5a8f963229 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/World.java @@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 33414b53e7..2fbdf7b385 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -48,7 +48,6 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5669,7 +5668,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8adf6864a5..130b6aa724 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 099d9c42ad..3a67044966 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java index 62d01245f0..3f3ba440c2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java @@ -163,9 +163,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 87e05466dc..b7d98768d6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -306,7 +305,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -447,7 +446,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/World.java index 95e24f8c7b..5a8f963229 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/World.java @@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 9e17345515..4f27a59536 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -48,7 +48,6 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5669,7 +5668,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8adf6864a5..130b6aa724 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 099d9c42ad..3a67044966 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java index 54b22bc1af..94f5fdbac0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java @@ -165,9 +165,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 87e05466dc..b7d98768d6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -306,7 +305,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -447,7 +446,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/World.java index 95e24f8c7b..5a8f963229 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/World.java @@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index dc32115fe8..e9a80d1c1f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -48,7 +48,6 @@ import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5584,7 +5583,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8adf6864a5..130b6aa724 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 099d9c42ad..3a67044966 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java index e2d6f89799..4613926541 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -93,7 +92,7 @@ public class AdminOnline implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Total count: " + total); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); - BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT); + BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT); BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size()); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java index 1f4cf6c24c..b2bb4c5014 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java @@ -162,9 +162,6 @@ public class GameServer { private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); - public static volatile int MAX_CONNECTED_COUNT = 0; - public static volatile int OFFLINE_TRADE_COUNT = 0; - private final DeadLockDetector _deadDetectThread; private static GameServer INSTANCE; public static final Calendar dateTimeServerStarted = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 87e05466dc..b7d98768d6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -306,7 +305,7 @@ public class OfflineTraderTable } } - GameServer.OFFLINE_TRADE_COUNT = nTraders; + World.OFFLINE_TRADE_COUNT = nTraders; LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders."); if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) @@ -447,7 +446,7 @@ public class OfflineTraderTable public static synchronized void removeTrader(int traderObjId) { - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/World.java index 95e24f8c7b..5a8f963229 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/World.java @@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; public class World { private static final Logger LOGGER = Logger.getLogger(World.class.getName()); + + public static volatile int MAX_CONNECTED_COUNT = 0; + public static volatile int OFFLINE_TRADE_COUNT = 0; + /** Gracia border Flying objects not allowed to the east of it. */ public static final int GRACIA_MAX_X = -166168; public static final int GRACIA_MAX_Z = 6105; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 4a85aae945..fbfa3df915 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -47,7 +47,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.LoginServerThread; @@ -5674,7 +5673,7 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { Disconnection.of(this).storeMe().deleteMe(); - GameServer.OFFLINE_TRADE_COUNT--; + World.OFFLINE_TRADE_COUNT--; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8adf6864a5..130b6aa724 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -122,13 +122,13 @@ public class SystemPanel extends JPanel public void run() { final int playerCount = World.getInstance().getPlayers().size(); - if (GameServer.MAX_CONNECTED_COUNT < playerCount) + if (World.MAX_CONNECTED_COUNT < playerCount) { - GameServer.MAX_CONNECTED_COUNT = playerCount; + World.MAX_CONNECTED_COUNT = playerCount; } lblConnected.setText("Connected: " + playerCount); - lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); - lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); + lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); + lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 099d9c42ad..3a67044966 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; +import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; @@ -100,7 +100,7 @@ public class OfflineTradeUtil return false; } - GameServer.OFFLINE_TRADE_COUNT++; + World.OFFLINE_TRADE_COUNT++; final GameClient client = player.getClient(); client.close(true);