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

Moved again previous commit variables in World.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-04-01 11:56:04 +00:00
parent f2a7531d24
commit 362fc6d6cb
129 changed files with 256 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java
Vendored
+1 -2
View File
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 count: " + total);
BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online);
BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); 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, "Unique IPs: " + ips.size());
BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace);
BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace);
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java
-3
View File
@@ -160,9 +160,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); 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 final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java
+2 -3
View File
@@ -26,7 +26,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.TradeItem; 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."); LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders.");
if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME)
@@ -447,7 +446,7 @@ public class OfflineTraderTable
public static synchronized void removeTrader(int traderObjId) public static synchronized void removeTrader(int traderObjId)
{ {
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/World.java
+4
View File
@@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
public class World public class World
{ {
private static final Logger LOGGER = Logger.getLogger(World.class.getName()); 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. */ /** 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_X = -166168;
public static final int GRACIA_MAX_Z = 6105; public static final int GRACIA_MAX_Z = 6105;
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -2
View File
@@ -47,7 +47,6 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread; 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())) if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{ {
Disconnection.of(this).storeMe().deleteMe(); Disconnection.of(this).storeMe().deleteMe();
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
} }
} }
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+4 -4
View File
@@ -122,13 +122,13 @@ public class SystemPanel extends JPanel
public void run() public void run()
{ {
final int playerCount = World.getInstance().getPlayers().size(); 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); lblConnected.setText("Connected: " + playerCount);
lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT);
lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
} }
}, 1000, 1000); }, 1000, 1000);
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; 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.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
@@ -100,7 +100,7 @@ public class OfflineTradeUtil
return false; return false;
} }
GameServer.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(true);
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java
Vendored
+1 -2
View File
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 count: " + total);
BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online);
BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); 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, "Unique IPs: " + ips.size());
BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace);
BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace);
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java
-3
View File
@@ -164,9 +164,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); 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 final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java
+2 -3
View File
@@ -26,7 +26,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.TradeItem; 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."); LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders.");
if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME)
@@ -447,7 +446,7 @@ public class OfflineTraderTable
public static synchronized void removeTrader(int traderObjId) public static synchronized void removeTrader(int traderObjId)
{ {
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/World.java
+4
View File
@@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
public class World public class World
{ {
private static final Logger LOGGER = Logger.getLogger(World.class.getName()); 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. */ /** 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_X = -166168;
public static final int GRACIA_MAX_Z = 6105; public static final int GRACIA_MAX_Z = 6105;
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -2
View File
@@ -47,7 +47,6 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread; 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())) if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{ {
Disconnection.of(this).storeMe().deleteMe(); Disconnection.of(this).storeMe().deleteMe();
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
} }
} }
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+4 -4
View File
@@ -122,13 +122,13 @@ public class SystemPanel extends JPanel
public void run() public void run()
{ {
final int playerCount = World.getInstance().getPlayers().size(); 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); lblConnected.setText("Connected: " + playerCount);
lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT);
lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
} }
}, 1000, 1000); }, 1000, 1000);
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; 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.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
@@ -100,7 +100,7 @@ public class OfflineTradeUtil
return false; return false;
} }
GameServer.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(true);
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java
Vendored
+1 -2
View File
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 count: " + total);
BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online);
BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); 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, "Unique IPs: " + ips.size());
BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace);
BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java
-3
View File
@@ -164,9 +164,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); 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 final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java
+2 -3
View File
@@ -26,7 +26,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.TradeItem; 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."); LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders.");
if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME)
@@ -447,7 +446,7 @@ public class OfflineTraderTable
public static synchronized void removeTrader(int traderObjId) public static synchronized void removeTrader(int traderObjId)
{ {
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/World.java
+4
View File
@@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
public class World public class World
{ {
private static final Logger LOGGER = Logger.getLogger(World.class.getName()); 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. */ /** 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_X = -166168;
public static final int GRACIA_MAX_Z = 6105; public static final int GRACIA_MAX_Z = 6105;
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -2
View File
@@ -47,7 +47,6 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread; 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())) if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{ {
Disconnection.of(this).storeMe().deleteMe(); Disconnection.of(this).storeMe().deleteMe();
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
} }
} }
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+4 -4
View File
@@ -122,13 +122,13 @@ public class SystemPanel extends JPanel
public void run() public void run()
{ {
final int playerCount = World.getInstance().getPlayers().size(); 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); lblConnected.setText("Connected: " + playerCount);
lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT);
lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
} }
}, 1000, 1000); }, 1000, 1000);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; 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.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
@@ -100,7 +100,7 @@ public class OfflineTradeUtil
return false; return false;
} }
GameServer.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(true);
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java
Vendored
+1 -2
View File
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 count: " + total);
BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online);
BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); 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, "Unique IPs: " + ips.size());
BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace);
BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace);
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java
-3
View File
@@ -164,9 +164,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); 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 final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java
+2 -3
View File
@@ -29,7 +29,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeItem;
import org.l2jmobius.gameserver.model.World; 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."); LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders.");
if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME)
@@ -451,7 +450,7 @@ public class OfflineTraderTable
public static synchronized void removeTrader(int traderObjId) public static synchronized void removeTrader(int traderObjId)
{ {
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/World.java
+4
View File
@@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
public class World public class World
{ {
private static final Logger LOGGER = Logger.getLogger(World.class.getName()); 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. */ /** 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_X = -166168;
public static final int GRACIA_MAX_Z = 6105; public static final int GRACIA_MAX_Z = 6105;
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -2
View File
@@ -47,7 +47,6 @@ import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread; 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())) if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{ {
Disconnection.of(this).storeMe().deleteMe(); Disconnection.of(this).storeMe().deleteMe();
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
} }
} }
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+4 -4
View File
@@ -122,13 +122,13 @@ public class SystemPanel extends JPanel
public void run() public void run()
{ {
final int playerCount = World.getInstance().getPlayers().size(); 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); lblConnected.setText("Connected: " + playerCount);
lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT);
lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
} }
}, 1000, 1000); }, 1000, 1000);
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; 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.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
@@ -100,7 +100,7 @@ public class OfflineTradeUtil
return false; return false;
} }
GameServer.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(true);
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java
Vendored
+1 -2
View File
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 count: " + total);
BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online);
BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); 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, "Unique IPs: " + ips.size());
BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace);
BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace);
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java
-3
View File
@@ -165,9 +165,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); 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 final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java
+2 -3
View File
@@ -29,7 +29,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeItem;
import org.l2jmobius.gameserver.model.World; 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."); LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders.");
if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME)
@@ -451,7 +450,7 @@ public class OfflineTraderTable
public static synchronized void removeTrader(int traderObjId) public static synchronized void removeTrader(int traderObjId)
{ {
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/World.java
+4
View File
@@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
public class World public class World
{ {
private static final Logger LOGGER = Logger.getLogger(World.class.getName()); 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. */ /** 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_X = -166168;
public static final int GRACIA_MAX_Z = 6105; public static final int GRACIA_MAX_Z = 6105;
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -2
View File
@@ -47,7 +47,6 @@ import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread; 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())) if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{ {
Disconnection.of(this).storeMe().deleteMe(); Disconnection.of(this).storeMe().deleteMe();
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
} }
} }
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+4 -4
View File
@@ -122,13 +122,13 @@ public class SystemPanel extends JPanel
public void run() public void run()
{ {
final int playerCount = World.getInstance().getPlayers().size(); 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); lblConnected.setText("Connected: " + playerCount);
lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT);
lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
} }
}, 1000, 1000); }, 1000, 1000);
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; 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.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
@@ -100,7 +100,7 @@ public class OfflineTradeUtil
return false; return false;
} }
GameServer.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(true);
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java
Vendored
+1 -2
View File
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 count: " + total);
BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online);
BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); 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, "Unique IPs: " + ips.size());
BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace);
BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace);
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java
-3
View File
@@ -165,9 +165,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); 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 final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java
+2 -3
View File
@@ -29,7 +29,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeItem;
import org.l2jmobius.gameserver.model.World; 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."); LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders.");
if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME)
@@ -451,7 +450,7 @@ public class OfflineTraderTable
public static synchronized void removeTrader(int traderObjId) public static synchronized void removeTrader(int traderObjId)
{ {
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/World.java
+4
View File
@@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
public class World public class World
{ {
private static final Logger LOGGER = Logger.getLogger(World.class.getName()); 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. */ /** 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_X = -166168;
public static final int GRACIA_MAX_Z = 6105; public static final int GRACIA_MAX_Z = 6105;
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -2
View File
@@ -47,7 +47,6 @@ import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread; 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())) if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{ {
Disconnection.of(this).storeMe().deleteMe(); Disconnection.of(this).storeMe().deleteMe();
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
} }
} }
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+4 -4
View File
@@ -122,13 +122,13 @@ public class SystemPanel extends JPanel
public void run() public void run()
{ {
final int playerCount = World.getInstance().getPlayers().size(); 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); lblConnected.setText("Connected: " + playerCount);
lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT);
lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
} }
}, 1000, 1000); }, 1000, 1000);
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; 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.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
@@ -100,7 +100,7 @@ public class OfflineTradeUtil
return false; return false;
} }
GameServer.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(true);
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java
Vendored
+1 -2
View File
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 count: " + total);
BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online);
BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); 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, "Unique IPs: " + ips.size());
BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace);
BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace);
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java
-3
View File
@@ -166,9 +166,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); 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 final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java
+2 -3
View File
@@ -29,7 +29,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeItem;
import org.l2jmobius.gameserver.model.World; 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."); LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders.");
if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME)
@@ -451,7 +450,7 @@ public class OfflineTraderTable
public static synchronized void removeTrader(int traderObjId) public static synchronized void removeTrader(int traderObjId)
{ {
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/World.java
+4
View File
@@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
public class World public class World
{ {
private static final Logger LOGGER = Logger.getLogger(World.class.getName()); 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. */ /** 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_X = -166168;
public static final int GRACIA_MAX_Z = 6105; public static final int GRACIA_MAX_Z = 6105;
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -2
View File
@@ -47,7 +47,6 @@ import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread; 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())) if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{ {
Disconnection.of(this).storeMe().deleteMe(); Disconnection.of(this).storeMe().deleteMe();
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
} }
} }
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+4 -4
View File
@@ -122,13 +122,13 @@ public class SystemPanel extends JPanel
public void run() public void run()
{ {
final int playerCount = World.getInstance().getPlayers().size(); 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); lblConnected.setText("Connected: " + playerCount);
lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT);
lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
} }
}, 1000, 1000); }, 1000, 1000);
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; 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.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
@@ -100,7 +100,7 @@ public class OfflineTradeUtil
return false; return false;
} }
GameServer.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(true);
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java
Vendored
+1 -2
View File
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 count: " + total);
BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online);
BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); 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, "Unique IPs: " + ips.size());
BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace);
BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace);
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java
-3
View File
@@ -168,9 +168,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); 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 final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java
+2 -3
View File
@@ -29,7 +29,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeItem;
import org.l2jmobius.gameserver.model.World; 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."); LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders.");
if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME)
@@ -451,7 +450,7 @@ public class OfflineTraderTable
public static synchronized void removeTrader(int traderObjId) public static synchronized void removeTrader(int traderObjId)
{ {
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/World.java
+4
View File
@@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
public class World public class World
{ {
private static final Logger LOGGER = Logger.getLogger(World.class.getName()); 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. */ /** 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_X = -166168;
public static final int GRACIA_MAX_Z = 6105; public static final int GRACIA_MAX_Z = 6105;
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -2
View File
@@ -46,7 +46,6 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread; 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())) if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{ {
Disconnection.of(this).storeMe().deleteMe(); Disconnection.of(this).storeMe().deleteMe();
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
} }
} }
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+4 -4
View File
@@ -122,13 +122,13 @@ public class SystemPanel extends JPanel
public void run() public void run()
{ {
final int playerCount = World.getInstance().getPlayers().size(); 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); lblConnected.setText("Connected: " + playerCount);
lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT);
lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
} }
}, 1000, 1000); }, 1000, 1000);
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; 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.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
@@ -100,7 +100,7 @@ public class OfflineTradeUtil
return false; return false;
} }
GameServer.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(true);
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameServer.java
-3
View File
@@ -59,9 +59,6 @@ public class GameServer extends Thread
{ {
static Logger _log = Logger.getLogger(GameServer.class.getName()); 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 ServerSocket _serverSocket;
private final ItemTable _itemTable; private final ItemTable _itemTable;
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java
+3
View File
@@ -29,6 +29,9 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
public class World 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_SIZE = 32768;
public static final int TILE_X_MIN = 11; public static final int TILE_X_MIN = 11;
public static final int TILE_Y_MIN = 10; public static final int TILE_Y_MIN = 10;
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+3 -3
View File
@@ -117,12 +117,12 @@ public class SystemPanel extends JPanel
public void run() public void run()
{ {
final int playerCount = World.getInstance().getAllPlayers().size(); 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); 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)); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
} }
}, 1000, 1000); }, 1000, 1000);
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java
-3
View File
@@ -135,9 +135,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); 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<GameClient> _selectorThread; private static SelectorThread<GameClient> _selectorThread;
private static LoginServerThread _loginThread; private static LoginServerThread _loginThread;
private static GamePacketHandler _gamePacketHandler; private static GamePacketHandler _gamePacketHandler;
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/OfflineTradeTable.java
+1 -2
View File
@@ -24,7 +24,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.ManufactureList; import org.l2jmobius.gameserver.model.ManufactureList;
@@ -288,7 +287,7 @@ public class OfflineTradeTable
} }
rs.close(); rs.close();
stm.close(); stm.close();
GameServer.OFFLINE_TRADE_COUNT = nTraders; World.OFFLINE_TRADE_COUNT = nTraders;
LOGGER.info("Loaded " + nTraders + " offline traders."); LOGGER.info("Loaded " + nTraders + " offline traders.");
} }
catch (Exception e) catch (Exception e)
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminOnline.java
+1 -2
View File
@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 count: " + total);
BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online);
BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); 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, "Unique IPs: " + ips.size());
BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace);
BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace);
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/World.java
+4 -2
View File
@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PetInstance; import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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()); 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; public static final int SHIFT_BY = 12;
// Geodata min/max tiles // Geodata min/max tiles
@@ -446,7 +448,7 @@ public class World
{ {
if (object.getActingPlayer().isInOfflineMode()) if (object.getActingPlayer().isInOfflineMode())
{ {
GameServer.OFFLINE_TRADE_COUNT--; OFFLINE_TRADE_COUNT--;
} }
if (!((PlayerInstance) object).isTeleporting()) if (!((PlayerInstance) object).isTeleporting())
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -2
View File
@@ -39,7 +39,6 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread;
@@ -7473,7 +7472,7 @@ public class PlayerInstance extends Playable
store(); store();
if (Config.OFFLINE_DISCONNECT_FINISHED) if (Config.OFFLINE_DISCONNECT_FINISHED)
{ {
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
deleteMe(); deleteMe();
if (_client != null) if (_client != null)
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java
+1 -2
View File
@@ -36,7 +36,6 @@ import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.mmocore.MMOClient; import org.l2jmobius.commons.mmocore.MMOClient;
import org.l2jmobius.commons.mmocore.MMOConnection; import org.l2jmobius.commons.mmocore.MMOConnection;
import org.l2jmobius.commons.mmocore.ReceivablePacket; import org.l2jmobius.commons.mmocore.ReceivablePacket;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.LoginServerThread.SessionKey;
import org.l2jmobius.gameserver.datatables.OfflineTradeTable; import org.l2jmobius.gameserver.datatables.OfflineTradeTable;
@@ -752,7 +751,7 @@ public class GameClient extends MMOClient<MMOConnection<GameClient>> implements
} }
OfflineTradeTable.storeOffliner(player); OfflineTradeTable.storeOffliner(player);
GameServer.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
return; return;
} }
} }
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+4 -4
View File
@@ -129,13 +129,13 @@ public class SystemPanel extends JPanel
public void run() public void run()
{ {
final int playerCount = World.getInstance().getAllPlayers().size(); 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); lblConnected.setText("Connected: " + playerCount);
lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT);
lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
} }
}, 1000, 1000); }, 1000, 1000);
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java
Vendored
+1 -2
View File
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 count: " + total);
BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online);
BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); 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, "Unique IPs: " + ips.size());
BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace);
BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace);
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java
-3
View File
@@ -157,9 +157,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); 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 final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java
+2 -3
View File
@@ -26,7 +26,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.TradeItem; 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."); LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders.");
if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME)
@@ -447,7 +446,7 @@ public class OfflineTraderTable
public static synchronized void removeTrader(int traderObjId) public static synchronized void removeTrader(int traderObjId)
{ {
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/World.java
+4
View File
@@ -44,6 +44,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
public class World public class World
{ {
private static final Logger LOGGER = Logger.getLogger(World.class.getName()); 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. */ /** 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_X = -166168;
public static final int GRACIA_MAX_Z = 6105; public static final int GRACIA_MAX_Z = 6105;
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -2
View File
@@ -46,7 +46,6 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread; 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())) if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{ {
Disconnection.of(this).storeMe().deleteMe(); Disconnection.of(this).storeMe().deleteMe();
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
} }
} }
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+4 -4
View File
@@ -122,13 +122,13 @@ public class SystemPanel extends JPanel
public void run() public void run()
{ {
final int playerCount = World.getInstance().getPlayers().size(); 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); lblConnected.setText("Connected: " + playerCount);
lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT);
lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
} }
}, 1000, 1000); }, 1000, 1000);
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; 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.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.olympiad.Olympiad;
@@ -100,7 +100,7 @@ public class OfflineTradeUtil
return false; return false;
} }
GameServer.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(true);
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java
Vendored
+1 -2
View File
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 count: " + total);
BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online);
BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); 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, "Unique IPs: " + ips.size());
BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace);
BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace);
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java
-3
View File
@@ -158,9 +158,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); 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 final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java
+2 -3
View File
@@ -26,7 +26,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.TradeItem; 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."); LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders.");
if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME)
@@ -447,7 +446,7 @@ public class OfflineTraderTable
public static synchronized void removeTrader(int traderObjId) public static synchronized void removeTrader(int traderObjId)
{ {
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/World.java
+4
View File
@@ -44,6 +44,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
public class World public class World
{ {
private static final Logger LOGGER = Logger.getLogger(World.class.getName()); 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. */ /** 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_X = -166168;
public static final int GRACIA_MAX_Z = 6105; public static final int GRACIA_MAX_Z = 6105;
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -2
View File
@@ -46,7 +46,6 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread; 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())) if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{ {
Disconnection.of(this).storeMe().deleteMe(); Disconnection.of(this).storeMe().deleteMe();
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
} }
} }
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+4 -4
View File
@@ -122,13 +122,13 @@ public class SystemPanel extends JPanel
public void run() public void run()
{ {
final int playerCount = World.getInstance().getPlayers().size(); 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); lblConnected.setText("Connected: " + playerCount);
lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT);
lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
} }
}, 1000, 1000); }, 1000, 1000);
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; 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.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
@@ -100,7 +100,7 @@ public class OfflineTradeUtil
return false; return false;
} }
GameServer.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(true);
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java
Vendored
+1 -2
View File
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 count: " + total);
BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online);
BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); 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, "Unique IPs: " + ips.size());
BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace);
BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace);
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java
-3
View File
@@ -161,9 +161,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); 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 final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java
+2 -3
View File
@@ -26,7 +26,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.TradeItem; 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."); LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders.");
if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME)
@@ -447,7 +446,7 @@ public class OfflineTraderTable
public static synchronized void removeTrader(int traderObjId) public static synchronized void removeTrader(int traderObjId)
{ {
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/World.java
+4
View File
@@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
public class World public class World
{ {
private static final Logger LOGGER = Logger.getLogger(World.class.getName()); 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. */ /** 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_X = -166168;
public static final int GRACIA_MAX_Z = 6105; public static final int GRACIA_MAX_Z = 6105;
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -2
View File
@@ -47,7 +47,6 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread; 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())) if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{ {
Disconnection.of(this).storeMe().deleteMe(); Disconnection.of(this).storeMe().deleteMe();
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
} }
} }
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+4 -4
View File
@@ -122,13 +122,13 @@ public class SystemPanel extends JPanel
public void run() public void run()
{ {
final int playerCount = World.getInstance().getPlayers().size(); 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); lblConnected.setText("Connected: " + playerCount);
lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT);
lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
} }
}, 1000, 1000); }, 1000, 1000);
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; 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.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
@@ -100,7 +100,7 @@ public class OfflineTradeUtil
return false; return false;
} }
GameServer.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(true);
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java
Vendored
+1 -2
View File
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 count: " + total);
BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online);
BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); 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, "Unique IPs: " + ips.size());
BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace);
BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace);
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java
-3
View File
@@ -161,9 +161,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); 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 final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java
+2 -3
View File
@@ -26,7 +26,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.TradeItem; 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."); LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders.");
if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME)
@@ -447,7 +446,7 @@ public class OfflineTraderTable
public static synchronized void removeTrader(int traderObjId) public static synchronized void removeTrader(int traderObjId)
{ {
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/World.java
+4
View File
@@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
public class World public class World
{ {
private static final Logger LOGGER = Logger.getLogger(World.class.getName()); 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. */ /** 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_X = -166168;
public static final int GRACIA_MAX_Z = 6105; public static final int GRACIA_MAX_Z = 6105;
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -2
View File
@@ -47,7 +47,6 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread; 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())) if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{ {
Disconnection.of(this).storeMe().deleteMe(); Disconnection.of(this).storeMe().deleteMe();
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
} }
} }
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+4 -4
View File
@@ -122,13 +122,13 @@ public class SystemPanel extends JPanel
public void run() public void run()
{ {
final int playerCount = World.getInstance().getPlayers().size(); 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); lblConnected.setText("Connected: " + playerCount);
lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT);
lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
} }
}, 1000, 1000); }, 1000, 1000);
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.util;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.data.sql.impl.OfflineTraderTable; 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.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
@@ -100,7 +100,7 @@ public class OfflineTradeUtil
return false; return false;
} }
GameServer.OFFLINE_TRADE_COUNT++; World.OFFLINE_TRADE_COUNT++;
final GameClient client = player.getClient(); final GameClient client = player.getClient();
client.close(true); client.close(true);
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminOnline.java
Vendored
+1 -2
View File
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; 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 count: " + total);
BuilderUtil.sendSysMessage(activeChar, "Total online: " + online); BuilderUtil.sendSysMessage(activeChar, "Total online: " + online);
BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline); 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, "Unique IPs: " + ips.size());
BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace); BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace);
BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace); BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace);
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java
-3
View File
@@ -161,9 +161,6 @@ public class GameServer
{ {
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName()); 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 final DeadLockDetector _deadDetectThread;
private static GameServer INSTANCE; private static GameServer INSTANCE;
public static final Calendar dateTimeServerStarted = Calendar.getInstance(); public static final Calendar dateTimeServerStarted = Calendar.getInstance();
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java
+2 -3
View File
@@ -26,7 +26,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.TradeItem; 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."); LOGGER.info(getClass().getSimpleName() + ": Loaded " + nTraders + " offline traders.");
if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME) if (!Config.STORE_OFFLINE_TRADE_IN_REALTIME)
@@ -447,7 +446,7 @@ public class OfflineTraderTable
public static synchronized void removeTrader(int traderObjId) public static synchronized void removeTrader(int traderObjId)
{ {
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER); PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/World.java
+4
View File
@@ -45,6 +45,10 @@ import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
public class World public class World
{ {
private static final Logger LOGGER = Logger.getLogger(World.class.getName()); 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. */ /** 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_X = -166168;
public static final int GRACIA_MAX_Z = 6105; public static final int GRACIA_MAX_Z = 6105;
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -2
View File
@@ -47,7 +47,6 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool; import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController; import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy; import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread; 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())) if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{ {
Disconnection.of(this).storeMe().deleteMe(); Disconnection.of(this).storeMe().deleteMe();
GameServer.OFFLINE_TRADE_COUNT--; World.OFFLINE_TRADE_COUNT--;
} }
} }
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+4 -4
View File
@@ -122,13 +122,13 @@ public class SystemPanel extends JPanel
public void run() public void run()
{ {
final int playerCount = World.getInstance().getPlayers().size(); 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); lblConnected.setText("Connected: " + playerCount);
lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT);
lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
} }
}, 1000, 1000); }, 1000, 1000);

Some files were not shown because too many files have changed in this diff Show More