Removed known command. Also NPC abnormal broadcast fix.

This commit is contained in:
MobiusDev 2018-09-23 18:50:42 +00:00
parent 94887eab04
commit b87d0427a3
48 changed files with 44 additions and 265 deletions

View File

@ -576,7 +576,6 @@
<!-- ADMIN TEST --> <!-- ADMIN TEST -->
<admin command="admin_stats" accessLevel="100" /> <admin command="admin_stats" accessLevel="100" />
<admin command="admin_skill_test" accessLevel="100" /> <admin command="admin_skill_test" accessLevel="100" />
<admin command="admin_known" accessLevel="100" />
<!-- ADMIN TVT EVENT --> <!-- ADMIN TVT EVENT -->
<admin command="admin_tvt_add" accessLevel="100" /> <admin command="admin_tvt_add" accessLevel="100" />

View File

@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@ -38,8 +37,7 @@ public class AdminTest implements IAdminCommandHandler
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_stats", "admin_stats",
"admin_skill_test", "admin_skill_test"
"admin_known"
}; };
@Override @Override
@ -77,14 +75,6 @@ public class AdminTest implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>"); BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>");
} }
} }
else if (command.equals("admin_known on"))
{
Config.CHECK_KNOWN = true;
}
else if (command.equals("admin_known off"))
{
Config.CHECK_KNOWN = false;
}
return true; return true;
} }

View File

@ -773,7 +773,6 @@ public final class Config
// No classification assigned to the following yet // No classification assigned to the following yet
// -------------------------------------------------- // --------------------------------------------------
public static int MAX_ITEM_IN_PACKET; public static int MAX_ITEM_IN_PACKET;
public static boolean CHECK_KNOWN;
public static int GAME_SERVER_LOGIN_PORT; public static int GAME_SERVER_LOGIN_PORT;
public static String GAME_SERVER_LOGIN_HOST; public static String GAME_SERVER_LOGIN_HOST;
public static List<String> GAME_SERVER_SUBNETS; public static List<String> GAME_SERVER_SUBNETS;

View File

