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

Dropped GameGuard configs and redundant getClient method calls.

Browse Source
This commit is contained in:
MobiusDev
2018-06-19 00:54:12 +00:00
parent 304e82bba5
commit ba48bc2bba
29 changed files with 38 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_C6_Interlude/dist/game/config/main/developer.ini vendored
View File

@@ -105,13 +105,6 @@ InstantThreadPoolCount = -1
# Default: 2
ThreadsPerInstantThreadPool = 20
#---------------------------------------------------
# Enforce gameguard for clients
#---------------------------------------------------
# GameGuardL2NetCheck# check if connected client is going to use L2Net
GameGuardL2NetCheck = True
# This is the server id that the gameserver will request (i.e. 1 is Bartz)
RequestServerID = 1

3
L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java
View File

@@ -669,7 +669,6 @@ public final class Config
public static boolean GMAUDIT;
public static boolean LOG_CHAT;
public static boolean LOG_ITEMS;
public static boolean GAMEGUARD_L2NET_CHECK;
public static int SCHEDULED_THREAD_POOL_COUNT;
public static int THREADS_PER_SCHEDULED_THREAD_POOL;
@@ -2349,8 +2348,6 @@ public final class Config
LOG_CHAT = Boolean.valueOf(devSettings.getProperty("LogChat", "false"));
LOG_ITEMS = Boolean.valueOf(devSettings.getProperty("LogItems", "false"));
GAMEGUARD_L2NET_CHECK = Boolean.valueOf(devSettings.getProperty("GameGuardL2NetCheck", "false"));
SCHEDULED_THREAD_POOL_COUNT = Integer.parseInt(devSettings.getProperty("ScheduledThreadPoolCount", "-1"));
THREADS_PER_SCHEDULED_THREAD_POOL = Integer.parseInt(devSettings.getProperty("ThreadsPerScheduledThreadPool", "4"));
INSTANT_THREAD_POOL_COUNT = Integer.parseInt(devSettings.getProperty("InstantThreadPoolCount", "-1"));

