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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_1.0_Ertheia/dist/game/config/General.ini vendored
View File

@ -97,14 +97,6 @@ UseSuperHasteAsGMSpeed = False
# Server Security
# ---------------------------------------------------------------------------
# Enforce gameguard for clients. Sends a gameguard query on character login.
# Default: False
GameGuardEnforce = False
# Don't allow player to perform trade, talk with npc, or move until gameguard reply is received.
# Default: False
GameGuardProhibitAction = False
#Logging settings. The following four settings, while enabled, will increase writing to your hard drive(s) considerably. Depending on the size of your server, the amount of players, and other factors, you may suffer a noticable performance hit.
# Default: False
LogChat = False

4
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java
View File

@ -409,8 +409,6 @@ public final class Config
public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
public static boolean GM_DEBUG_HTML_PATHS;
public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
public static boolean GAMEGUARD_ENFORCE;
public static boolean GAMEGUARD_PROHIBITACTION;
public static boolean LOG_CHAT;
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
@ -1818,8 +1816,6 @@ public final class Config
GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
GM_DEBUG_HTML_PATHS = General.getBoolean("GMDebugHtmlPaths", true);
USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);
LOG_CHAT = General.getBoolean("LogChat", false);
LOG_AUTO_ANNOUNCEMENTS = General.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = General.getBoolean("LogItems", false);

6
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -906,7 +906,7 @@ public final class L2PcInstance extends L2Playable
public String getAccountName()
{
return getClient() == null ? getAccountNamePlayer() : getClient().getAccountName();
return _client == null ? getAccountNamePlayer() : _client.getAccountName();
}
public String getAccountNamePlayer()
@ -5757,7 +5757,7 @@ public final class L2PcInstance extends L2Playable
{
_privateStoreType = privateStoreType;
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((getClient() == null) || getClient().isDetached()))
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{
IdFactory.getInstance().releaseId(getObjectId());
Disconnection.of(this).storeMe().deleteMe();
@ -11973,7 +11973,7 @@ public final class L2PcInstance extends L2Playable
public FloodProtectors getFloodProtectors()
{
return getClient().getFloodProtectors();
return _client.getFloodProtectors();
}
public boolean isFlyingMounted()

8
L2J_Mobius_2.5_Underground/dist/game/config/General.ini vendored
View File

@ -97,14 +97,6 @@ UseSuperHasteAsGMSpeed = False
# Server Security
# ---------------------------------------------------------------------------
# Enforce gameguard for clients. Sends a gameguard query on character login.
# Default: False
GameGuardEnforce = False
# Don't allow player to perform trade, talk with npc, or move until gameguard reply is received.
# Default: False
GameGuardProhibitAction = False
#Logging settings. The following four settings, while enabled, will increase writing to your hard drive(s) considerably. Depending on the size of your server, the amount of players, and other factors, you may suffer a noticable performance hit.
# Default: False
LogChat = False

4
L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java
View File

@ -415,8 +415,6 @@ public final class Config
public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
public static boolean GM_DEBUG_HTML_PATHS;
public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
public static boolean GAMEGUARD_ENFORCE;
public static boolean GAMEGUARD_PROHIBITACTION;
public static boolean LOG_CHAT;
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
@ -1833,8 +1831,6 @@ public final class Config
GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
GM_DEBUG_HTML_PATHS = General.getBoolean("GMDebugHtmlPaths", true);
USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);
LOG_CHAT = General.getBoolean("LogChat", false);
LOG_AUTO_ANNOUNCEMENTS = General.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = General.getBoolean("LogItems", false);