@ -93,7 +93,6 @@ import com.l2jmobius.gameserver.network.serverpackets.FakePlayerInfo;
import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfo; import com.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfoAbnormalVisualEffect;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay; import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo; import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo;
import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
@ -240,7 +239,7 @@ public class L2Npc extends L2Character
*/ */
public boolean hasRandomAnimation() public boolean hasRandomAnimation()
{ {
return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && (getAiType() != AIType.CORPSE));
} }
/** /**
@ -383,7 +382,7 @@ public class L2Npc extends L2Character
} }
else else
{ {
player.sendPacket(new NpcInfoAbnormalVisualEffect(this)); player.sendPacket(new NpcInfo(this));
} }
}); });
} }
@ -1294,11 +1293,6 @@ public class L2Npc extends L2Character
{ {
if (isVisibleFor(activeChar)) if (isVisibleFor(activeChar))
{ {
if (Config.CHECK_KNOWN && activeChar.isGM())
{
activeChar.sendMessage("Added NPC: " + getName());
}
if (_isFakePlayer) if (_isFakePlayer)
{ {
activeChar.sendPacket(new FakePlayerInfo(this)); activeChar.sendPacket(new FakePlayerInfo(this));
@ -1337,7 +1331,7 @@ public class L2Npc extends L2Character
@Override @Override
public boolean isMovementDisabled() public boolean isMovementDisabled()
{ {
return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; return super.isMovementDisabled() || !getTemplate().canMove() || (getAiType() == AIType.CORPSE);
} }
public AIType getAiType() public AIType getAiType()

View File

@ -576,7 +576,6 @@
<!-- ADMIN TEST --> <!-- ADMIN TEST -->
<admin command="admin_stats" accessLevel="100" /> <admin command="admin_stats" accessLevel="100" />
<admin command="admin_skill_test" accessLevel="100" /> <admin command="admin_skill_test" accessLevel="100" />
<admin command="admin_known" accessLevel="100" />
<!-- ADMIN TVT EVENT --> <!-- ADMIN TVT EVENT -->
<admin command="admin_tvt_add" accessLevel="100" /> <admin command="admin_tvt_add" accessLevel="100" />

View File

@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@ -38,8 +37,7 @@ public class AdminTest implements IAdminCommandHandler
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_stats", "admin_stats",
"admin_skill_test", "admin_skill_test"
"admin_known"
}; };
@Override @Override
@ -77,14 +75,6 @@ public class AdminTest implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>"); BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>");
} }
} }
else if (command.equals("admin_known on"))
{
Config.CHECK_KNOWN = true;
}
else if (command.equals("admin_known off"))
{
Config.CHECK_KNOWN = false;
}
return true; return true;
} }

View File

@ -780,7 +780,6 @@ public final class Config
// No classification assigned to the following yet // No classification assigned to the following yet
// -------------------------------------------------- // --------------------------------------------------
public static int MAX_ITEM_IN_PACKET; public static int MAX_ITEM_IN_PACKET;
public static boolean CHECK_KNOWN;
public static int GAME_SERVER_LOGIN_PORT; public static int GAME_SERVER_LOGIN_PORT;
public static String GAME_SERVER_LOGIN_HOST; public static String GAME_SERVER_LOGIN_HOST;
public static List<String> GAME_SERVER_SUBNETS; public static List<String> GAME_SERVER_SUBNETS;

View File

@ -93,7 +93,6 @@ import com.l2jmobius.gameserver.network.serverpackets.FakePlayerInfo;
import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfo; import com.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfoAbnormalVisualEffect;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay; import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo; import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo;
import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
@ -240,7 +239,7 @@ public class L2Npc extends L2Character
*/ */
public boolean hasRandomAnimation() public boolean hasRandomAnimation()
{ {
return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && (getAiType() != AIType.CORPSE));
} }
/** /**
@ -383,7 +382,7 @@ public class L2Npc extends L2Character
} }
else else
{ {
player.sendPacket(new NpcInfoAbnormalVisualEffect(this)); player.sendPacket(new NpcInfo(this));
} }
}); });
} }
@ -1294,11 +1293,6 @@ public class L2Npc extends L2Character
{ {
if (isVisibleFor(activeChar)) if (isVisibleFor(activeChar))
{ {
if (Config.CHECK_KNOWN && activeChar.isGM())
{
activeChar.sendMessage("Added NPC: " + getName());
}
if (_isFakePlayer) if (_isFakePlayer)
{ {
activeChar.sendPacket(new FakePlayerInfo(this)); activeChar.sendPacket(new FakePlayerInfo(this));
@ -1337,7 +1331,7 @@ public class L2Npc extends L2Character
@Override @Override
public boolean isMovementDisabled() public boolean isMovementDisabled()
{ {
return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; return super.isMovementDisabled() || !getTemplate().canMove() || (getAiType() == AIType.CORPSE);
} }
public AIType getAiType() public AIType getAiType()

View File

@ -576,7 +576,6 @@
<!-- ADMIN TEST --> <!-- ADMIN TEST -->
<admin command="admin_stats" accessLevel="100" /> <admin command="admin_stats" accessLevel="100" />
<admin command="admin_skill_test" accessLevel="100" /> <admin command="admin_skill_test" accessLevel="100" />
<admin command="admin_known" accessLevel="100" />
<!-- ADMIN TVT EVENT --> <!-- ADMIN TVT EVENT -->
<admin command="admin_tvt_add" accessLevel="100" /> <admin command="admin_tvt_add" accessLevel="100" />

View File

@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@ -38,8 +37,7 @@ public class AdminTest implements IAdminCommandHandler
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_stats", "admin_stats",
"admin_skill_test", "admin_skill_test"
"admin_known"
}; };
@Override @Override
@ -77,14 +75,6 @@ public class AdminTest implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>"); BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>");
} }
} }
else if (command.equals("admin_known on"))
{
Config.CHECK_KNOWN = true;
}
else if (command.equals("admin_known off"))
{
Config.CHECK_KNOWN = false;
}
return true; return true;
} }

View File

@ -781,7 +781,6 @@ public final class Config
// No classification assigned to the following yet // No classification assigned to the following yet
// -------------------------------------------------- // --------------------------------------------------
public static int MAX_ITEM_IN_PACKET; public static int MAX_ITEM_IN_PACKET;
public static boolean CHECK_KNOWN;
public static int GAME_SERVER_LOGIN_PORT; public static int GAME_SERVER_LOGIN_PORT;
public static String GAME_SERVER_LOGIN_HOST; public static String GAME_SERVER_LOGIN_HOST;
public static List<String> GAME_SERVER_SUBNETS; public static List<String> GAME_SERVER_SUBNETS;

View File

@ -93,7 +93,6 @@ import com.l2jmobius.gameserver.network.serverpackets.FakePlayerInfo;
import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfo; import com.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfoAbnormalVisualEffect;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay; import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo; import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo;
import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
@ -240,7 +239,7 @@ public class L2Npc extends L2Character
*/ */
public boolean hasRandomAnimation() public boolean hasRandomAnimation()
{ {
return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && (getAiType() != AIType.CORPSE));
} }
/** /**
@ -383,7 +382,7 @@ public class L2Npc extends L2Character
} }
else else
{ {
player.sendPacket(new NpcInfoAbnormalVisualEffect(this)); player.sendPacket(new NpcInfo(this));
} }
}); });
} }
@ -1294,11 +1293,6 @@ public class L2Npc extends L2Character
{ {
if (isVisibleFor(activeChar)) if (isVisibleFor(activeChar))
{ {
if (Config.CHECK_KNOWN && activeChar.isGM())
{
activeChar.sendMessage("Added NPC: " + getName());
}
if (_isFakePlayer) if (_isFakePlayer)
{ {
activeChar.sendPacket(new FakePlayerInfo(this)); activeChar.sendPacket(new FakePlayerInfo(this));
@ -1337,7 +1331,7 @@ public class L2Npc extends L2Character
@Override @Override
public boolean isMovementDisabled() public boolean isMovementDisabled()
{ {
return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; return super.isMovementDisabled() || !getTemplate().canMove() || (getAiType() == AIType.CORPSE);
} }
public AIType getAiType() public AIType getAiType()

View File

@ -576,7 +576,6 @@
<!-- ADMIN TEST --> <!-- ADMIN TEST -->
<admin command="admin_stats" accessLevel="100" /> <admin command="admin_stats" accessLevel="100" />
<admin command="admin_skill_test" accessLevel="100" /> <admin command="admin_skill_test" accessLevel="100" />
<admin command="admin_known" accessLevel="100" />
<!-- ADMIN TVT EVENT --> <!-- ADMIN TVT EVENT -->
<admin command="admin_tvt_add" accessLevel="100" /> <admin command="admin_tvt_add" accessLevel="100" />

View File

@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@ -38,8 +37,7 @@ public class AdminTest implements IAdminCommandHandler
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_stats", "admin_stats",
"admin_skill_test", "admin_skill_test"
"admin_known"
}; };
@Override @Override
@ -77,14 +75,6 @@ public class AdminTest implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>"); BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>");
} }
} }
else if (command.equals("admin_known on"))
{
Config.CHECK_KNOWN = true;
}
else if (command.equals("admin_known off"))
{
Config.CHECK_KNOWN = false;
}
return true; return true;
} }

View File

@ -774,7 +774,6 @@ public final class Config
// No classification assigned to the following yet // No classification assigned to the following yet
// -------------------------------------------------- // --------------------------------------------------
public static int MAX_ITEM_IN_PACKET; public static int MAX_ITEM_IN_PACKET;
public static boolean CHECK_KNOWN;
public static int GAME_SERVER_LOGIN_PORT; public static int GAME_SERVER_LOGIN_PORT;
public static String GAME_SERVER_LOGIN_HOST; public static String GAME_SERVER_LOGIN_HOST;
public static List<String> GAME_SERVER_SUBNETS; public static List<String> GAME_SERVER_SUBNETS;

View File

@ -93,7 +93,6 @@ import com.l2jmobius.gameserver.network.serverpackets.FakePlayerInfo;
import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfo; import com.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfoAbnormalVisualEffect;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay; import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo; import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo;
import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
@ -240,7 +239,7 @@ public class L2Npc extends L2Character
*/ */
public boolean hasRandomAnimation() public boolean hasRandomAnimation()
{ {
return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && (getAiType() != AIType.CORPSE));
} }
/** /**
@ -383,7 +382,7 @@ public class L2Npc extends L2Character
} }
else else
{ {
player.sendPacket(new NpcInfoAbnormalVisualEffect(this)); player.sendPacket(new NpcInfo(this));
} }
}); });
} }
@ -1294,11 +1293,6 @@ public class L2Npc extends L2Character
{ {
if (isVisibleFor(activeChar)) if (isVisibleFor(activeChar))
{ {
if (Config.CHECK_KNOWN && activeChar.isGM())
{
activeChar.sendMessage("Added NPC: " + getName());
}
if (_isFakePlayer) if (_isFakePlayer)
{ {
activeChar.sendPacket(new FakePlayerInfo(this)); activeChar.sendPacket(new FakePlayerInfo(this));
@ -1337,7 +1331,7 @@ public class L2Npc extends L2Character
@Override @Override
public boolean isMovementDisabled() public boolean isMovementDisabled()
{ {
return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; return super.isMovementDisabled() || !getTemplate().canMove() || (getAiType() == AIType.CORPSE);
} }
public AIType getAiType() public AIType getAiType()

View File

@ -576,7 +576,6 @@
<!-- ADMIN TEST --> <!-- ADMIN TEST -->
<admin command="admin_stats" accessLevel="100" /> <admin command="admin_stats" accessLevel="100" />
<admin command="admin_skill_test" accessLevel="100" /> <admin command="admin_skill_test" accessLevel="100" />
<admin command="admin_known" accessLevel="100" />
<!-- ADMIN TVT EVENT --> <!-- ADMIN TVT EVENT -->
<admin command="admin_tvt_add" accessLevel="100" /> <admin command="admin_tvt_add" accessLevel="100" />

View File

@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@ -38,8 +37,7 @@ public class AdminTest implements IAdminCommandHandler
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_stats", "admin_stats",
"admin_skill_test", "admin_skill_test"
"admin_known"
}; };
@Override @Override
@ -77,14 +75,6 @@ public class AdminTest implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>"); BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>");
} }
} }
else if (command.equals("admin_known on"))
{
Config.CHECK_KNOWN = true;
}
else if (command.equals("admin_known off"))
{
Config.CHECK_KNOWN = false;
}
return true; return true;
} }

View File

@ -774,7 +774,6 @@ public final class Config
// No classification assigned to the following yet // No classification assigned to the following yet
// -------------------------------------------------- // --------------------------------------------------
public static int MAX_ITEM_IN_PACKET; public static int MAX_ITEM_IN_PACKET;
public static boolean CHECK_KNOWN;
public static int GAME_SERVER_LOGIN_PORT; public static int GAME_SERVER_LOGIN_PORT;
public static String GAME_SERVER_LOGIN_HOST; public static String GAME_SERVER_LOGIN_HOST;
public static List<String> GAME_SERVER_SUBNETS; public static List<String> GAME_SERVER_SUBNETS;

View File

@ -93,7 +93,6 @@ import com.l2jmobius.gameserver.network.serverpackets.FakePlayerInfo;
import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfo; import com.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfoAbnormalVisualEffect;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay; import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo; import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo;
import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
@ -240,7 +239,7 @@ public class L2Npc extends L2Character
*/ */
public boolean hasRandomAnimation() public boolean hasRandomAnimation()
{ {
return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && (getAiType() != AIType.CORPSE));
} }
/** /**
@ -383,7 +382,7 @@ public class L2Npc extends L2Character
} }
else else
{ {
player.sendPacket(new NpcInfoAbnormalVisualEffect(this)); player.sendPacket(new NpcInfo(this));
} }
}); });
} }
@ -1294,11 +1293,6 @@ public class L2Npc extends L2Character
{ {
if (isVisibleFor(activeChar)) if (isVisibleFor(activeChar))
{ {
if (Config.CHECK_KNOWN && activeChar.isGM())
{
activeChar.sendMessage("Added NPC: " + getName());
}
if (_isFakePlayer) if (_isFakePlayer)
{ {
activeChar.sendPacket(new FakePlayerInfo(this)); activeChar.sendPacket(new FakePlayerInfo(this));
@ -1337,7 +1331,7 @@ public class L2Npc extends L2Character
@Override @Override
public boolean isMovementDisabled() public boolean isMovementDisabled()
{ {
return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; return super.isMovementDisabled() || !getTemplate().canMove() || (getAiType() == AIType.CORPSE);
} }
public AIType getAiType() public AIType getAiType()

View File

@ -576,7 +576,6 @@
<!-- ADMIN TEST --> <!-- ADMIN TEST -->
<admin command="admin_stats" accessLevel="100" /> <admin command="admin_stats" accessLevel="100" />
<admin command="admin_skill_test" accessLevel="100" /> <admin command="admin_skill_test" accessLevel="100" />
<admin command="admin_known" accessLevel="100" />
<!-- ADMIN TVT EVENT --> <!-- ADMIN TVT EVENT -->
<admin command="admin_tvt_add" accessLevel="100" /> <admin command="admin_tvt_add" accessLevel="100" />

View File

@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@ -38,8 +37,7 @@ public class AdminTest implements IAdminCommandHandler
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_stats", "admin_stats",
"admin_skill_test", "admin_skill_test"
"admin_known"
}; };
@Override @Override
@ -77,14 +75,6 @@ public class AdminTest implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>"); BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>");
} }
} }
else if (command.equals("admin_known on"))
{
Config.CHECK_KNOWN = true;
}
else if (command.equals("admin_known off"))
{
Config.CHECK_KNOWN = false;
}
return true; return true;
} }

View File

@ -774,7 +774,6 @@ public final class Config
// No classification assigned to the following yet // No classification assigned to the following yet
// -------------------------------------------------- // --------------------------------------------------
public static int MAX_ITEM_IN_PACKET; public static int MAX_ITEM_IN_PACKET;
public static boolean CHECK_KNOWN;
public static int GAME_SERVER_LOGIN_PORT; public static int GAME_SERVER_LOGIN_PORT;
public static String GAME_SERVER_LOGIN_HOST; public static String GAME_SERVER_LOGIN_HOST;
public static List<String> GAME_SERVER_SUBNETS; public static List<String> GAME_SERVER_SUBNETS;

View File

@ -93,7 +93,6 @@ import com.l2jmobius.gameserver.network.serverpackets.FakePlayerInfo;
import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfo; import com.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfoAbnormalVisualEffect;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay; import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo; import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo;
import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
@ -240,7 +239,7 @@ public class L2Npc extends L2Character
*/ */
public boolean hasRandomAnimation() public boolean hasRandomAnimation()
{ {
return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && (getAiType() != AIType.CORPSE));
} }
/** /**
@ -383,7 +382,7 @@ public class L2Npc extends L2Character
} }
else else
{ {
player.sendPacket(new NpcInfoAbnormalVisualEffect(this)); player.sendPacket(new NpcInfo(this));
} }
}); });
} }
@ -1294,11 +1293,6 @@ public class L2Npc extends L2Character
{ {
if (isVisibleFor(activeChar)) if (isVisibleFor(activeChar))
{ {
if (Config.CHECK_KNOWN && activeChar.isGM())
{
activeChar.sendMessage("Added NPC: " + getName());
}
if (_isFakePlayer) if (_isFakePlayer)
{ {
activeChar.sendPacket(new FakePlayerInfo(this)); activeChar.sendPacket(new FakePlayerInfo(this));
@ -1337,7 +1331,7 @@ public class L2Npc extends L2Character
@Override @Override
public boolean isMovementDisabled() public boolean isMovementDisabled()
{ {
return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; return super.isMovementDisabled() || !getTemplate().canMove() || (getAiType() == AIType.CORPSE);
} }
public AIType getAiType() public AIType getAiType()

View File

@ -558,7 +558,6 @@ INSERT IGNORE INTO `admin_command_access_rights` VALUES
('admin_skill_test','3'), ('admin_skill_test','3'),
('admin_st','3'), ('admin_st','3'),
('admin_mp','3'), ('admin_mp','3'),
('admin_known','3'),
-- Section: TownWar -- Section: TownWar
('admin_townwar_start','3'), ('admin_townwar_start','3'),

View File

@ -135,7 +135,6 @@ public final class Config
public static boolean GM_DEBUG_HTML_PATHS; public static boolean GM_DEBUG_HTML_PATHS;
public static boolean USE_SUPER_HASTE_AS_GM_SPEED; public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
public static boolean CHECK_KNOWN;
public static String DEFAULT_GLOBAL_CHAT; public static String DEFAULT_GLOBAL_CHAT;
public static String DEFAULT_TRADE_CHAT; public static String DEFAULT_TRADE_CHAT;
public static boolean TRADE_CHAT_WITH_PVP; public static boolean TRADE_CHAT_WITH_PVP;
@ -1054,7 +1053,7 @@ public final class Config
public static float ALT_DAGGER_DMG_VS_ROBE; public static float ALT_DAGGER_DMG_VS_ROBE;
public static float ALT_DAGGER_DMG_VS_LIGHT; public static float ALT_DAGGER_DMG_VS_LIGHT;
public static boolean ALLOW_RAID_LETHAL; public static boolean ALLOW_RAID_LETHAL;
public static boolean ALLOW_LETHAL_PROTECTION_MOBS; public static boolean ALLOW_LETHAL_PROTECTION_MOBS;
public static String LETHAL_PROTECTED_MOBS; public static String LETHAL_PROTECTED_MOBS;
public static List<Integer> LIST_LETHAL_PROTECTED_MOBS = new ArrayList<>(); public static List<Integer> LIST_LETHAL_PROTECTED_MOBS = new ArrayList<>();
@ -1341,7 +1340,6 @@ public final class Config
MINIMUM_UPDATE_DISTANCE = Integer.parseInt(optionsSettings.getProperty("MaximumUpdateDistance", "50")); MINIMUM_UPDATE_DISTANCE = Integer.parseInt(optionsSettings.getProperty("MaximumUpdateDistance", "50"));
MINIMUN_UPDATE_TIME = Integer.parseInt(optionsSettings.getProperty("MinimumUpdateTime", "500")); MINIMUN_UPDATE_TIME = Integer.parseInt(optionsSettings.getProperty("MinimumUpdateTime", "500"));
CHECK_KNOWN = Boolean.valueOf(optionsSettings.getProperty("CheckKnownList", "false"));
KNOWNLIST_FORGET_DELAY = Integer.parseInt(optionsSettings.getProperty("KnownListForgetDelay", "10000")); KNOWNLIST_FORGET_DELAY = Integer.parseInt(optionsSettings.getProperty("KnownListForgetDelay", "10000"));
HIGH_RATE_SERVER_DROPS = Boolean.valueOf(optionsSettings.getProperty("HighRateServerDrops", "false")); HIGH_RATE_SERVER_DROPS = Boolean.valueOf(optionsSettings.getProperty("HighRateServerDrops", "false"));

View File

@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.handler.admincommandhandlers;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.datatables.SkillTable; import com.l2jmobius.gameserver.datatables.SkillTable;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@ -46,7 +45,6 @@ public class AdminTest implements IAdminCommandHandler
"admin_skill_test", "admin_skill_test",
"admin_st", "admin_st",
"admin_mp", "admin_mp",
"admin_known",
"admin_oly_obs_mode", "admin_oly_obs_mode",
"admin_obs_mode" "admin_obs_mode"
}; };
@ -129,14 +127,6 @@ public class AdminTest implements IAdminCommandHandler
// .dumpPacketHistory(); // .dumpPacketHistory();
BuilderUtil.sendSysMessage(activeChar, "command not working"); BuilderUtil.sendSysMessage(activeChar, "command not working");
} }
else if (command.equals("admin_known on"))
{
Config.CHECK_KNOWN = true;
}
else if (command.equals("admin_known off"))
{
Config.CHECK_KNOWN = false;
}
else if (command.equals("admin_test")) else if (command.equals("admin_test"))
{ {
BuilderUtil.sendSysMessage(activeChar, "Now the server will send a packet that client cannot read correctly"); BuilderUtil.sendSysMessage(activeChar, "Now the server will send a packet that client cannot read correctly");

View File

@ -16,7 +16,6 @@
*/ */
package com.l2jmobius.gameserver.model.actor.knownlist; package com.l2jmobius.gameserver.model.actor.knownlist;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.L2CharacterAI; import com.l2jmobius.gameserver.ai.L2CharacterAI;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
@ -147,11 +146,6 @@ public class PcKnownList extends PlayableKnownList
} }
else if (object instanceof L2NpcInstance) else if (object instanceof L2NpcInstance)
{ {
if (Config.CHECK_KNOWN)
{
active_char.sendMessage("Added NPC: " + ((L2NpcInstance) object).getName());
}
active_char.sendPacket(new NpcInfo((L2NpcInstance) object, active_char)); active_char.sendPacket(new NpcInfo((L2NpcInstance) object, active_char));
} }
else if (object instanceof L2Summon) else if (object instanceof L2Summon)
@ -278,11 +272,6 @@ public class PcKnownList extends PlayableKnownList
active_char.sendPacket(new DeleteObject(object)); active_char.sendPacket(new DeleteObject(object));
} }
if (Config.CHECK_KNOWN && (object instanceof L2NpcInstance))
{
active_char.sendMessage("Removed NPC: " + ((L2NpcInstance) object).getName());
}
return true; return true;
} }