31
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -1606,9 +1606,9 @@ public final class L2PcInstance extends L2Playable
*/
public String getAccountName()
{
if (getClient() != null)
if (_client != null)
{
return getClient().getAccountName();
return _client.getAccountName();
}
return _accountName;
}
@@ -7965,9 +7965,9 @@ public final class L2PcInstance extends L2Playable
if (Config.ANTI_FARM_IP_ENABLED)
{
if ((getClient() != null) && (targetPlayer.getClient() != null))
if ((_client != null) && (targetPlayer.getClient() != null))
{
final String ip1 = getClient().getConnection().getInetAddress().getHostAddress();
final String ip1 = _client.getConnection().getInetAddress().getHostAddress();
final String ip2 = targetPlayer.getClient().getConnection().getInetAddress().getHostAddress();
if (ip1.equals(ip2))
@@ -7992,7 +7992,7 @@ public final class L2PcInstance extends L2Playable
// IP check
if ((targetPlayer.getClient() != null) && (targetPlayer.getClient().getConnection() != null))
{
if (targetPlayer.getClient().getConnection().getInetAddress() != getClient().getConnection().getInetAddress())
if (targetPlayer.getClient().getConnection().getInetAddress() != _client.getConnection().getInetAddress())
{
if ((targetPlayer.getKarma() > 0) || (targetPlayer.getPvpFlag() > 0)) // killing target pk or in pvp
@@ -9049,7 +9049,7 @@ public final class L2PcInstance extends L2Playable
{
_privatestore = type;
if ((_privatestore == STORE_PRIVATE_NONE) && ((getClient() == null) || isInOfflineMode()))
if ((_privatestore == STORE_PRIVATE_NONE) && ((_client == null) || isInOfflineMode()))
{
store();
if (Config.OFFLINE_DISCONNECT_FINISHED)
@@ -9057,9 +9057,9 @@ public final class L2PcInstance extends L2Playable
PlayerCountManager.getInstance().decOfflineTradeCount();
deleteMe();
if (getClient() != null)
if (_client != null)
{
getClient().setActiveChar(null); // prevent deleteMe from being called a second time on disconnection
_client.setActiveChar(null); // prevent deleteMe from being called a second time on disconnection
}
}
}
@@ -15878,7 +15878,7 @@ public final class L2PcInstance extends L2Playable
return true;
}
final L2PcInstance player = getClient().getActiveChar();
final L2PcInstance player = _client.getActiveChar();
// We decided to put a kick because when a player is doing quest with a BOT he sends invalid bypass.
Util.handleIllegalPlayerAction(player, "[L2PcInstance] player [" + player.getName() + "] sent invalid bypass '" + cmd + "'", Config.DEFAULT_PUNISH);
return false;
@@ -18196,10 +18196,10 @@ public final class L2PcInstance extends L2Playable
int boxes_number = 0; // this one
final List<String> active_boxes = new ArrayList<>();
if ((getClient() != null) && (getClient().getConnection() != null) && !getClient().getConnection().isClosed() && (getClient().getConnection().getInetAddress() != null))
if ((_client != null) && (_client.getConnection() != null) && !_client.getConnection().isClosed() && (_client.getConnection().getInetAddress() != null))
{
final String thisip = getClient().getConnection().getInetAddress().getHostAddress();
final String thisip = _client.getConnection().getInetAddress().getHostAddress();
final Collection<L2PcInstance> allPlayers = L2World.getInstance().getAllPlayers();
for (L2PcInstance player : allPlayers)
{
@@ -18255,10 +18255,10 @@ public final class L2PcInstance extends L2Playable
public void refreshOtherBoxes()
{
if ((getClient() != null) && (getClient().getConnection() != null) && !getClient().getConnection().isClosed() && (getClient().getConnection().getInetAddress() != null))
if ((_client != null) && (_client.getConnection() != null) && !_client.getConnection().isClosed() && (_client.getConnection().getInetAddress() != null))
{
final String thisip = getClient().getConnection().getInetAddress().getHostAddress();
final String thisip = _client.getConnection().getInetAddress().getHostAddress();
final Collection<L2PcInstance> allPlayers = L2World.getInstance().getAllPlayers();
final L2PcInstance[] players = allPlayers.toArray(new L2PcInstance[allPlayers.size()]);
@@ -18274,9 +18274,6 @@ public final class L2PcInstance extends L2Playable
{
player._active_boxes = _active_boxes;
player.active_boxes_characters = active_boxes_characters;
/*
* LOGGER.info("Player "+player.getName()+" has this boxes"); for(String name:player.active_boxes_characters){ LOGGER.info("*** "+name+" ***"); }
*/
}
}
}
@@ -19025,7 +19022,7 @@ public final class L2PcInstance extends L2Playable
*/
public FloodProtectors getFloodProtectors()
{
return getClient().getFloodProtectors();
return _client.getFloodProtectors();
}
/**

12
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java
View File

@@ -16,9 +16,6 @@
*/
package com.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.crypt.nProtect;
/**
@@ -27,7 +24,6 @@ import com.l2jmobius.commons.crypt.nProtect;
public class GameGuardReply extends L2GameClientPacket
{
private final int[] _reply = new int[4];
private static final Logger LOGGER = Logger.getLogger(GameGuardReply.class.getName());
@Override
protected void readImpl()
@@ -47,14 +43,6 @@ public class GameGuardReply extends L2GameClientPacket
return;
}
// Cannot be reached with GameGuard: L2Net notification --> Close Client connection
if (Config.GAMEGUARD_L2NET_CHECK)
{
getClient().closeNow();
LOGGER.warning("Player with account name " + getClient().accountName + " kicked to use L2Net ");
return;
}
getClient().setGameGuardOk(true);
}
}