6
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -912,7 +912,7 @@ public final class L2PcInstance extends L2Playable
public String getAccountName()
{
return getClient() == null ? getAccountNamePlayer() : getClient().getAccountName();
return _client == null ? getAccountNamePlayer() : _client.getAccountName();
}
public String getAccountNamePlayer()
@ -5763,7 +5763,7 @@ public final class L2PcInstance extends L2Playable
{
_privateStoreType = privateStoreType;
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((getClient() == null) || getClient().isDetached()))
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{
IdFactory.getInstance().releaseId(getObjectId());
Disconnection.of(this).storeMe().deleteMe();
@ -11980,7 +11980,7 @@ public final class L2PcInstance extends L2Playable
public FloodProtectors getFloodProtectors()
{
return getClient().getFloodProtectors();
return _client.getFloodProtectors();
}
public boolean isFlyingMounted()

8
L2J_Mobius_3.0_Helios/dist/game/config/General.ini vendored
View File

@ -97,14 +97,6 @@ UseSuperHasteAsGMSpeed = False
# Server Security
# ---------------------------------------------------------------------------
# Enforce gameguard for clients. Sends a gameguard query on character login.
# Default: False
GameGuardEnforce = False
# Don't allow player to perform trade, talk with npc, or move until gameguard reply is received.
# Default: False
GameGuardProhibitAction = False
#Logging settings. The following four settings, while enabled, will increase writing to your hard drive(s) considerably. Depending on the size of your server, the amount of players, and other factors, you may suffer a noticable performance hit.
# Default: False
LogChat = False

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java
View File

@ -415,8 +415,6 @@ public final class Config
public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
public static boolean GM_DEBUG_HTML_PATHS;
public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
public static boolean GAMEGUARD_ENFORCE;
public static boolean GAMEGUARD_PROHIBITACTION;
public static boolean LOG_CHAT;
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
@ -1841,8 +1839,6 @@ public final class Config
GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
GM_DEBUG_HTML_PATHS = General.getBoolean("GMDebugHtmlPaths", true);
USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);
LOG_CHAT = General.getBoolean("LogChat", false);
LOG_AUTO_ANNOUNCEMENTS = General.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = General.getBoolean("LogItems", false);

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -914,7 +914,7 @@ public final class L2PcInstance extends L2Playable
public String getAccountName()
{
return getClient() == null ? getAccountNamePlayer() : getClient().getAccountName();
return _client == null ? getAccountNamePlayer() : _client.getAccountName();
}
public String getAccountNamePlayer()
@ -5765,7 +5765,7 @@ public final class L2PcInstance extends L2Playable
{
_privateStoreType = privateStoreType;
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((getClient() == null) || getClient().isDetached()))
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{
IdFactory.getInstance().releaseId(getObjectId());
Disconnection.of(this).storeMe().deleteMe();
@ -11990,7 +11990,7 @@ public final class L2PcInstance extends L2Playable
public FloodProtectors getFloodProtectors()
{
return getClient().getFloodProtectors();
return _client.getFloodProtectors();
}
public boolean isFlyingMounted()

8
L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini vendored
View File

@ -97,14 +97,6 @@ UseSuperHasteAsGMSpeed = False
# Server Security
# ---------------------------------------------------------------------------
# Enforce gameguard for clients. Sends a gameguard query on character login.
# Default: False
GameGuardEnforce = False
# Don't allow player to perform trade, talk with npc, or move until gameguard reply is received.
# Default: False
GameGuardProhibitAction = False
#Logging settings. The following four settings, while enabled, will increase writing to your hard drive(s) considerably. Depending on the size of your server, the amount of players, and other factors, you may suffer a noticable performance hit.
# Default: False
LogChat = False

4
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java
View File

@ -415,8 +415,6 @@ public final class Config
public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
public static boolean GM_DEBUG_HTML_PATHS;
public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
public static boolean GAMEGUARD_ENFORCE;
public static boolean GAMEGUARD_PROHIBITACTION;
public static boolean LOG_CHAT;
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
@ -1839,8 +1837,6 @@ public final class Config
GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
GM_DEBUG_HTML_PATHS = General.getBoolean("GMDebugHtmlPaths", true);
USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);
LOG_CHAT = General.getBoolean("LogChat", false);
LOG_AUTO_ANNOUNCEMENTS = General.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = General.getBoolean("LogItems", false);