View File

@ -574,7 +574,6 @@
<!-- ADMIN TEST --> <!-- ADMIN TEST -->
<admin command="admin_stats" accessLevel="100" /> <admin command="admin_stats" accessLevel="100" />
<admin command="admin_skill_test" accessLevel="100" /> <admin command="admin_skill_test" accessLevel="100" />
<admin command="admin_known" accessLevel="100" />
<!-- ADMIN TVT EVENT --> <!-- ADMIN TVT EVENT -->
<admin command="admin_tvt_add" accessLevel="100" /> <admin command="admin_tvt_add" accessLevel="100" />

View File

@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@ -38,8 +37,7 @@ public class AdminTest implements IAdminCommandHandler
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_stats", "admin_stats",
"admin_skill_test", "admin_skill_test"
"admin_known"
}; };
@Override @Override
@ -77,14 +75,6 @@ public class AdminTest implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>"); BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>");
} }
} }
else if (command.equals("admin_known on"))
{
Config.CHECK_KNOWN = true;
}
else if (command.equals("admin_known off"))
{
Config.CHECK_KNOWN = false;
}
return true; return true;
} }

View File

@ -918,7 +918,6 @@ public final class Config
// No classification assigned to the following yet // No classification assigned to the following yet
// -------------------------------------------------- // --------------------------------------------------
public static int MAX_ITEM_IN_PACKET; public static int MAX_ITEM_IN_PACKET;
public static boolean CHECK_KNOWN;
public static int GAME_SERVER_LOGIN_PORT; public static int GAME_SERVER_LOGIN_PORT;
public static String GAME_SERVER_LOGIN_HOST; public static String GAME_SERVER_LOGIN_HOST;
public static List<String> GAME_SERVER_SUBNETS; public static List<String> GAME_SERVER_SUBNETS;

