diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/Custom/DebugVoiceCommand.ini b/L2J_Mobius_1.0_Ertheia/dist/game/config/Custom/DebugVoiceCommand.ini deleted file mode 100644 index c65b9b3fe1..0000000000 --- a/L2J_Mobius_1.0_Ertheia/dist/game/config/Custom/DebugVoiceCommand.ini +++ /dev/null @@ -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 diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java index 9d30282876..38cb9f3742 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java @@ -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_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_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_FACTION_SYSTEM_CONFIG_FILE = "./config/Custom/FactionSystem.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 boolean MULTILANG_VOICED_ALLOW; 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_OLYMPIAD_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]))); } - // 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) final PropertiesParser DualboxCheck = new PropertiesParser(CUSTOM_DUALBOX_CHECK_CONFIG_FILE); diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/Custom/DebugVoiceCommand.ini b/L2J_Mobius_2.5_Underground/dist/game/config/Custom/DebugVoiceCommand.ini deleted file mode 100644 index c65b9b3fe1..0000000000 --- a/L2J_Mobius_2.5_Underground/dist/game/config/Custom/DebugVoiceCommand.ini +++ /dev/null @@ -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 diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java index dca09d456e..0e322c58fa 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java @@ -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_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_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_FACTION_SYSTEM_CONFIG_FILE = "./config/Custom/FactionSystem.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 boolean MULTILANG_VOICED_ALLOW; 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_OLYMPIAD_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]))); } - // 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) final PropertiesParser DualboxCheck = new PropertiesParser(CUSTOM_DUALBOX_CHECK_CONFIG_FILE); diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/Custom/DebugVoiceCommand.ini b/L2J_Mobius_3.0_Helios/dist/game/config/Custom/DebugVoiceCommand.ini deleted file mode 100644 index c65b9b3fe1..0000000000 --- a/L2J_Mobius_3.0_Helios/dist/game/config/Custom/DebugVoiceCommand.ini +++ /dev/null @@ -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 diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java index 9ada9122d5..421045b50d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java @@ -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_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_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_FACTION_SYSTEM_CONFIG_FILE = "./config/Custom/FactionSystem.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 boolean MULTILANG_VOICED_ALLOW; 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_OLYMPIAD_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]))); } - // 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) final PropertiesParser DualboxCheck = new PropertiesParser(CUSTOM_DUALBOX_CHECK_CONFIG_FILE); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Custom/DebugVoiceCommand.ini b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Custom/DebugVoiceCommand.ini deleted file mode 100644 index c65b9b3fe1..0000000000 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Custom/DebugVoiceCommand.ini +++ /dev/null @@ -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 diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java index d94ba4a8e3..af085c3219 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java @@ -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_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_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_FACTION_SYSTEM_CONFIG_FILE = "./config/Custom/FactionSystem.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 boolean MULTILANG_VOICED_ALLOW; 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_OLYMPIAD_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]))); } - // 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) final PropertiesParser DualboxCheck = new PropertiesParser(CUSTOM_DUALBOX_CHECK_CONFIG_FILE); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/AdminCommands.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/AdminCommands.xml index 21610d47e5..be8f97d0f3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/AdminCommands.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/AdminCommands.xml @@ -89,9 +89,6 @@ - - - diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom.ini index 15f09cd650..0a8704da5c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom.ini +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom.ini @@ -461,18 +461,6 @@ MultiLangNpcStringAllowed = 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 # --------------------------------------------------------------------------- diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java index 626933b01f..07c40357ad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java @@ -64,7 +64,6 @@ import handlers.admincommandhandlers.AdminChangeAccessLevel; import handlers.admincommandhandlers.AdminClan; import handlers.admincommandhandlers.AdminCreateItem; import handlers.admincommandhandlers.AdminCursedWeapons; -import handlers.admincommandhandlers.AdminDebug; import handlers.admincommandhandlers.AdminDelete; import handlers.admincommandhandlers.AdminDisconnect; import handlers.admincommandhandlers.AdminDoorControl; @@ -276,7 +275,6 @@ import handlers.usercommandhandlers.Unstuck; import handlers.voicedcommandhandlers.Banking; import handlers.voicedcommandhandlers.ChangePassword; import handlers.voicedcommandhandlers.ChatAdmin; -import handlers.voicedcommandhandlers.Debug; import handlers.voicedcommandhandlers.Lang; import handlers.voicedcommandhandlers.Premium; import handlers.voicedcommandhandlers.StatsVCmd; @@ -343,7 +341,6 @@ public class MasterHandler AdminPcCondOverride.class, AdminCreateItem.class, AdminCursedWeapons.class, - AdminDebug.class, AdminDelete.class, AdminDisconnect.class, AdminDoorControl.class, @@ -539,7 +536,6 @@ public class MasterHandler Config.BANKING_SYSTEM_ENABLED ? Banking.class : null, Config.L2JMOD_CHAT_ADMIN ? ChatAdmin.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.PREMIUM_SYSTEM_ENABLED ? Premium.class : null, }, diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminDebug.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminDebug.java deleted file mode 100644 index b9f3d6fba3..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminDebug.java +++ /dev/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 . - */ -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()); - } - } -} \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index e235ba4bea..58fe93a3d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -63,18 +63,15 @@ public final class ResistSkill extends AbstractEffect for (SkillHolder holder : _skills) { effected.addInvulAgainst(holder); - effected.sendDebugMessage("Applying invul against " + holder.getSkill()); } } @Override public void onExit(BuffInfo info) { - final L2Character effected = info.getEffected(); for (SkillHolder holder : _skills) { info.getEffected().removeInvulAgainst(holder); - effected.sendDebugMessage("Removing invul against " + holder.getSkill()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java deleted file mode 100644 index 2848e676d6..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java +++ /dev/null @@ -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 . - */ -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; - } -} \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java index 87efed59f3..adc5f3955c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java @@ -776,7 +776,6 @@ public final class Config public static boolean L2JMOD_MULTILANG_NS_ENABLE; public static List L2JMOD_MULTILANG_NS_ALLOWED = new ArrayList<>(); 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_OLYMPIAD_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); - L2JMOD_DEBUG_VOICE_COMMAND = CustomSettings.getBoolean("DebugVoiceCommand", false); L2JMOD_DUALBOX_CHECK_MAX_PLAYERS_PER_IP = CustomSettings.getInt("DualboxCheckMaxPlayersPerIP", 0); L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP = CustomSettings.getInt("DualboxCheckMaxOlympiadParticipantsPerIP", 0); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java index 5ef49c1880..f86f66c771 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java @@ -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)) { final WalkInfo walk = new WalkInfo(routeName); - - if (npc.isDebug()) - { - walk.setLastAction(System.currentTimeMillis()); - } - L2NpcWalkerNode node = walk.getCurrentNode(); // adjust next waypoint, if NPC spawns at first waypoint @@ -257,18 +251,15 @@ public final class WalkingManager implements IXmlReader { walk.calculateNextNode(npc); node = walk.getCurrentNode(); - npc.sendDebugMessage("Route '" + routeName + "': spawn point is same with first waypoint, adjusted to next"); } 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"; LOGGER.warning(getClass().getSimpleName() + ": " + message); - npc.sendDebugMessage(message); return; } - npc.sendDebugMessage("Starting to move at route '" + routeName + "'"); if (node.runToLocation()) { npc.setRunning(); @@ -286,7 +277,6 @@ public final class WalkingManager implements IXmlReader } else { - npc.sendDebugMessage("Failed to start moving along route '" + routeName + "', scheduled"); 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 if (walk.isBlocked() || walk.isSuspended()) { - npc.sendDebugMessage("Failed to continue moving along route '" + routeName + "' (operation is blocked)"); return; } walk.setBlocked(true); final L2NpcWalkerNode node = walk.getCurrentNode(); - npc.sendDebugMessage("Route '" + routeName + "', continuing to node " + walk.getCurrentNodeId()); if (node.runToLocation()) { npc.setRunning(); @@ -321,10 +309,6 @@ public final class WalkingManager implements IXmlReader walk.setBlocked(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; } - 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.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()); } - if (npc.isDebug()) - { - walk.setLastAction(System.currentTimeMillis()); - } ThreadPoolManager.schedule(new ArrivedTask(npc, walk), 100 + (node.getDelay() * 1000L)); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/WalkInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/WalkInfo.java index 32ed23b51e..6a35e3c68c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/WalkInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/WalkInfo.java @@ -77,7 +77,6 @@ public class WalkInfo } _currentNode = newNode; - npc.sendDebugMessage("Route: " + getRoute().getName() + ", next random node is " + _currentNode); } else { @@ -94,7 +93,6 @@ public class WalkInfo { // Notify quest EventDispatcher.getInstance().notifyEventAsync(new OnNpcMoveRouteFinished(npc), npc); - npc.sendDebugMessage("Route: " + getRoute().getName() + ", last node arrived"); if (!getRoute().repeatWalk()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 7fda07d622..eaa45dcb9d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -217,8 +217,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe private final byte[] _zones = new byte[ZoneId.getZoneCount()]; protected byte _zoneValidateCounter = 4; - private L2Character _debugger = null; - private final ReentrantLock _teleportLock = new ReentrantLock(); private final StampedLock _attackLock = new StampedLock(); @@ -354,48 +352,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe 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 */ @@ -2506,8 +2462,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe @Override public boolean deleteMe() { - setDebug(null); - if (hasAI()) { getAI().stopAITask(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 4eb22a5295..d5a038f487 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -11082,7 +11082,6 @@ public final class L2PcInstance extends L2Playable abortAttack(); abortCast(); stopMove(null); - setDebug(null); } catch (Exception e) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index 6a17ff8332..fdc5216d0c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -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.type.EtcItemType; 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; /** @@ -173,34 +171,6 @@ public final class EnchantScroll extends AbstractEnchantItem final double random = 100 * Rnd.nextDouble(); 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; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/options/Options.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/options/Options.java index 580f376983..809125a573 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/options/Options.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/options/Options.java @@ -75,7 +75,6 @@ public class Options { funcs.add(fuction); } - player.sendDebugMessage("Adding stats: " + fuctionTemplate.getStat() + " val: " + fuctionTemplate.getValue()); } return funcs; } @@ -157,7 +156,6 @@ public class Options public void apply(L2PcInstance player) { - player.sendDebugMessage("Activating option id: " + _id); if (hasFuncs()) { player.addStatFuncs(getStatFuncs(null, player)); @@ -165,19 +163,16 @@ public class Options if (hasActiveSkill()) { addSkill(player, getActiveSkill().getSkill()); - player.sendDebugMessage("Adding active skill: " + getActiveSkill()); } if (hasPassiveSkill()) { addSkill(player, getPassiveSkill().getSkill()); - player.sendDebugMessage("Adding passive skill: " + getPassiveSkill()); } if (hasActivationSkills()) { for (OptionsSkillHolder holder : _activationSkills) { player.addTriggerSkill(holder); - player.sendDebugMessage("Adding trigger skill: " + holder); } } @@ -186,7 +181,6 @@ public class Options public void remove(L2PcInstance player) { - player.sendDebugMessage("Deactivating option id: " + _id); if (hasFuncs()) { player.removeStatsOwner(this); @@ -194,19 +188,16 @@ public class Options if (hasActiveSkill()) { player.removeSkill(getActiveSkill().getSkill(), false, false); - player.sendDebugMessage("Removing active skill: " + getActiveSkill()); } if (hasPassiveSkill()) { player.removeSkill(getPassiveSkill().getSkill(), false, true); - player.sendDebugMessage("Removing passive skill: " + getPassiveSkill()); } if (hasActivationSkills()) { for (OptionsSkillHolder holder : _activationSkills) { player.removeTriggerSkill(holder); - player.sendDebugMessage("Removing trigger skill: " + holder); } } player.sendSkillList(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java index 2137a670e7..85517e7b80 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -1379,7 +1379,6 @@ public final class Skill implements IIdentifiable if (effected.isInvulAgainst(getId(), getLevel())) { - effected.sendDebugMessage("Skill " + toString() + " has been ignored (invul against)"); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 43e4b355a4..5a56f3b0a2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -32,7 +32,6 @@ import com.l2jmobius.gameserver.instancemanager.FortManager; import com.l2jmobius.gameserver.instancemanager.SiegeManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager; 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.L2Character; 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.L2FortZone; 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.serverpackets.SystemMessage; import com.l2jmobius.gameserver.util.Util; @@ -620,28 +618,6 @@ public final class Formulas damage *= weaponMod; 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); } @@ -711,26 +687,6 @@ public final class Formulas damage *= weaponMod; 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); } @@ -1431,19 +1387,6 @@ public final class Formulas final double rate = baseMod * elementMod * traitMod * mAtkMod * buffDebuffMod; 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)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); @@ -1503,19 +1446,6 @@ public final class Formulas // Check the Rate Limits. 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); } @@ -1546,17 +1476,6 @@ public final class Formulas final double resModifier = target.calcStat(Stats.MAGIC_SUCCESS_RES, 1, null, skill); 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); } @@ -1973,17 +1892,7 @@ public final class Formulas final double baseRate = blowChance * dexMod * sideMod; // Apply blow rates 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; } @@ -2000,15 +1909,7 @@ public final class Formulas final double prof = activeChar.calcStat(Stats.CANCEL_PROF, 0, target, null); final double resMod = 1 + (((vuln + prof) * -1) / 100); 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. final List buffs = target.getEffectList().hasBuffs() ? new ArrayList<>(target.getEffectList().getBuffs()) : new ArrayList<>(1); if (target.getEffectList().hasTriggered()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/DebugVoiceCommand.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/DebugVoiceCommand.ini deleted file mode 100644 index c65b9b3fe1..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/DebugVoiceCommand.ini +++ /dev/null @@ -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 diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java index 82c79f42d4..13dfd58039 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java @@ -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_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_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_FACTION_SYSTEM_CONFIG_FILE = "./config/Custom/FactionSystem.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 boolean MULTILANG_VOICED_ALLOW; 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_OLYMPIAD_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]))); } - // 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) final PropertiesParser DualboxCheck = new PropertiesParser(CUSTOM_DUALBOX_CHECK_CONFIG_FILE);