6
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -925,7 +925,7 @@ public final class L2PcInstance extends L2Playable
public String getAccountName()
{
return getClient() == null ? getAccountNamePlayer() : getClient().getAccountName();
return _client == null ? getAccountNamePlayer() : _client.getAccountName();
}
public String getAccountNamePlayer()
@ -5762,7 +5762,7 @@ public final class L2PcInstance extends L2Playable
{
_privateStoreType = privateStoreType;
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((getClient() == null) || getClient().isDetached()))
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{
IdFactory.getInstance().releaseId(getObjectId());
Disconnection.of(this).storeMe().deleteMe();
@ -11973,7 +11973,7 @@ public final class L2PcInstance extends L2Playable
public FloodProtectors getFloodProtectors()
{
return getClient().getFloodProtectors();
return _client.getFloodProtectors();
}
public boolean isFlyingMounted()

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);
}
}

8
L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini vendored
View File

@ -97,14 +97,6 @@ UseSuperHasteAsGMSpeed = False
# Server Security
# ---------------------------------------------------------------------------
# Enforce gameguard for clients. Sends a gameguard query on character login.
# Default: False
GameGuardEnforce = False
# Don't allow player to perform trade, talk with npc, or move until gameguard reply is received.
# Default: False
GameGuardProhibitAction = False
#Logging settings. The following four settings, while enabled, will increase writing to your hard drive(s) considerably. Depending on the size of your server, the amount of players, and other factors, you may suffer a noticable performance hit.
# Default: False
LogChat = False

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java
View File

@ -479,8 +479,6 @@ public final class Config
public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
public static boolean GM_DEBUG_HTML_PATHS;
public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
public static boolean GAMEGUARD_ENFORCE;
public static boolean GAMEGUARD_PROHIBITACTION;
public static boolean LOG_CHAT;
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
@ -2007,8 +2005,6 @@ public final class Config
GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
GM_DEBUG_HTML_PATHS = General.getBoolean("GMDebugHtmlPaths", true);
USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);
LOG_CHAT = General.getBoolean("LogChat", false);
LOG_AUTO_ANNOUNCEMENTS = General.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = General.getBoolean("LogItems", false);

