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

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

@ -135,9 +135,6 @@ public class GameServer
{
private static final Logger LOGGER = Logger.getLogger(GameServer.class.getName());
public static volatile int MAX_CONNECTED_COUNT = 0;
public static volatile int OFFLINE_TRADE_COUNT = 0;
private static SelectorThread<GameClient> _selectorThread;
private static LoginServerThread _loginThread;
private static GamePacketHandler _gamePacketHandler;

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

@ -24,7 +24,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.ManufactureList;
@ -288,7 +287,7 @@ public class OfflineTradeTable
}
rs.close();
stm.close();
GameServer.OFFLINE_TRADE_COUNT = nTraders;
World.OFFLINE_TRADE_COUNT = nTraders;
LOGGER.info("Loaded " + nTraders + " offline traders.");
}
catch (Exception e)

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminOnline.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers;
import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -95,7 +94,7 @@ public class AdminOnline implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Total count: " + total);
BuilderUtil.sendSysMessage(activeChar, "Total online: " + online);
BuilderUtil.sendSysMessage(activeChar, "Total offline: " + offline);
BuilderUtil.sendSysMessage(activeChar, "Max connected: " + GameServer.MAX_CONNECTED_COUNT);
BuilderUtil.sendSysMessage(activeChar, "Max connected: " + World.MAX_CONNECTED_COUNT);
BuilderUtil.sendSysMessage(activeChar, "Unique IPs: " + ips.size());
BuilderUtil.sendSysMessage(activeChar, "In peace zone: " + peace);
BuilderUtil.sendSysMessage(activeChar, "Not in peace zone: " + notPeace);

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/World.java
View File

@ -23,7 +23,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -35,6 +34,9 @@ public class World
{
private static final Logger LOGGER = Logger.getLogger(World.class.getName());
public static volatile int MAX_CONNECTED_COUNT = 0;
public static volatile int OFFLINE_TRADE_COUNT = 0;
public static final int SHIFT_BY = 12;
// Geodata min/max tiles
@ -446,7 +448,7 @@ public class World
{
if (object.getActingPlayer().isInOfflineMode())
{
GameServer.OFFLINE_TRADE_COUNT--;
OFFLINE_TRADE_COUNT--;
}
if (!((PlayerInstance) object).isTeleporting())

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

@ -39,7 +39,6 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.LoginServerThread;
@ -7473,7 +7472,7 @@ public class PlayerInstance extends Playable
store();
if (Config.OFFLINE_DISCONNECT_FINISHED)
{
GameServer.OFFLINE_TRADE_COUNT--;
World.OFFLINE_TRADE_COUNT--;
deleteMe();
if (_client != null)

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

@ -36,7 +36,6 @@ import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.mmocore.MMOClient;
import org.l2jmobius.commons.mmocore.MMOConnection;
import org.l2jmobius.commons.mmocore.ReceivablePacket;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.LoginServerThread.SessionKey;
import org.l2jmobius.gameserver.datatables.OfflineTradeTable;
@ -752,7 +751,7 @@ public class GameClient extends MMOClient<MMOConnection<GameClient>> implements
}
OfflineTradeTable.storeOffliner(player);
GameServer.OFFLINE_TRADE_COUNT++;
World.OFFLINE_TRADE_COUNT++;
return;
}
}

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java
View File

@ -129,13 +129,13 @@ public class SystemPanel extends JPanel
public void run()
{
final int playerCount = World.getInstance().getAllPlayers().size();
if (GameServer.MAX_CONNECTED_COUNT < playerCount)
if (World.MAX_CONNECTED_COUNT < playerCount)
{
GameServer.MAX_CONNECTED_COUNT = playerCount;
World.MAX_CONNECTED_COUNT = playerCount;
}
lblConnected.setText("Connected: " + playerCount);
lblMaxConnected.setText("Max connected: " + GameServer.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + GameServer.OFFLINE_TRADE_COUNT);
lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT);
lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT);
lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
}
}, 1000, 1000);