Continue with previous commit.
This commit is contained in:
parent
bdba87dec2
commit
588b104d60
@ -1,10 +0,0 @@
|
|||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Debug enable/disable voice command
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# This option will enable voice command .debug allowing players
|
|
||||||
# to turn on/off debugging on self only.
|
|
||||||
# (admin command //debug can enable debugging on any character)
|
|
||||||
# Use admin_command_access_rights table for defining access rights.
|
|
||||||
# Default: False
|
|
||||||
DebugVoiceCommand = False
|
|
@ -113,7 +113,6 @@ public final class Config
|
|||||||
public static final String CUSTOM_CHAMPION_MONSTERS_CONFIG_FILE = "./config/Custom/ChampionMonsters.ini";
|
public static final String CUSTOM_CHAMPION_MONSTERS_CONFIG_FILE = "./config/Custom/ChampionMonsters.ini";
|
||||||
public static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini";
|
public static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini";
|
||||||
public static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini";
|
public static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini";
|
||||||
public static final String CUSTOM_DEBUG_VOICE_COMMAND_CONFIG_FILE = "./config/Custom/DebugVoiceCommand.ini";
|
|
||||||
public static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini";
|
public static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini";
|
||||||
public static final String CUSTOM_FACTION_SYSTEM_CONFIG_FILE = "./config/Custom/FactionSystem.ini";
|
public static final String CUSTOM_FACTION_SYSTEM_CONFIG_FILE = "./config/Custom/FactionSystem.ini";
|
||||||
public static final String CUSTOM_FAKE_PLAYERS_CONFIG_FILE = "./config/Custom/FakePlayers.ini";
|
public static final String CUSTOM_FAKE_PLAYERS_CONFIG_FILE = "./config/Custom/FakePlayers.ini";
|
||||||
@ -1091,7 +1090,6 @@ public final class Config
|
|||||||
public static String MULTILANG_DEFAULT;
|
public static String MULTILANG_DEFAULT;
|
||||||
public static boolean MULTILANG_VOICED_ALLOW;
|
public static boolean MULTILANG_VOICED_ALLOW;
|
||||||
public static boolean L2WALKER_PROTECTION;
|
public static boolean L2WALKER_PROTECTION;
|
||||||
public static boolean DEBUG_VOICE_COMMAND;
|
|
||||||
public static int DUALBOX_CHECK_MAX_PLAYERS_PER_IP;
|
public static int DUALBOX_CHECK_MAX_PLAYERS_PER_IP;
|
||||||
public static int DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP;
|
public static int DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP;
|
||||||
public static int DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP;
|
public static int DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP;
|
||||||
@ -2519,11 +2517,6 @@ public final class Config
|
|||||||
COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3])));
|
COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3])));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load DebugVoiceCommand config file (if exists)
|
|
||||||
final PropertiesParser DebugVoiceCommand = new PropertiesParser(CUSTOM_DEBUG_VOICE_COMMAND_CONFIG_FILE);
|
|
||||||
|
|
||||||
DEBUG_VOICE_COMMAND = DebugVoiceCommand.getBoolean("DebugVoiceCommand", false);
|
|
||||||
|
|
||||||
// Load DualboxCheck config file (if exists)
|
// Load DualboxCheck config file (if exists)
|
||||||
final PropertiesParser DualboxCheck = new PropertiesParser(CUSTOM_DUALBOX_CHECK_CONFIG_FILE);
|
final PropertiesParser DualboxCheck = new PropertiesParser(CUSTOM_DUALBOX_CHECK_CONFIG_FILE);
|
||||||
|
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Debug enable/disable voice command
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# This option will enable voice command .debug allowing players
|
|
||||||
# to turn on/off debugging on self only.
|
|
||||||
# (admin command //debug can enable debugging on any character)
|
|
||||||
# Use admin_command_access_rights table for defining access rights.
|
|
||||||
# Default: False
|
|
||||||
DebugVoiceCommand = False
|
|
@ -113,7 +113,6 @@ public final class Config
|
|||||||
public static final String CUSTOM_CHAMPION_MONSTERS_CONFIG_FILE = "./config/Custom/ChampionMonsters.ini";
|
public static final String CUSTOM_CHAMPION_MONSTERS_CONFIG_FILE = "./config/Custom/ChampionMonsters.ini";
|
||||||
public static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini";
|
public static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini";
|
||||||
public static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini";
|
public static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini";
|
||||||
public static final String CUSTOM_DEBUG_VOICE_COMMAND_CONFIG_FILE = "./config/Custom/DebugVoiceCommand.ini";
|
|
||||||
public static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini";
|
public static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini";
|
||||||
public static final String CUSTOM_FACTION_SYSTEM_CONFIG_FILE = "./config/Custom/FactionSystem.ini";
|
public static final String CUSTOM_FACTION_SYSTEM_CONFIG_FILE = "./config/Custom/FactionSystem.ini";
|
||||||
public static final String CUSTOM_FAKE_PLAYERS_CONFIG_FILE = "./config/Custom/FakePlayers.ini";
|
public static final String CUSTOM_FAKE_PLAYERS_CONFIG_FILE = "./config/Custom/FakePlayers.ini";
|
||||||
@ -1092,7 +1091,6 @@ public final class Config
|
|||||||
public static String MULTILANG_DEFAULT;
|
public static String MULTILANG_DEFAULT;
|
||||||
public static boolean MULTILANG_VOICED_ALLOW;
|
public static boolean MULTILANG_VOICED_ALLOW;
|
||||||
public static boolean L2WALKER_PROTECTION;
|
public static boolean L2WALKER_PROTECTION;
|
||||||
public static boolean DEBUG_VOICE_COMMAND;
|
|
||||||
public static int DUALBOX_CHECK_MAX_PLAYERS_PER_IP;
|
public static int DUALBOX_CHECK_MAX_PLAYERS_PER_IP;
|
||||||
public static int DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP;
|
public static int DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP;
|
||||||
public static int DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP;
|
public static int DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP;
|
||||||
@ -2521,11 +2519,6 @@ public final class Config
|
|||||||
COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3])));
|
COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3])));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load DebugVoiceCommand config file (if exists)
|
|
||||||
final PropertiesParser DebugVoiceCommand = new PropertiesParser(CUSTOM_DEBUG_VOICE_COMMAND_CONFIG_FILE);
|
|
||||||
|
|
||||||
DEBUG_VOICE_COMMAND = DebugVoiceCommand.getBoolean("DebugVoiceCommand", false);
|
|
||||||
|
|
||||||
// Load DualboxCheck config file (if exists)
|
// Load DualboxCheck config file (if exists)
|
||||||
final PropertiesParser DualboxCheck = new PropertiesParser(CUSTOM_DUALBOX_CHECK_CONFIG_FILE);
|
final PropertiesParser DualboxCheck = new PropertiesParser(CUSTOM_DUALBOX_CHECK_CONFIG_FILE);
|
||||||
|
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Debug enable/disable voice command
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# This option will enable voice command .debug allowing players
|
|
||||||
# to turn on/off debugging on self only.
|
|
||||||
# (admin command //debug can enable debugging on any character)
|
|
||||||
# Use admin_command_access_rights table for defining access rights.
|
|
||||||
# Default: False
|
|
||||||
DebugVoiceCommand = False
|
|
@ -113,7 +113,6 @@ public final class Config
|
|||||||
public static final String CUSTOM_CHAMPION_MONSTERS_CONFIG_FILE = "./config/Custom/ChampionMonsters.ini";
|
public static final String CUSTOM_CHAMPION_MONSTERS_CONFIG_FILE = "./config/Custom/ChampionMonsters.ini";
|
||||||
public static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini";
|
public static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini";
|
||||||
public static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini";
|
public static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini";
|
||||||
public static final String CUSTOM_DEBUG_VOICE_COMMAND_CONFIG_FILE = "./config/Custom/DebugVoiceCommand.ini";
|
|
||||||
public static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini";
|
public static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini";
|
||||||
public static final String CUSTOM_FACTION_SYSTEM_CONFIG_FILE = "./config/Custom/FactionSystem.ini";
|
public static final String CUSTOM_FACTION_SYSTEM_CONFIG_FILE = "./config/Custom/FactionSystem.ini";
|
||||||
public static final String CUSTOM_FAKE_PLAYERS_CONFIG_FILE = "./config/Custom/FakePlayers.ini";
|
public static final String CUSTOM_FAKE_PLAYERS_CONFIG_FILE = "./config/Custom/FakePlayers.ini";
|
||||||
@ -1100,7 +1099,6 @@ public final class Config
|
|||||||
public static String MULTILANG_DEFAULT;
|
public static String MULTILANG_DEFAULT;
|
||||||
public static boolean MULTILANG_VOICED_ALLOW;
|
public static boolean MULTILANG_VOICED_ALLOW;
|
||||||
public static boolean L2WALKER_PROTECTION;
|
public static boolean L2WALKER_PROTECTION;
|
||||||
public static boolean DEBUG_VOICE_COMMAND;
|
|
||||||
public static int DUALBOX_CHECK_MAX_PLAYERS_PER_IP;
|
public static int DUALBOX_CHECK_MAX_PLAYERS_PER_IP;
|
||||||
public static int DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP;
|
public static int DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP;
|
||||||
public static int DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP;
|
public static int DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP;
|
||||||
@ -2538,11 +2536,6 @@ public final class Config
|
|||||||
COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3])));
|
COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3])));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load DebugVoiceCommand config file (if exists)
|
|
||||||
final PropertiesParser DebugVoiceCommand = new PropertiesParser(CUSTOM_DEBUG_VOICE_COMMAND_CONFIG_FILE);
|
|
||||||
|
|
||||||
DEBUG_VOICE_COMMAND = DebugVoiceCommand.getBoolean("DebugVoiceCommand", false);
|
|
||||||
|
|
||||||
// Load DualboxCheck config file (if exists)
|
// Load DualboxCheck config file (if exists)
|
||||||
final PropertiesParser DualboxCheck = new PropertiesParser(CUSTOM_DUALBOX_CHECK_CONFIG_FILE);
|
final PropertiesParser DualboxCheck = new PropertiesParser(CUSTOM_DUALBOX_CHECK_CONFIG_FILE);
|
||||||
|
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Debug enable/disable voice command
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# This option will enable voice command .debug allowing players
|
|
||||||
# to turn on/off debugging on self only.
|
|
||||||
# (admin command //debug can enable debugging on any character)
|
|
||||||
# Use admin_command_access_rights table for defining access rights.
|
|
||||||
# Default: False
|
|
||||||
DebugVoiceCommand = False
|
|
@ -113,7 +113,6 @@ public final class Config
|
|||||||
public static final String CUSTOM_CHAMPION_MONSTERS_CONFIG_FILE = "./config/Custom/ChampionMonsters.ini";
|
public static final String CUSTOM_CHAMPION_MONSTERS_CONFIG_FILE = "./config/Custom/ChampionMonsters.ini";
|
||||||
public static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini";
|
public static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini";
|
||||||
public static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini";
|
public static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini";
|
||||||
public static final String CUSTOM_DEBUG_VOICE_COMMAND_CONFIG_FILE = "./config/Custom/DebugVoiceCommand.ini";
|
|
||||||
public static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini";
|
public static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini";
|
||||||
public static final String CUSTOM_FACTION_SYSTEM_CONFIG_FILE = "./config/Custom/FactionSystem.ini";
|
public static final String CUSTOM_FACTION_SYSTEM_CONFIG_FILE = "./config/Custom/FactionSystem.ini";
|
||||||
public static final String CUSTOM_FAKE_PLAYERS_CONFIG_FILE = "./config/Custom/FakePlayers.ini";
|
public static final String CUSTOM_FAKE_PLAYERS_CONFIG_FILE = "./config/Custom/FakePlayers.ini";
|
||||||
@ -1099,7 +1098,6 @@ public final class Config
|
|||||||
public static String MULTILANG_DEFAULT;
|
public static String MULTILANG_DEFAULT;
|
||||||
public static boolean MULTILANG_VOICED_ALLOW;
|
public static boolean MULTILANG_VOICED_ALLOW;
|
||||||
public static boolean L2WALKER_PROTECTION;
|
public static boolean L2WALKER_PROTECTION;
|
||||||
public static boolean DEBUG_VOICE_COMMAND;
|
|
||||||
public static int DUALBOX_CHECK_MAX_PLAYERS_PER_IP;
|
public static int DUALBOX_CHECK_MAX_PLAYERS_PER_IP;
|
||||||
public static int DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP;
|
public static int DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP;
|
||||||
public static int DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP;
|
public static int DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP;
|
||||||
@ -2536,11 +2534,6 @@ public final class Config
|
|||||||
COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3])));
|
COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3])));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load DebugVoiceCommand config file (if exists)
|
|
||||||
final PropertiesParser DebugVoiceCommand = new PropertiesParser(CUSTOM_DEBUG_VOICE_COMMAND_CONFIG_FILE);
|
|
||||||
|
|
||||||
DEBUG_VOICE_COMMAND = DebugVoiceCommand.getBoolean("DebugVoiceCommand", false);
|
|
||||||
|
|
||||||
// Load DualboxCheck config file (if exists)
|
// Load DualboxCheck config file (if exists)
|
||||||
final PropertiesParser DualboxCheck = new PropertiesParser(CUSTOM_DUALBOX_CHECK_CONFIG_FILE);
|
final PropertiesParser DualboxCheck = new PropertiesParser(CUSTOM_DUALBOX_CHECK_CONFIG_FILE);
|
||||||
|
|
||||||
|
@ -89,9 +89,6 @@
|
|||||||
<admin command="admin_cw_add" accessLevel="100" confirmDlg="true" />
|
<admin command="admin_cw_add" accessLevel="100" confirmDlg="true" />
|
||||||
<admin command="admin_cw_info_menu" accessLevel="100" />
|
<admin command="admin_cw_info_menu" accessLevel="100" />
|
||||||
|
|
||||||
<!-- ADMIN DEBUG -->
|
|
||||||
<admin command="admin_debug" accessLevel="100" />
|
|
||||||
|
|
||||||
<!-- ADMIN DELETE -->
|
<!-- ADMIN DELETE -->
|
||||||
<admin command="admin_delete" accessLevel="100" />
|
<admin command="admin_delete" accessLevel="100" />
|
||||||
|
|
||||||
|
@ -461,18 +461,6 @@ MultiLangNpcStringAllowed =
|
|||||||
L2WalkerProtection = False
|
L2WalkerProtection = False
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Debug enable/disable voice command
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# This option will enable voice command .debug allowing players
|
|
||||||
# to turn on/off debugging on self only.
|
|
||||||
# (admin command //debug can enable debugging on any character)
|
|
||||||
# Use admin_command_access_rights table for defining access rights.
|
|
||||||
# Default: False
|
|
||||||
DebugVoiceCommand = False
|
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Dualbox Check
|
# Dualbox Check
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
@ -64,7 +64,6 @@ import handlers.admincommandhandlers.AdminChangeAccessLevel;
|
|||||||
import handlers.admincommandhandlers.AdminClan;
|
import handlers.admincommandhandlers.AdminClan;
|
||||||
import handlers.admincommandhandlers.AdminCreateItem;
|
import handlers.admincommandhandlers.AdminCreateItem;
|
||||||
import handlers.admincommandhandlers.AdminCursedWeapons;
|
import handlers.admincommandhandlers.AdminCursedWeapons;
|
||||||
import handlers.admincommandhandlers.AdminDebug;
|
|
||||||
import handlers.admincommandhandlers.AdminDelete;
|
import handlers.admincommandhandlers.AdminDelete;
|
||||||
import handlers.admincommandhandlers.AdminDisconnect;
|
import handlers.admincommandhandlers.AdminDisconnect;
|
||||||
import handlers.admincommandhandlers.AdminDoorControl;
|
import handlers.admincommandhandlers.AdminDoorControl;
|
||||||
@ -276,7 +275,6 @@ import handlers.usercommandhandlers.Unstuck;
|
|||||||
import handlers.voicedcommandhandlers.Banking;
|
import handlers.voicedcommandhandlers.Banking;
|
||||||
import handlers.voicedcommandhandlers.ChangePassword;
|
import handlers.voicedcommandhandlers.ChangePassword;
|
||||||
import handlers.voicedcommandhandlers.ChatAdmin;
|
import handlers.voicedcommandhandlers.ChatAdmin;
|
||||||
import handlers.voicedcommandhandlers.Debug;
|
|
||||||
import handlers.voicedcommandhandlers.Lang;
|
import handlers.voicedcommandhandlers.Lang;
|
||||||
import handlers.voicedcommandhandlers.Premium;
|
import handlers.voicedcommandhandlers.Premium;
|
||||||
import handlers.voicedcommandhandlers.StatsVCmd;
|
import handlers.voicedcommandhandlers.StatsVCmd;
|
||||||
@ -343,7 +341,6 @@ public class MasterHandler
|
|||||||
AdminPcCondOverride.class,
|
AdminPcCondOverride.class,
|
||||||
AdminCreateItem.class,
|
AdminCreateItem.class,
|
||||||
AdminCursedWeapons.class,
|
AdminCursedWeapons.class,
|
||||||
AdminDebug.class,
|
|
||||||
AdminDelete.class,
|
AdminDelete.class,
|
||||||
AdminDisconnect.class,
|
AdminDisconnect.class,
|
||||||
AdminDoorControl.class,
|
AdminDoorControl.class,
|
||||||
@ -539,7 +536,6 @@ public class MasterHandler
|
|||||||
Config.BANKING_SYSTEM_ENABLED ? Banking.class : null,
|
Config.BANKING_SYSTEM_ENABLED ? Banking.class : null,
|
||||||
Config.L2JMOD_CHAT_ADMIN ? ChatAdmin.class : null,
|
Config.L2JMOD_CHAT_ADMIN ? ChatAdmin.class : null,
|
||||||
Config.L2JMOD_MULTILANG_ENABLE && Config.L2JMOD_MULTILANG_VOICED_ALLOW ? Lang.class : null,
|
Config.L2JMOD_MULTILANG_ENABLE && Config.L2JMOD_MULTILANG_VOICED_ALLOW ? Lang.class : null,
|
||||||
Config.L2JMOD_DEBUG_VOICE_COMMAND ? Debug.class : null,
|
|
||||||
Config.L2JMOD_ALLOW_CHANGE_PASSWORD ? ChangePassword.class : null,
|
Config.L2JMOD_ALLOW_CHANGE_PASSWORD ? ChangePassword.class : null,
|
||||||
Config.PREMIUM_SYSTEM_ENABLED ? Premium.class : null,
|
Config.PREMIUM_SYSTEM_ENABLED ? Premium.class : null,
|
||||||
},
|
},
|
||||||
|
@ -1,85 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the L2J Mobius project.
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
package handlers.admincommandhandlers;
|
|
||||||
|
|
||||||
import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
|
|
||||||
import com.l2jmobius.gameserver.model.L2Object;
|
|
||||||
import com.l2jmobius.gameserver.model.L2World;
|
|
||||||
import com.l2jmobius.gameserver.model.actor.L2Character;
|
|
||||||
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
|
|
||||||
import com.l2jmobius.gameserver.network.SystemMessageId;
|
|
||||||
|
|
||||||
public class AdminDebug implements IAdminCommandHandler
|
|
||||||
{
|
|
||||||
private static final String[] ADMIN_COMMANDS =
|
|
||||||
{
|
|
||||||
"admin_debug"
|
|
||||||
};
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public final boolean useAdminCommand(String command, L2PcInstance activeChar)
|
|
||||||
{
|
|
||||||
final String[] commandSplit = command.split(" ");
|
|
||||||
if (ADMIN_COMMANDS[0].equalsIgnoreCase(commandSplit[0]))
|
|
||||||
{
|
|
||||||
L2Object target;
|
|
||||||
if (commandSplit.length > 1)
|
|
||||||
{
|
|
||||||
target = L2World.getInstance().getPlayer(commandSplit[1].trim());
|
|
||||||
if (target == null)
|
|
||||||
{
|
|
||||||
activeChar.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
target = activeChar.getTarget();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (target instanceof L2Character)
|
|
||||||
{
|
|
||||||
setDebug(activeChar, (L2Character) target);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
setDebug(activeChar, activeChar);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public final String[] getAdminCommandList()
|
|
||||||
{
|
|
||||||
return ADMIN_COMMANDS;
|
|
||||||
}
|
|
||||||
|
|
||||||
private final void setDebug(L2PcInstance activeChar, L2Character target)
|
|
||||||
{
|
|
||||||
if (target.isDebug())
|
|
||||||
{
|
|
||||||
target.setDebug(null);
|
|
||||||
activeChar.sendMessage("Stop debugging " + target.getName());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
target.setDebug(activeChar);
|
|
||||||
activeChar.sendMessage("Start debugging " + target.getName());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -63,18 +63,15 @@ public final class ResistSkill extends AbstractEffect
|
|||||||
for (SkillHolder holder : _skills)
|
for (SkillHolder holder : _skills)
|
||||||
{
|
{
|
||||||
effected.addInvulAgainst(holder);
|
effected.addInvulAgainst(holder);
|
||||||
effected.sendDebugMessage("Applying invul against " + holder.getSkill());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(BuffInfo info)
|
public void onExit(BuffInfo info)
|
||||||
{
|
{
|
||||||
final L2Character effected = info.getEffected();
|
|
||||||
for (SkillHolder holder : _skills)
|
for (SkillHolder holder : _skills)
|
||||||
{
|
{
|
||||||
info.getEffected().removeInvulAgainst(holder);
|
info.getEffected().removeInvulAgainst(holder);
|
||||||
effected.sendDebugMessage("Removing invul against " + holder.getSkill());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,59 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the L2J Mobius project.
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
package handlers.voicedcommandhandlers;
|
|
||||||
|
|
||||||
import com.l2jmobius.gameserver.data.xml.impl.AdminData;
|
|
||||||
import com.l2jmobius.gameserver.handler.IVoicedCommandHandler;
|
|
||||||
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
|
|
||||||
|
|
||||||
public class Debug implements IVoicedCommandHandler
|
|
||||||
{
|
|
||||||
private static final String[] VOICED_COMMANDS =
|
|
||||||
{
|
|
||||||
"debug"
|
|
||||||
};
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
|
|
||||||
{
|
|
||||||
if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (VOICED_COMMANDS[0].equalsIgnoreCase(command))
|
|
||||||
{
|
|
||||||
if (activeChar.isDebug())
|
|
||||||
{
|
|
||||||
activeChar.setDebug(null);
|
|
||||||
activeChar.sendMessage("Debugging disabled.");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
activeChar.setDebug(activeChar);
|
|
||||||
activeChar.sendMessage("Debugging enabled.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String[] getVoicedCommandList()
|
|
||||||
{
|
|
||||||
return VOICED_COMMANDS;
|
|
||||||
}
|
|
||||||
}
|
|
@ -776,7 +776,6 @@ public final class Config
|
|||||||
public static boolean L2JMOD_MULTILANG_NS_ENABLE;
|
public static boolean L2JMOD_MULTILANG_NS_ENABLE;
|
||||||
public static List<String> L2JMOD_MULTILANG_NS_ALLOWED = new ArrayList<>();
|
public static List<String> L2JMOD_MULTILANG_NS_ALLOWED = new ArrayList<>();
|
||||||
public static boolean L2WALKER_PROTECTION;
|
public static boolean L2WALKER_PROTECTION;
|
||||||
public static boolean L2JMOD_DEBUG_VOICE_COMMAND;
|
|
||||||
public static int L2JMOD_DUALBOX_CHECK_MAX_PLAYERS_PER_IP;
|
public static int L2JMOD_DUALBOX_CHECK_MAX_PLAYERS_PER_IP;
|
||||||
public static int L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP;
|
public static int L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP;
|
||||||
public static int L2JMOD_DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP;
|
public static int L2JMOD_DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP;
|
||||||
@ -2563,7 +2562,6 @@ public final class Config
|
|||||||
}
|
}
|
||||||
|
|
||||||
L2WALKER_PROTECTION = CustomSettings.getBoolean("L2WalkerProtection", false);
|
L2WALKER_PROTECTION = CustomSettings.getBoolean("L2WalkerProtection", false);
|
||||||
L2JMOD_DEBUG_VOICE_COMMAND = CustomSettings.getBoolean("DebugVoiceCommand", false);
|
|
||||||
|
|
||||||
L2JMOD_DUALBOX_CHECK_MAX_PLAYERS_PER_IP = CustomSettings.getInt("DualboxCheckMaxPlayersPerIP", 0);
|
L2JMOD_DUALBOX_CHECK_MAX_PLAYERS_PER_IP = CustomSettings.getInt("DualboxCheckMaxPlayersPerIP", 0);
|
||||||
L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP = CustomSettings.getInt("DualboxCheckMaxOlympiadParticipantsPerIP", 0);
|
L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP = CustomSettings.getInt("DualboxCheckMaxOlympiadParticipantsPerIP", 0);
|
||||||
|
@ -244,12 +244,6 @@ public final class WalkingManager implements IXmlReader
|
|||||||
if ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_ACTIVE) || (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE))
|
if ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_ACTIVE) || (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE))
|
||||||
{
|
{
|
||||||
final WalkInfo walk = new WalkInfo(routeName);
|
final WalkInfo walk = new WalkInfo(routeName);
|
||||||
|
|
||||||
if (npc.isDebug())
|
|
||||||
{
|
|
||||||
walk.setLastAction(System.currentTimeMillis());
|
|
||||||
}
|
|
||||||
|
|
||||||
L2NpcWalkerNode node = walk.getCurrentNode();
|
L2NpcWalkerNode node = walk.getCurrentNode();
|
||||||
|
|
||||||
// adjust next waypoint, if NPC spawns at first waypoint
|
// adjust next waypoint, if NPC spawns at first waypoint
|
||||||
@ -257,18 +251,15 @@ public final class WalkingManager implements IXmlReader
|
|||||||
{
|
{
|
||||||
walk.calculateNextNode(npc);
|
walk.calculateNextNode(npc);
|
||||||
node = walk.getCurrentNode();
|
node = walk.getCurrentNode();
|
||||||
npc.sendDebugMessage("Route '" + routeName + "': spawn point is same with first waypoint, adjusted to next");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!npc.isInsideRadius(node, 3000, true, false))
|
if (!npc.isInsideRadius(node, 3000, true, false))
|
||||||
{
|
{
|
||||||
final String message = "Route '" + routeName + "': NPC (id=" + npc.getId() + ", x=" + npc.getX() + ", y=" + npc.getY() + ", z=" + npc.getZ() + ") is too far from starting point (node x=" + node.getX() + ", y=" + node.getY() + ", z=" + node.getZ() + ", range=" + npc.calculateDistance(node, true, true) + "), walking will not start";
|
final String message = "Route '" + routeName + "': NPC (id=" + npc.getId() + ", x=" + npc.getX() + ", y=" + npc.getY() + ", z=" + npc.getZ() + ") is too far from starting point (node x=" + node.getX() + ", y=" + node.getY() + ", z=" + node.getZ() + ", range=" + npc.calculateDistance(node, true, true) + "), walking will not start";
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": " + message);
|
LOGGER.warning(getClass().getSimpleName() + ": " + message);
|
||||||
npc.sendDebugMessage(message);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
npc.sendDebugMessage("Starting to move at route '" + routeName + "'");
|
|
||||||
if (node.runToLocation())
|
if (node.runToLocation())
|
||||||
{
|
{
|
||||||
npc.setRunning();
|
npc.setRunning();
|
||||||
@ -286,7 +277,6 @@ public final class WalkingManager implements IXmlReader
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
npc.sendDebugMessage("Failed to start moving along route '" + routeName + "', scheduled");
|
|
||||||
ThreadPoolManager.schedule(new StartMovingTask(npc, routeName), 60000);
|
ThreadPoolManager.schedule(new StartMovingTask(npc, routeName), 60000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -302,13 +292,11 @@ public final class WalkingManager implements IXmlReader
|
|||||||
// Prevent call simultaneously from scheduled task and onArrived() or temporarily stop walking for resuming in future
|
// Prevent call simultaneously from scheduled task and onArrived() or temporarily stop walking for resuming in future
|
||||||
if (walk.isBlocked() || walk.isSuspended())
|
if (walk.isBlocked() || walk.isSuspended())
|
||||||
{
|
{
|
||||||
npc.sendDebugMessage("Failed to continue moving along route '" + routeName + "' (operation is blocked)");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
walk.setBlocked(true);
|
walk.setBlocked(true);
|
||||||
final L2NpcWalkerNode node = walk.getCurrentNode();
|
final L2NpcWalkerNode node = walk.getCurrentNode();
|
||||||
npc.sendDebugMessage("Route '" + routeName + "', continuing to node " + walk.getCurrentNodeId());
|
|
||||||
if (node.runToLocation())
|
if (node.runToLocation())
|
||||||
{
|
{
|
||||||
npc.setRunning();
|
npc.setRunning();
|
||||||
@ -321,10 +309,6 @@ public final class WalkingManager implements IXmlReader
|
|||||||
walk.setBlocked(false);
|
walk.setBlocked(false);
|
||||||
walk.setStoppedByAttack(false);
|
walk.setStoppedByAttack(false);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
npc.sendDebugMessage("Failed to continue moving along route '" + routeName + "' (wrong AI state - " + npc.getAI().getIntention() + ")");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -418,8 +402,6 @@ public final class WalkingManager implements IXmlReader
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
npc.sendDebugMessage("Route '" + walk.getRoute().getName() + "', arrived to node " + walk.getCurrentNodeId());
|
|
||||||
npc.sendDebugMessage("Done in " + ((System.currentTimeMillis() - walk.getLastAction()) / 1000) + " s");
|
|
||||||
walk.calculateNextNode(npc);
|
walk.calculateNextNode(npc);
|
||||||
walk.setBlocked(true); // prevents to be ran from walk check task, if there is delay in this node.
|
walk.setBlocked(true); // prevents to be ran from walk check task, if there is delay in this node.
|
||||||
|
|
||||||
@ -432,10 +414,6 @@ public final class WalkingManager implements IXmlReader
|
|||||||
npc.broadcastSay(ChatType.NPC_GENERAL, node.getChatText());
|
npc.broadcastSay(ChatType.NPC_GENERAL, node.getChatText());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (npc.isDebug())
|
|
||||||
{
|
|
||||||
walk.setLastAction(System.currentTimeMillis());
|
|
||||||
}
|
|
||||||
ThreadPoolManager.schedule(new ArrivedTask(npc, walk), 100 + (node.getDelay() * 1000L));
|
ThreadPoolManager.schedule(new ArrivedTask(npc, walk), 100 + (node.getDelay() * 1000L));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -77,7 +77,6 @@ public class WalkInfo
|
|||||||
}
|
}
|
||||||
|
|
||||||
_currentNode = newNode;
|
_currentNode = newNode;
|
||||||
npc.sendDebugMessage("Route: " + getRoute().getName() + ", next random node is " + _currentNode);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -94,7 +93,6 @@ public class WalkInfo
|
|||||||
{
|
{
|
||||||
// Notify quest
|
// Notify quest
|
||||||
EventDispatcher.getInstance().notifyEventAsync(new OnNpcMoveRouteFinished(npc), npc);
|
EventDispatcher.getInstance().notifyEventAsync(new OnNpcMoveRouteFinished(npc), npc);
|
||||||
npc.sendDebugMessage("Route: " + getRoute().getName() + ", last node arrived");
|
|
||||||
|
|
||||||
if (!getRoute().repeatWalk())
|
if (!getRoute().repeatWalk())
|
||||||
{
|
{
|
||||||
|
@ -217,8 +217,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
private final byte[] _zones = new byte[ZoneId.getZoneCount()];
|
private final byte[] _zones = new byte[ZoneId.getZoneCount()];
|
||||||
protected byte _zoneValidateCounter = 4;
|
protected byte _zoneValidateCounter = 4;
|
||||||
|
|
||||||
private L2Character _debugger = null;
|
|
||||||
|
|
||||||
private final ReentrantLock _teleportLock = new ReentrantLock();
|
private final ReentrantLock _teleportLock = new ReentrantLock();
|
||||||
private final StampedLock _attackLock = new StampedLock();
|
private final StampedLock _attackLock = new StampedLock();
|
||||||
|
|
||||||
@ -354,48 +352,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
return _effectList;
|
return _effectList;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Verify if this character is under debug.
|
|
||||||
* @return {@code true} if this character is under debug, {@code false} otherwise
|
|
||||||
*/
|
|
||||||
public boolean isDebug()
|
|
||||||
{
|
|
||||||
return _debugger != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets character instance, to which debug packets will be send.
|
|
||||||
* @param debugger the character debugging this character
|
|
||||||
*/
|
|
||||||
public void setDebug(L2Character debugger)
|
|
||||||
{
|
|
||||||
_debugger = debugger;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send debug packet.
|
|
||||||
* @param pkt
|
|
||||||
*/
|
|
||||||
public void sendDebugPacket(L2GameServerPacket pkt)
|
|
||||||
{
|
|
||||||
if (_debugger != null)
|
|
||||||
{
|
|
||||||
_debugger.sendPacket(pkt);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send debug text string
|
|
||||||
* @param msg
|
|
||||||
*/
|
|
||||||
public void sendDebugMessage(String msg)
|
|
||||||
{
|
|
||||||
if (_debugger != null)
|
|
||||||
{
|
|
||||||
_debugger.sendMessage(msg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return character inventory, default null, overridden in L2Playable types and in L2NPcInstance
|
* @return character inventory, default null, overridden in L2Playable types and in L2NPcInstance
|
||||||
*/
|
*/
|
||||||
@ -2506,8 +2462,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
|
|||||||
@Override
|
@Override
|
||||||
public boolean deleteMe()
|
public boolean deleteMe()
|
||||||
{
|
{
|
||||||
setDebug(null);
|
|
||||||
|
|
||||||
if (hasAI())
|
if (hasAI())
|
||||||
{
|
{
|
||||||
getAI().stopAITask();
|
getAI().stopAITask();
|
||||||
|
@ -11082,7 +11082,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
abortAttack();
|
abortAttack();
|
||||||
abortCast();
|
abortCast();
|
||||||
stopMove(null);
|
stopMove(null);
|
||||||
setDebug(null);
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
@ -26,8 +26,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
|
|||||||
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
|
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
|
||||||
import com.l2jmobius.gameserver.model.items.type.EtcItemType;
|
import com.l2jmobius.gameserver.model.items.type.EtcItemType;
|
||||||
import com.l2jmobius.gameserver.model.items.type.ItemType;
|
import com.l2jmobius.gameserver.model.items.type.ItemType;
|
||||||
import com.l2jmobius.gameserver.network.Debug;
|
|
||||||
import com.l2jmobius.gameserver.util.Util;
|
|
||||||
import com.l2jmobius.util.Rnd;
|
import com.l2jmobius.util.Rnd;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -173,34 +171,6 @@ public final class EnchantScroll extends AbstractEnchantItem
|
|||||||
final double random = 100 * Rnd.nextDouble();
|
final double random = 100 * Rnd.nextDouble();
|
||||||
final boolean success = (random < finalChance);
|
final boolean success = (random < finalChance);
|
||||||
|
|
||||||
if (player.isDebug())
|
|
||||||
{
|
|
||||||
final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId);
|
|
||||||
final StatsSet set = new StatsSet();
|
|
||||||
if (isBlessed())
|
|
||||||
{
|
|
||||||
set.set("isBlessed", isBlessed());
|
|
||||||
}
|
|
||||||
if (isSafe())
|
|
||||||
{
|
|
||||||
set.set("isSafe", isSafe());
|
|
||||||
}
|
|
||||||
set.set("chance", Util.formatDouble(chance, "#.##"));
|
|
||||||
if (bonusRate > 0)
|
|
||||||
{
|
|
||||||
set.set("bonusRate", Util.formatDouble(bonusRate, "#.##"));
|
|
||||||
}
|
|
||||||
if (supportBonusRate > 0)
|
|
||||||
{
|
|
||||||
set.set("supportBonusRate", Util.formatDouble(supportBonusRate, "#.##"));
|
|
||||||
}
|
|
||||||
set.set("finalChance", Util.formatDouble(finalChance, "#.##"));
|
|
||||||
set.set("random", Util.formatDouble(random, "#.##"));
|
|
||||||
set.set("success", success);
|
|
||||||
set.set("item group", group.getName());
|
|
||||||
set.set("scroll group", _scrollGroupId);
|
|
||||||
Debug.sendItemDebug(player, enchantItem, set);
|
|
||||||
}
|
|
||||||
return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE;
|
return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -75,7 +75,6 @@ public class Options
|
|||||||
{
|
{
|
||||||
funcs.add(fuction);
|
funcs.add(fuction);
|
||||||
}
|
}
|
||||||
player.sendDebugMessage("Adding stats: " + fuctionTemplate.getStat() + " val: " + fuctionTemplate.getValue());
|
|
||||||
}
|
}
|
||||||
return funcs;
|
return funcs;
|
||||||
}
|
}
|
||||||
@ -157,7 +156,6 @@ public class Options
|
|||||||
|
|
||||||
public void apply(L2PcInstance player)
|
public void apply(L2PcInstance player)
|
||||||
{
|
{
|
||||||
player.sendDebugMessage("Activating option id: " + _id);
|
|
||||||
if (hasFuncs())
|
if (hasFuncs())
|
||||||
{
|
{
|
||||||
player.addStatFuncs(getStatFuncs(null, player));
|
player.addStatFuncs(getStatFuncs(null, player));
|
||||||
@ -165,19 +163,16 @@ public class Options
|
|||||||
if (hasActiveSkill())
|
if (hasActiveSkill())
|
||||||
{
|
{
|
||||||
addSkill(player, getActiveSkill().getSkill());
|
addSkill(player, getActiveSkill().getSkill());
|
||||||
player.sendDebugMessage("Adding active skill: " + getActiveSkill());
|
|
||||||
}
|
}
|
||||||
if (hasPassiveSkill())
|
if (hasPassiveSkill())
|
||||||
{
|
{
|
||||||
addSkill(player, getPassiveSkill().getSkill());
|
addSkill(player, getPassiveSkill().getSkill());
|
||||||
player.sendDebugMessage("Adding passive skill: " + getPassiveSkill());
|
|
||||||
}
|
}
|
||||||
if (hasActivationSkills())
|
if (hasActivationSkills())
|
||||||
{
|
{
|
||||||
for (OptionsSkillHolder holder : _activationSkills)
|
for (OptionsSkillHolder holder : _activationSkills)
|
||||||
{
|
{
|
||||||
player.addTriggerSkill(holder);
|
player.addTriggerSkill(holder);
|
||||||
player.sendDebugMessage("Adding trigger skill: " + holder);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -186,7 +181,6 @@ public class Options
|
|||||||
|
|
||||||
public void remove(L2PcInstance player)
|
public void remove(L2PcInstance player)
|
||||||
{
|
{
|
||||||
player.sendDebugMessage("Deactivating option id: " + _id);
|
|
||||||
if (hasFuncs())
|
if (hasFuncs())
|
||||||
{
|
{
|
||||||
player.removeStatsOwner(this);
|
player.removeStatsOwner(this);
|
||||||
@ -194,19 +188,16 @@ public class Options
|
|||||||
if (hasActiveSkill())
|
if (hasActiveSkill())
|
||||||
{
|
{
|
||||||
player.removeSkill(getActiveSkill().getSkill(), false, false);
|
player.removeSkill(getActiveSkill().getSkill(), false, false);
|
||||||
player.sendDebugMessage("Removing active skill: " + getActiveSkill());
|
|
||||||
}
|
}
|
||||||
if (hasPassiveSkill())
|
if (hasPassiveSkill())
|
||||||
{
|
{
|
||||||
player.removeSkill(getPassiveSkill().getSkill(), false, true);
|
player.removeSkill(getPassiveSkill().getSkill(), false, true);
|
||||||
player.sendDebugMessage("Removing passive skill: " + getPassiveSkill());
|
|
||||||
}
|
}
|
||||||
if (hasActivationSkills())
|
if (hasActivationSkills())
|
||||||
{
|
{
|
||||||
for (OptionsSkillHolder holder : _activationSkills)
|
for (OptionsSkillHolder holder : _activationSkills)
|
||||||
{
|
{
|
||||||
player.removeTriggerSkill(holder);
|
player.removeTriggerSkill(holder);
|
||||||
player.sendDebugMessage("Removing trigger skill: " + holder);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
player.sendSkillList();
|
player.sendSkillList();
|
||||||
|
@ -1379,7 +1379,6 @@ public final class Skill implements IIdentifiable
|
|||||||
|
|
||||||
if (effected.isInvulAgainst(getId(), getLevel()))
|
if (effected.isInvulAgainst(getId(), getLevel()))
|
||||||
{
|
{
|
||||||
effected.sendDebugMessage("Skill " + toString() + " has been ignored (invul against)");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -32,7 +32,6 @@ import com.l2jmobius.gameserver.instancemanager.FortManager;
|
|||||||
import com.l2jmobius.gameserver.instancemanager.SiegeManager;
|
import com.l2jmobius.gameserver.instancemanager.SiegeManager;
|
||||||
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
|
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
|
||||||
import com.l2jmobius.gameserver.model.L2SiegeClan;
|
import com.l2jmobius.gameserver.model.L2SiegeClan;
|
||||||
import com.l2jmobius.gameserver.model.StatsSet;
|
|
||||||
import com.l2jmobius.gameserver.model.actor.L2Attackable;
|
import com.l2jmobius.gameserver.model.actor.L2Attackable;
|
||||||
import com.l2jmobius.gameserver.model.actor.L2Character;
|
import com.l2jmobius.gameserver.model.actor.L2Character;
|
||||||
import com.l2jmobius.gameserver.model.actor.instance.L2CubicInstance;
|
import com.l2jmobius.gameserver.model.actor.instance.L2CubicInstance;
|
||||||
@ -75,7 +74,6 @@ import com.l2jmobius.gameserver.model.zone.type.L2CastleZone;
|
|||||||
import com.l2jmobius.gameserver.model.zone.type.L2ClanHallZone;
|
import com.l2jmobius.gameserver.model.zone.type.L2ClanHallZone;
|
||||||
import com.l2jmobius.gameserver.model.zone.type.L2FortZone;
|
import com.l2jmobius.gameserver.model.zone.type.L2FortZone;
|
||||||
import com.l2jmobius.gameserver.model.zone.type.L2MotherTreeZone;
|
import com.l2jmobius.gameserver.model.zone.type.L2MotherTreeZone;
|
||||||
import com.l2jmobius.gameserver.network.Debug;
|
|
||||||
import com.l2jmobius.gameserver.network.SystemMessageId;
|
import com.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
||||||
import com.l2jmobius.gameserver.util.Util;
|
import com.l2jmobius.gameserver.util.Util;
|
||||||
@ -620,28 +618,6 @@ public final class Formulas
|
|||||||
damage *= weaponMod;
|
damage *= weaponMod;
|
||||||
damage *= penaltyMod;
|
damage *= penaltyMod;
|
||||||
|
|
||||||
if (attacker.isDebug())
|
|
||||||
{
|
|
||||||
final StatsSet set = new StatsSet();
|
|
||||||
set.set("skillPower", skill.getPower(isPvP, isPvE));
|
|
||||||
set.set("ssboost", ssboost);
|
|
||||||
set.set("proximityBonus", proximityBonus);
|
|
||||||
set.set("pvpBonus", pvpBonus);
|
|
||||||
set.set("baseMod", baseMod);
|
|
||||||
set.set("criticalMod", criticalMod);
|
|
||||||
set.set("criticalModPos", criticalModPos);
|
|
||||||
set.set("criticalVulnMod", criticalVulnMod);
|
|
||||||
set.set("criticalAddMod", criticalAddMod);
|
|
||||||
set.set("criticalAddVuln", criticalAddVuln);
|
|
||||||
set.set("weaponTraitMod", weaponTraitMod);
|
|
||||||
set.set("generalTraitMod", generalTraitMod);
|
|
||||||
set.set("attributeMod", attributeMod);
|
|
||||||
set.set("weaponMod", weaponMod);
|
|
||||||
set.set("penaltyMod", penaltyMod);
|
|
||||||
set.set("damage", (int) damage);
|
|
||||||
Debug.sendSkillDebug(attacker, target, skill, set);
|
|
||||||
}
|
|
||||||
|
|
||||||
return Math.max(damage, 1);
|
return Math.max(damage, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -711,26 +687,6 @@ public final class Formulas
|
|||||||
damage *= weaponMod;
|
damage *= weaponMod;
|
||||||
damage *= penaltyMod;
|
damage *= penaltyMod;
|
||||||
|
|
||||||
if (attacker.isDebug())
|
|
||||||
{
|
|
||||||
final StatsSet set = new StatsSet();
|
|
||||||
set.set("skillPower", skill.getPower(isPvP, isPvE));
|
|
||||||
set.set("ssboost", ssboost);
|
|
||||||
set.set("proximityBonus", proximityBonus);
|
|
||||||
set.set("pvpBonus", pvpBonus);
|
|
||||||
set.set("baseMod", baseMod);
|
|
||||||
set.set("criticalMod", criticalMod);
|
|
||||||
set.set("criticalVulnMod", criticalVulnMod);
|
|
||||||
set.set("criticalAddMod", criticalAddMod);
|
|
||||||
set.set("criticalAddVuln", criticalAddVuln);
|
|
||||||
set.set("generalTraitMod", generalTraitMod);
|
|
||||||
set.set("attributeMod", attributeMod);
|
|
||||||
set.set("weaponMod", weaponMod);
|
|
||||||
set.set("penaltyMod", penaltyMod);
|
|
||||||
set.set("damage", (int) damage);
|
|
||||||
Debug.sendSkillDebug(attacker, target, skill, set);
|
|
||||||
}
|
|
||||||
|
|
||||||
return Math.max(damage, 1);
|
return Math.max(damage, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1431,19 +1387,6 @@ public final class Formulas
|
|||||||
final double rate = baseMod * elementMod * traitMod * mAtkMod * buffDebuffMod;
|
final double rate = baseMod * elementMod * traitMod * mAtkMod * buffDebuffMod;
|
||||||
final double finalRate = traitMod > 0 ? Util.constrain(rate, skill.getMinChance(), skill.getMaxChance()) : 0;
|
final double finalRate = traitMod > 0 ? Util.constrain(rate, skill.getMinChance(), skill.getMaxChance()) : 0;
|
||||||
|
|
||||||
if (attacker.isDebug())
|
|
||||||
{
|
|
||||||
final StatsSet set = new StatsSet();
|
|
||||||
set.set("baseMod", baseMod);
|
|
||||||
set.set("elementMod", elementMod);
|
|
||||||
set.set("traitMod", traitMod);
|
|
||||||
set.set("mAtkMod", mAtkMod);
|
|
||||||
set.set("buffDebuffMod", buffDebuffMod);
|
|
||||||
set.set("rate", rate);
|
|
||||||
set.set("finalRate", finalRate);
|
|
||||||
Debug.sendSkillDebug(attacker, target, skill, set);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (finalRate <= Rnd.get(100))
|
if (finalRate <= Rnd.get(100))
|
||||||
{
|
{
|
||||||
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2);
|
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2);
|
||||||
@ -1503,19 +1446,6 @@ public final class Formulas
|
|||||||
// Check the Rate Limits.
|
// Check the Rate Limits.
|
||||||
final double finalRate = Util.constrain(rate, skill.getMinChance(), skill.getMaxChance());
|
final double finalRate = Util.constrain(rate, skill.getMinChance(), skill.getMaxChance());
|
||||||
|
|
||||||
if (attacker.getOwner().isDebug())
|
|
||||||
{
|
|
||||||
final StatsSet set = new StatsSet();
|
|
||||||
set.set("baseMod", baseRate);
|
|
||||||
set.set("resMod", resMod);
|
|
||||||
set.set("statMod", statMod);
|
|
||||||
set.set("elementMod", elementMod);
|
|
||||||
set.set("lvlBonusMod", lvlBonusMod);
|
|
||||||
set.set("rate", rate);
|
|
||||||
set.set("finalRate", finalRate);
|
|
||||||
Debug.sendSkillDebug(attacker.getOwner(), target, skill, set);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (Rnd.get(100) < finalRate);
|
return (Rnd.get(100) < finalRate);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1546,17 +1476,6 @@ public final class Formulas
|
|||||||
final double resModifier = target.calcStat(Stats.MAGIC_SUCCESS_RES, 1, null, skill);
|
final double resModifier = target.calcStat(Stats.MAGIC_SUCCESS_RES, 1, null, skill);
|
||||||
final int rate = 100 - Math.round((float) (lvlModifier * targetModifier * resModifier));
|
final int rate = 100 - Math.round((float) (lvlModifier * targetModifier * resModifier));
|
||||||
|
|
||||||
if (attacker.isDebug())
|
|
||||||
{
|
|
||||||
final StatsSet set = new StatsSet();
|
|
||||||
set.set("lvlDifference", lvlDifference);
|
|
||||||
set.set("lvlModifier", lvlModifier);
|
|
||||||
set.set("resModifier", resModifier);
|
|
||||||
set.set("targetModifier", targetModifier);
|
|
||||||
set.set("rate", rate);
|
|
||||||
Debug.sendSkillDebug(attacker, target, skill, set);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (Rnd.get(100) < rate);
|
return (Rnd.get(100) < rate);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1973,17 +1892,7 @@ public final class Formulas
|
|||||||
final double baseRate = blowChance * dexMod * sideMod;
|
final double baseRate = blowChance * dexMod * sideMod;
|
||||||
// Apply blow rates
|
// Apply blow rates
|
||||||
final double rate = activeChar.calcStat(Stats.BLOW_RATE, baseRate, target, null);
|
final double rate = activeChar.calcStat(Stats.BLOW_RATE, baseRate, target, null);
|
||||||
// Debug
|
|
||||||
if (activeChar.isDebug())
|
|
||||||
{
|
|
||||||
final StatsSet set = new StatsSet();
|
|
||||||
set.set("dexMod", dexMod);
|
|
||||||
set.set("blowChance", blowChance);
|
|
||||||
set.set("sideMod", sideMod);
|
|
||||||
set.set("baseRate", baseRate);
|
|
||||||
set.set("rate", rate);
|
|
||||||
Debug.sendSkillDebug(activeChar, target, skill, set);
|
|
||||||
}
|
|
||||||
return Rnd.get(100) < rate;
|
return Rnd.get(100) < rate;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2000,15 +1909,7 @@ public final class Formulas
|
|||||||
final double prof = activeChar.calcStat(Stats.CANCEL_PROF, 0, target, null);
|
final double prof = activeChar.calcStat(Stats.CANCEL_PROF, 0, target, null);
|
||||||
final double resMod = 1 + (((vuln + prof) * -1) / 100);
|
final double resMod = 1 + (((vuln + prof) * -1) / 100);
|
||||||
final double finalRate = rate / resMod;
|
final double finalRate = rate / resMod;
|
||||||
if (activeChar.isDebug())
|
|
||||||
{
|
|
||||||
final StatsSet set = new StatsSet();
|
|
||||||
set.set("baseMod", rate);
|
|
||||||
set.set("magicLevel", cancelMagicLvl);
|
|
||||||
set.set("resMod", resMod);
|
|
||||||
set.set("rate", finalRate);
|
|
||||||
Debug.sendSkillDebug(activeChar, target, skill, set);
|
|
||||||
}
|
|
||||||
// Prevent initialization.
|
// Prevent initialization.
|
||||||
final List<BuffInfo> buffs = target.getEffectList().hasBuffs() ? new ArrayList<>(target.getEffectList().getBuffs()) : new ArrayList<>(1);
|
final List<BuffInfo> buffs = target.getEffectList().hasBuffs() ? new ArrayList<>(target.getEffectList().getBuffs()) : new ArrayList<>(1);
|
||||||
if (target.getEffectList().hasTriggered())
|
if (target.getEffectList().hasTriggered())
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
# ---------------------------------------------------------------------------
|
|
||||||
# Debug enable/disable voice command
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# This option will enable voice command .debug allowing players
|
|
||||||
# to turn on/off debugging on self only.
|
|
||||||
# (admin command //debug can enable debugging on any character)
|
|
||||||
# Use admin_command_access_rights table for defining access rights.
|
|
||||||
# Default: False
|
|
||||||
DebugVoiceCommand = False
|
|
@ -113,7 +113,6 @@ public final class Config
|
|||||||
public static final String CUSTOM_CHAMPION_MONSTERS_CONFIG_FILE = "./config/Custom/ChampionMonsters.ini";
|
public static final String CUSTOM_CHAMPION_MONSTERS_CONFIG_FILE = "./config/Custom/ChampionMonsters.ini";
|
||||||
public static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini";
|
public static final String CUSTOM_CHAT_MODERATION_CONFIG_FILE = "./config/Custom/ChatModeration.ini";
|
||||||
public static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini";
|
public static final String CUSTOM_COMMUNITY_BOARD_CONFIG_FILE = "./config/Custom/CommunityBoard.ini";
|
||||||
public static final String CUSTOM_DEBUG_VOICE_COMMAND_CONFIG_FILE = "./config/Custom/DebugVoiceCommand.ini";
|
|
||||||
public static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini";
|
public static final String CUSTOM_DUALBOX_CHECK_CONFIG_FILE = "./config/Custom/DualboxCheck.ini";
|
||||||
public static final String CUSTOM_FACTION_SYSTEM_CONFIG_FILE = "./config/Custom/FactionSystem.ini";
|
public static final String CUSTOM_FACTION_SYSTEM_CONFIG_FILE = "./config/Custom/FactionSystem.ini";
|
||||||
public static final String CUSTOM_FAKE_PLAYERS_CONFIG_FILE = "./config/Custom/FakePlayers.ini";
|
public static final String CUSTOM_FAKE_PLAYERS_CONFIG_FILE = "./config/Custom/FakePlayers.ini";
|
||||||
@ -1032,7 +1031,6 @@ public final class Config
|
|||||||
public static String MULTILANG_DEFAULT;
|
public static String MULTILANG_DEFAULT;
|
||||||
public static boolean MULTILANG_VOICED_ALLOW;
|
public static boolean MULTILANG_VOICED_ALLOW;
|
||||||
public static boolean L2WALKER_PROTECTION;
|
public static boolean L2WALKER_PROTECTION;
|
||||||
public static boolean DEBUG_VOICE_COMMAND;
|
|
||||||
public static int DUALBOX_CHECK_MAX_PLAYERS_PER_IP;
|
public static int DUALBOX_CHECK_MAX_PLAYERS_PER_IP;
|
||||||
public static int DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP;
|
public static int DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP;
|
||||||
public static int DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP;
|
public static int DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP;
|
||||||
@ -2412,11 +2410,6 @@ public final class Config
|
|||||||
COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3])));
|
COMMUNITY_AVAILABLE_TELEPORTS.put(splitInfo[0], new Location(Integer.parseInt(splitInfo[1]), Integer.parseInt(splitInfo[2]), Integer.parseInt(splitInfo[3])));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load DebugVoiceCommand config file (if exists)
|
|
||||||
final PropertiesParser DebugVoiceCommand = new PropertiesParser(CUSTOM_DEBUG_VOICE_COMMAND_CONFIG_FILE);
|
|
||||||
|
|
||||||
DEBUG_VOICE_COMMAND = DebugVoiceCommand.getBoolean("DebugVoiceCommand", false);
|
|
||||||
|
|
||||||
// Load DualboxCheck config file (if exists)
|
// Load DualboxCheck config file (if exists)
|
||||||
final PropertiesParser DualboxCheck = new PropertiesParser(CUSTOM_DUALBOX_CHECK_CONFIG_FILE);
|
final PropertiesParser DualboxCheck = new PropertiesParser(CUSTOM_DUALBOX_CHECK_CONFIG_FILE);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user