21
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -158,7 +158,6 @@ import com.l2jmobius.gameserver.model.actor.stat.PcStat;
import com.l2jmobius.gameserver.model.actor.status.PcStatus;
import com.l2jmobius.gameserver.model.actor.tasks.player.DismountTask;
import com.l2jmobius.gameserver.model.actor.tasks.player.FameTask;
import com.l2jmobius.gameserver.model.actor.tasks.player.GameGuardCheckTask;
import com.l2jmobius.gameserver.model.actor.tasks.player.InventoryEnableTask;
import com.l2jmobius.gameserver.model.actor.tasks.player.LookingForFishTask;
import com.l2jmobius.gameserver.model.actor.tasks.player.PetFeedTask;
@ -278,7 +277,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem;
import com.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo;
import com.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType;
import com.l2jmobius.gameserver.network.serverpackets.FriendStatusPacket;
import com.l2jmobius.gameserver.network.serverpackets.GameGuardQuery;
import com.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
import com.l2jmobius.gameserver.network.serverpackets.HennaInfo;
import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
@ -980,7 +978,7 @@ public final class L2PcInstance extends L2Playable
public String getAccountName()
{
return getClient() == null ? getAccountNamePlayer() : getClient().getAccountName();
return _client == null ? getAccountNamePlayer() : _client.getAccountName();
}
public String getAccountNamePlayer()
@ -4197,19 +4195,6 @@ public final class L2PcInstance extends L2Playable
return (getClanId() == 0) || (getClan().getAllyId() == 0) ? 0 : getClan().getAllyCrestId();
}
public void queryGameGuard()
{
if (getClient() != null)
{
getClient().setGameGuardOk(false);
sendPacket(GameGuardQuery.STATIC_PACKET);
}
if (Config.GAMEGUARD_ENFORCE)
{
ThreadPool.schedule(new GameGuardCheckTask(this), 30 * 1000);
}
}
/**
* Send a Server->Client packet StatusUpdate to the L2PcInstance.
*/
@ -5927,7 +5912,7 @@ public final class L2PcInstance extends L2Playable
{
_privateStoreType = privateStoreType;
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((getClient() == null) || getClient().isDetached()))
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{
IdFactory.getInstance().releaseId(getObjectId());
Disconnection.of(this).storeMe().deleteMe();
@ -12787,7 +12772,7 @@ public final class L2PcInstance extends L2Playable
public FloodProtectors getFloodProtectors()
{
return getClient().getFloodProtectors();
return _client.getFloodProtectors();
}
public boolean isFlyingMounted()

3
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -406,9 +406,6 @@ public class EnterWorld implements IClientIncomingPacket
// Send Item List
client.sendPacket(new ItemList(activeChar, false));
// Send GG check
activeChar.queryGameGuard();
// Send Teleport Bookmark List
client.sendPacket(new ExGetBookMarkInfoPacket(activeChar));

8
L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini vendored
View File

@ -97,14 +97,6 @@ UseSuperHasteAsGMSpeed = False
# Server Security
# ---------------------------------------------------------------------------
# Enforce gameguard for clients. Sends a gameguard query on character login.
# Default: False
GameGuardEnforce = False
# Don't allow player to perform trade, talk with npc, or move until gameguard reply is received.
# Default: False
GameGuardProhibitAction = False
#Logging settings. The following four settings, while enabled, will increase writing to your hard drive(s) considerably. Depending on the size of your server, the amount of players, and other factors, you may suffer a noticable performance hit.
# Default: False
LogChat = False

4
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java
View File

@ -415,8 +415,6 @@ public final class Config
public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
public static boolean GM_DEBUG_HTML_PATHS;
public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
public static boolean GAMEGUARD_ENFORCE;
public static boolean GAMEGUARD_PROHIBITACTION;
public static boolean LOG_CHAT;
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
@ -1765,8 +1763,6 @@ public final class Config
GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
GM_DEBUG_HTML_PATHS = General.getBoolean("GMDebugHtmlPaths", true);
USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);
LOG_CHAT = General.getBoolean("LogChat", false);
LOG_AUTO_ANNOUNCEMENTS = General.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = General.getBoolean("LogItems", false);

6
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -908,7 +908,7 @@ public final class L2PcInstance extends L2Playable
public String getAccountName()
{
return getClient() == null ? getAccountNamePlayer() : getClient().getAccountName();
return _client == null ? getAccountNamePlayer() : _client.getAccountName();
}
public String getAccountNamePlayer()
@ -5729,7 +5729,7 @@ public final class L2PcInstance extends L2Playable
{
_privateStoreType = privateStoreType;
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((getClient() == null) || getClient().isDetached()))
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{
IdFactory.getInstance().releaseId(getObjectId());
Disconnection.of(this).storeMe().deleteMe();
@ -11821,7 +11821,7 @@ public final class L2PcInstance extends L2Playable
public FloodProtectors getFloodProtectors()
{
return getClient().getFloodProtectors();
return _client.getFloodProtectors();
}
public boolean isFlyingMounted()

8
L2J_Mobius_Classic_2.1_Zaken/dist/game/config/General.ini vendored
View File

@ -97,14 +97,6 @@ UseSuperHasteAsGMSpeed = False
# Server Security
# ---------------------------------------------------------------------------
# Enforce gameguard for clients. Sends a gameguard query on character login.
# Default: False
GameGuardEnforce = False
# Don't allow player to perform trade, talk with npc, or move until gameguard reply is received.
# Default: False
GameGuardProhibitAction = False
#Logging settings. The following four settings, while enabled, will increase writing to your hard drive(s) considerably. Depending on the size of your server, the amount of players, and other factors, you may suffer a noticable performance hit.
# Default: False
LogChat = False

4
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/Config.java
View File

@ -415,8 +415,6 @@ public final class Config
public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
public static boolean GM_DEBUG_HTML_PATHS;
public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
public static boolean GAMEGUARD_ENFORCE;
public static boolean GAMEGUARD_PROHIBITACTION;
public static boolean LOG_CHAT;
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
@ -1769,8 +1767,6 @@ public final class Config
GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
GM_DEBUG_HTML_PATHS = General.getBoolean("GMDebugHtmlPaths", true);
USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);
LOG_CHAT = General.getBoolean("LogChat", false);
LOG_AUTO_ANNOUNCEMENTS = General.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = General.getBoolean("LogItems", false);

