Dropped GameGuard configs and redundant getClient method calls.

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

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

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

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()

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