View File

@ -293,7 +293,7 @@ public class L2Npc extends L2Character
*/ */
public boolean hasRandomAnimation() public boolean hasRandomAnimation()
{ {
return ((Config.MAX_NPC_ANIMATION > 0) && isRandomAnimationEnabled() && getAiType() != AIType.CORPSE); return ((Config.MAX_NPC_ANIMATION > 0) && isRandomAnimationEnabled() && (getAiType() != AIType.CORPSE));
} }
/** /**
@ -1502,11 +1502,6 @@ public class L2Npc extends L2Character
{ {
if (isVisibleFor(activeChar)) if (isVisibleFor(activeChar))
{ {
if (Config.CHECK_KNOWN && activeChar.isGM())
{
activeChar.sendMessage("Added NPC: " + getName());
}
if (_isFakePlayer) if (_isFakePlayer)
{ {
activeChar.sendPacket(new FakePlayerInfo(this)); activeChar.sendPacket(new FakePlayerInfo(this));
@ -1579,7 +1574,7 @@ public class L2Npc extends L2Character
@Override @Override
public boolean isMovementDisabled() public boolean isMovementDisabled()
{ {
return super.isMovementDisabled() || !canMove() || getAiType() == AIType.CORPSE; return super.isMovementDisabled() || !canMove() || (getAiType() == AIType.CORPSE);
} }
public AIType getAiType() public AIType getAiType()

View File

@ -573,7 +573,6 @@
<!-- ADMIN TEST --> <!-- ADMIN TEST -->
<admin command="admin_stats" accessLevel="100" /> <admin command="admin_stats" accessLevel="100" />
<admin command="admin_skill_test" accessLevel="100" /> <admin command="admin_skill_test" accessLevel="100" />
<admin command="admin_known" accessLevel="100" />
<!-- ADMIN TVT EVENT --> <!-- ADMIN TVT EVENT -->
<admin command="admin_tvt_add" accessLevel="100" /> <admin command="admin_tvt_add" accessLevel="100" />

View File

@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@ -38,8 +37,7 @@ public class AdminTest implements IAdminCommandHandler
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_stats", "admin_stats",
"admin_skill_test", "admin_skill_test"
"admin_known"
}; };
@Override @Override
@ -77,14 +75,6 @@ public class AdminTest implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>"); BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>");
} }
} }
else if (command.equals("admin_known on"))
{
Config.CHECK_KNOWN = true;
}
else if (command.equals("admin_known off"))
{
Config.CHECK_KNOWN = false;
}
return true; return true;
} }

View File

@ -769,7 +769,6 @@ public final class Config
// No classification assigned to the following yet // No classification assigned to the following yet
// -------------------------------------------------- // --------------------------------------------------
public static int MAX_ITEM_IN_PACKET; public static int MAX_ITEM_IN_PACKET;
public static boolean CHECK_KNOWN;
public static int GAME_SERVER_LOGIN_PORT; public static int GAME_SERVER_LOGIN_PORT;
public static String GAME_SERVER_LOGIN_HOST; public static String GAME_SERVER_LOGIN_HOST;
public static List<String> GAME_SERVER_SUBNETS; public static List<String> GAME_SERVER_SUBNETS;

View File

@ -93,7 +93,6 @@ import com.l2jmobius.gameserver.network.serverpackets.FakePlayerInfo;
import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfo; import com.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfoAbnormalVisualEffect;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay; import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo; import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo;
import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
@ -240,7 +239,7 @@ public class L2Npc extends L2Character
*/ */
public boolean hasRandomAnimation() public boolean hasRandomAnimation()
{ {
return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && (getAiType() != AIType.CORPSE));
} }
/** /**
@ -383,7 +382,7 @@ public class L2Npc extends L2Character
} }
else else
{ {
player.sendPacket(new NpcInfoAbnormalVisualEffect(this)); player.sendPacket(new NpcInfo(this));
} }
}); });
} }
@ -1294,11 +1293,6 @@ public class L2Npc extends L2Character
{ {
if (isVisibleFor(activeChar)) if (isVisibleFor(activeChar))
{ {
if (Config.CHECK_KNOWN && activeChar.isGM())
{
activeChar.sendMessage("Added NPC: " + getName());
}
if (_isFakePlayer) if (_isFakePlayer)
{ {
activeChar.sendPacket(new FakePlayerInfo(this)); activeChar.sendPacket(new FakePlayerInfo(this));
@ -1337,7 +1331,7 @@ public class L2Npc extends L2Character
@Override @Override
public boolean isMovementDisabled() public boolean isMovementDisabled()
{ {
return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; return super.isMovementDisabled() || !getTemplate().canMove() || (getAiType() == AIType.CORPSE);
} }
public AIType getAiType() public AIType getAiType()

View File

@ -573,7 +573,6 @@
<!-- ADMIN TEST --> <!-- ADMIN TEST -->
<admin command="admin_stats" accessLevel="100" /> <admin command="admin_stats" accessLevel="100" />
<admin command="admin_skill_test" accessLevel="100" /> <admin command="admin_skill_test" accessLevel="100" />
<admin command="admin_known" accessLevel="100" />
<!-- ADMIN TVT EVENT --> <!-- ADMIN TVT EVENT -->
<admin command="admin_tvt_add" accessLevel="100" /> <admin command="admin_tvt_add" accessLevel="100" />

View File

@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@ -38,8 +37,7 @@ public class AdminTest implements IAdminCommandHandler
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_stats", "admin_stats",
"admin_skill_test", "admin_skill_test"
"admin_known"
}; };
@Override @Override
@ -77,14 +75,6 @@ public class AdminTest implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>"); BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>");
} }
} }
else if (command.equals("admin_known on"))
{
Config.CHECK_KNOWN = true;
}
else if (command.equals("admin_known off"))
{
Config.CHECK_KNOWN = false;
}
return true; return true;
} }

View File

@ -769,7 +769,6 @@ public final class Config
// No classification assigned to the following yet // No classification assigned to the following yet
// -------------------------------------------------- // --------------------------------------------------
public static int MAX_ITEM_IN_PACKET; public static int MAX_ITEM_IN_PACKET;
public static boolean CHECK_KNOWN;
public static int GAME_SERVER_LOGIN_PORT; public static int GAME_SERVER_LOGIN_PORT;
public static String GAME_SERVER_LOGIN_HOST; public static String GAME_SERVER_LOGIN_HOST;
public static List<String> GAME_SERVER_SUBNETS; public static List<String> GAME_SERVER_SUBNETS;

View File

@ -93,7 +93,6 @@ import com.l2jmobius.gameserver.network.serverpackets.FakePlayerInfo;
import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfo; import com.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfoAbnormalVisualEffect;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay; import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo; import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo;
import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
@ -240,7 +239,7 @@ public class L2Npc extends L2Character
*/ */
public boolean hasRandomAnimation() public boolean hasRandomAnimation()
{ {
return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && (getAiType() != AIType.CORPSE));
} }
/** /**
@ -383,7 +382,7 @@ public class L2Npc extends L2Character
} }
else else
{ {
player.sendPacket(new NpcInfoAbnormalVisualEffect(this)); player.sendPacket(new NpcInfo(this));
} }
}); });
} }
@ -1294,11 +1293,6 @@ public class L2Npc extends L2Character
{ {
if (isVisibleFor(activeChar)) if (isVisibleFor(activeChar))
{ {
if (Config.CHECK_KNOWN && activeChar.isGM())
{
activeChar.sendMessage("Added NPC: " + getName());
}
if (_isFakePlayer) if (_isFakePlayer)
{ {
activeChar.sendPacket(new FakePlayerInfo(this)); activeChar.sendPacket(new FakePlayerInfo(this));
@ -1337,7 +1331,7 @@ public class L2Npc extends L2Character
@Override @Override
public boolean isMovementDisabled() public boolean isMovementDisabled()
{ {
return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; return super.isMovementDisabled() || !getTemplate().canMove() || (getAiType() == AIType.CORPSE);
} }
public AIType getAiType() public AIType getAiType()

View File

@ -573,7 +573,6 @@
<!-- ADMIN TEST --> <!-- ADMIN TEST -->
<admin command="admin_stats" accessLevel="100" /> <admin command="admin_stats" accessLevel="100" />
<admin command="admin_skill_test" accessLevel="100" /> <admin command="admin_skill_test" accessLevel="100" />
<admin command="admin_known" accessLevel="100" />
<!-- ADMIN TVT EVENT --> <!-- ADMIN TVT EVENT -->
<admin command="admin_tvt_add" accessLevel="100" /> <admin command="admin_tvt_add" accessLevel="100" />

View File

@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@ -38,8 +37,7 @@ public class AdminTest implements IAdminCommandHandler
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_stats", "admin_stats",
"admin_skill_test", "admin_skill_test"
"admin_known"
}; };
@Override @Override
@ -77,14 +75,6 @@ public class AdminTest implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>"); BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>");
} }
} }
else if (command.equals("admin_known on"))
{
Config.CHECK_KNOWN = true;
}
else if (command.equals("admin_known off"))
{
Config.CHECK_KNOWN = false;
}
return true; return true;
} }

View File

@ -769,7 +769,6 @@ public final class Config
// No classification assigned to the following yet // No classification assigned to the following yet
// -------------------------------------------------- // --------------------------------------------------
public static int MAX_ITEM_IN_PACKET; public static int MAX_ITEM_IN_PACKET;
public static boolean CHECK_KNOWN;
public static int GAME_SERVER_LOGIN_PORT; public static int GAME_SERVER_LOGIN_PORT;
public static String GAME_SERVER_LOGIN_HOST; public static String GAME_SERVER_LOGIN_HOST;
public static List<String> GAME_SERVER_SUBNETS; public static List<String> GAME_SERVER_SUBNETS;

View File

@ -93,7 +93,6 @@ import com.l2jmobius.gameserver.network.serverpackets.FakePlayerInfo;
import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfo; import com.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfoAbnormalVisualEffect;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay; import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo; import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo;
import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
@ -240,7 +239,7 @@ public class L2Npc extends L2Character
*/ */
public boolean hasRandomAnimation() public boolean hasRandomAnimation()
{ {
return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && (getAiType() != AIType.CORPSE));
} }
/** /**
@ -383,7 +382,7 @@ public class L2Npc extends L2Character
} }
else else
{ {
player.sendPacket(new NpcInfoAbnormalVisualEffect(this)); player.sendPacket(new NpcInfo(this));
} }
}); });
} }
@ -1294,11 +1293,6 @@ public class L2Npc extends L2Character
{ {
if (isVisibleFor(activeChar)) if (isVisibleFor(activeChar))
{ {
if (Config.CHECK_KNOWN && activeChar.isGM())
{
activeChar.sendMessage("Added NPC: " + getName());
}
if (_isFakePlayer) if (_isFakePlayer)
{ {
activeChar.sendPacket(new FakePlayerInfo(this)); activeChar.sendPacket(new FakePlayerInfo(this));
@ -1337,7 +1331,7 @@ public class L2Npc extends L2Character
@Override @Override
public boolean isMovementDisabled() public boolean isMovementDisabled()
{ {
return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; return super.isMovementDisabled() || !getTemplate().canMove() || (getAiType() == AIType.CORPSE);
} }
public AIType getAiType() public AIType getAiType()

View File

@ -573,7 +573,6 @@
<!-- ADMIN TEST --> <!-- ADMIN TEST -->
<admin command="admin_stats" accessLevel="100" /> <admin command="admin_stats" accessLevel="100" />
<admin command="admin_skill_test" accessLevel="100" /> <admin command="admin_skill_test" accessLevel="100" />
<admin command="admin_known" accessLevel="100" />
<!-- ADMIN TVT EVENT --> <!-- ADMIN TVT EVENT -->
<admin command="admin_tvt_add" accessLevel="100" /> <admin command="admin_tvt_add" accessLevel="100" />

View File

@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@ -38,8 +37,7 @@ public class AdminTest implements IAdminCommandHandler
private static final String[] ADMIN_COMMANDS = private static final String[] ADMIN_COMMANDS =
{ {
"admin_stats", "admin_stats",
"admin_skill_test", "admin_skill_test"
"admin_known"
}; };
@Override @Override
@ -77,14 +75,6 @@ public class AdminTest implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>"); BuilderUtil.sendSysMessage(activeChar, "Command format is //skill_test <ID>");
} }
} }
else if (command.equals("admin_known on"))
{
Config.CHECK_KNOWN = true;
}
else if (command.equals("admin_known off"))
{
Config.CHECK_KNOWN = false;
}
return true; return true;
} }

View File

@ -769,7 +769,6 @@ public final class Config
// No classification assigned to the following yet // No classification assigned to the following yet
// -------------------------------------------------- // --------------------------------------------------
public static int MAX_ITEM_IN_PACKET; public static int MAX_ITEM_IN_PACKET;
public static boolean CHECK_KNOWN;
public static int GAME_SERVER_LOGIN_PORT; public static int GAME_SERVER_LOGIN_PORT;
public static String GAME_SERVER_LOGIN_HOST; public static String GAME_SERVER_LOGIN_HOST;
public static List<String> GAME_SERVER_SUBNETS; public static List<String> GAME_SERVER_SUBNETS;

View File

@ -93,7 +93,6 @@ import com.l2jmobius.gameserver.network.serverpackets.FakePlayerInfo;
import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfo; import com.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import com.l2jmobius.gameserver.network.serverpackets.NpcInfoAbnormalVisualEffect;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay; import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo; import com.l2jmobius.gameserver.network.serverpackets.ServerObjectInfo;
import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
@ -240,7 +239,7 @@ public class L2Npc extends L2Character
*/ */
public boolean hasRandomAnimation() public boolean hasRandomAnimation()
{ {
return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && (getAiType() != AIType.CORPSE));
} }
/** /**
@ -383,7 +382,7 @@ public class L2Npc extends L2Character
} }
else else
{ {
player.sendPacket(new NpcInfoAbnormalVisualEffect(this)); player.sendPacket(new NpcInfo(this));
} }
}); });
} }
@ -1294,11 +1293,6 @@ public class L2Npc extends L2Character
{ {
if (isVisibleFor(activeChar)) if (isVisibleFor(activeChar))
{ {
if (Config.CHECK_KNOWN && activeChar.isGM())
{
activeChar.sendMessage("Added NPC: " + getName());
}
if (_isFakePlayer) if (_isFakePlayer)
{ {
activeChar.sendPacket(new FakePlayerInfo(this)); activeChar.sendPacket(new FakePlayerInfo(this));
@ -1337,7 +1331,7 @@ public class L2Npc extends L2Character
@Override @Override
public boolean isMovementDisabled() public boolean isMovementDisabled()
{ {
return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; return super.isMovementDisabled() || !getTemplate().canMove() || (getAiType() == AIType.CORPSE);
} }
public AIType getAiType() public AIType getAiType()