6
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -908,7 +908,7 @@ public final class L2PcInstance extends L2Playable
public String getAccountName()
{
return getClient() == null ? getAccountNamePlayer() : getClient().getAccountName();
return _client == null ? getAccountNamePlayer() : _client.getAccountName();
}
public String getAccountNamePlayer()
@ -5729,7 +5729,7 @@ public final class L2PcInstance extends L2Playable
{
_privateStoreType = privateStoreType;
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((getClient() == null) || getClient().isDetached()))
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{
IdFactory.getInstance().releaseId(getObjectId());
Disconnection.of(this).storeMe().deleteMe();
@ -11821,7 +11821,7 @@ public final class L2PcInstance extends L2Playable
public FloodProtectors getFloodProtectors()
{
return getClient().getFloodProtectors();
return _client.getFloodProtectors();
}
public boolean isFlyingMounted()

8
L2J_Mobius_Classic_2.2_Antharas/dist/game/config/General.ini vendored
View File

@ -97,14 +97,6 @@ UseSuperHasteAsGMSpeed = False
# Server Security
# ---------------------------------------------------------------------------
# Enforce gameguard for clients. Sends a gameguard query on character login.
# Default: False
GameGuardEnforce = False
# Don't allow player to perform trade, talk with npc, or move until gameguard reply is received.
# Default: False
GameGuardProhibitAction = False
#Logging settings. The following four settings, while enabled, will increase writing to your hard drive(s) considerably. Depending on the size of your server, the amount of players, and other factors, you may suffer a noticable performance hit.
# Default: False
LogChat = False

4
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/Config.java
View File

@ -415,8 +415,6 @@ public final class Config
public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
public static boolean GM_DEBUG_HTML_PATHS;
public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
public static boolean GAMEGUARD_ENFORCE;
public static boolean GAMEGUARD_PROHIBITACTION;
public static boolean LOG_CHAT;
public static boolean LOG_AUTO_ANNOUNCEMENTS;
public static boolean LOG_ITEMS;
@ -1769,8 +1767,6 @@ public final class Config
GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
GM_DEBUG_HTML_PATHS = General.getBoolean("GMDebugHtmlPaths", true);
USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);
LOG_CHAT = General.getBoolean("LogChat", false);
LOG_AUTO_ANNOUNCEMENTS = General.getBoolean("LogAutoAnnouncements", false);
LOG_ITEMS = General.getBoolean("LogItems", false);

6
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -908,7 +908,7 @@ public final class L2PcInstance extends L2Playable
public String getAccountName()
{
return getClient() == null ? getAccountNamePlayer() : getClient().getAccountName();
return _client == null ? getAccountNamePlayer() : _client.getAccountName();
}
public String getAccountNamePlayer()
@ -5731,7 +5731,7 @@ public final class L2PcInstance extends L2Playable
{
_privateStoreType = privateStoreType;
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((getClient() == null) || getClient().isDetached()))
if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached()))
{
IdFactory.getInstance().releaseId(getObjectId());
Disconnection.of(this).storeMe().deleteMe();
@ -11823,7 +11823,7 @@ public final class L2PcInstance extends L2Playable
public FloodProtectors getFloodProtectors()
{
return getClient().getFloodProtectors();
return _client.getFloodProtectors();
}
public boolean isFlyingMounted()