diff --git a/scripts/npc/commands.js b/scripts/npc/commands.js
deleted file mode 100644
index 8dfdc7aa302..00000000000
--- a/scripts/npc/commands.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/* @Author Ronan
- * @Author Vcoc
- Name: Steward
- Map(s): Foyer
- Info: Commands
- Script: commands.js
-*/
-
-var status;
-
-var common_heading = "@";
-var staff_heading = "!";
-
-var levels = ["Common", "Donator", "JrGM", "GM", "SuperGM", "Developer", "Admin"];
-var commands;
-
-function writeHeavenMSCommands() {
- const CommandsExecutor = Java.type('client.command.CommandsExecutor');
- commands = CommandsExecutor.getInstance().getGmCommands();
-}
-
-function start() {
- status = -1;
- writeHeavenMSCommands();
- action(1, 0, 0);
-}
-
-function action(mode, type, selection) {
- if (mode == -1) {
- cm.dispose();
- } else {
- if (mode == 0 && type > 0) {
- cm.dispose();
- return;
- }
- if (mode == 1) {
- status++;
- } else {
- status--;
- }
-
- if (status == 0) {
- var sendStr = "There are all available commands for you:\r\n\r\n#b";
- for (var i = 0; i <= cm.getPlayer().gmLevel(); i++) {
- sendStr += "#L" + i + "#" + levels[i] + "#l\r\n";
- }
-
- cm.sendSimple(sendStr);
- } else if (status == 1) {
- var lvComm, lvDesc, lvHead = (selection < 2) ? common_heading : staff_heading;
-
- if (selection > 6) {
- selection = 6;
- } else if (selection < 0) {
- selection = 0;
- }
-
- lvComm = commands.get(selection).getLeft();
- lvDesc = commands.get(selection).getRight();
-
- var sendStr = "The following commands are available for #b" + levels[selection] + "#k:\r\n\r\n";
- for (var i = 0; i < lvComm.size(); i++) {
- sendStr += " #L" + i + "# " + lvHead + lvComm.get(i) + " - " + lvDesc.get(i);
- sendStr += "#l\r\n";
- }
-
- cm.sendPrev(sendStr);
- } else {
- cm.dispose();
- }
- }
-}
diff --git a/src/main/java/client/command/Command.java b/src/main/java/client/command/Command.java
deleted file mode 100644
index 6fd6080be92..00000000000
--- a/src/main/java/client/command/Command.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see registeredCommands = new HashMap<>();
- private final List, List>> commandsNameDesc = new ArrayList<>();
- private Pair, List> levelCommandsCursor;
-
- public static CommandsExecutor getInstance() {
- return instance;
- }
-
- public static boolean isCommand(Client client, String content) {
- char heading = content.charAt(0);
- if (client.getPlayer().isGM()) {
- return heading == USER_HEADING || heading == GM_HEADING;
- }
- return heading == USER_HEADING;
- }
-
- private CommandsExecutor() {
- registerLv0Commands();
- registerLv1Commands();
- registerLv2Commands();
- registerLv3Commands();
- registerLv4Commands();
- registerLv5Commands();
- registerLv6Commands();
- }
-
- public List, List>> getGmCommands() {
- return commandsNameDesc;
- }
-
- public void handle(Client client, String message) {
- if (client.tryacquireClient()) {
- try {
- handleInternal(client, message);
- } finally {
- client.releaseClient();
- }
- } else {
- client.getPlayer().dropMessage(5, "Try again in a while... Latest commands are currently being processed.");
- }
- }
-
- private void handleInternal(Client client, String message) {
- if (client.getPlayer().getMapId() == MapId.JAIL) {
- client.getPlayer().yellowMessage("You do not have permission to use commands while in jail.");
- return;
- }
- final String splitRegex = "[ ]";
- String[] splitedMessage = message.substring(1).split(splitRegex, 2);
- if (splitedMessage.length < 2) {
- splitedMessage = new String[]{splitedMessage[0], ""};
- }
-
- client.getPlayer().setLastCommandMessage(splitedMessage[1]); // thanks Tochi & Nulliphite for noticing string messages being marshalled lowercase
- final String commandName = splitedMessage[0].toLowerCase();
- final String[] lowercaseParams = splitedMessage[1].toLowerCase().split(splitRegex);
-
- final Command command = registeredCommands.get(commandName);
- if (command == null) {
- client.getPlayer().yellowMessage("Command '" + commandName + "' is not available. See @commands for a list of available commands.");
- return;
- }
- if (client.getPlayer().gmLevel() < command.getRank()) {
- client.getPlayer().yellowMessage("You do not have permission to use this command.");
- return;
- }
- String[] params;
- if (lowercaseParams.length > 0 && !lowercaseParams[0].isEmpty()) {
- params = Arrays.copyOfRange(lowercaseParams, 0, lowercaseParams.length);
- } else {
- params = new String[]{};
- }
-
- command.execute(client, params);
- log.info("Chr {} used command {}", client.getPlayer().getName(), command.getClass().getSimpleName());
- }
-
- private void addCommandInfo(String name, Class commandClass) {
- try {
- levelCommandsCursor.getRight().add(commandClass.getDeclaredConstructor().newInstance().getDescription());
- levelCommandsCursor.getLeft().add(name);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private void addCommand(String[] syntaxs, Class commandClass) {
- for (String syntax : syntaxs) {
- addCommand(syntax, 0, commandClass);
- }
- }
-
- private void addCommand(String syntax, Class commandClass) {
- //for (String syntax : syntaxs){
- addCommand(syntax, 0, commandClass);
- //}
- }
-
- private void addCommand(String[] surtaxes, int rank, Class commandClass) {
- for (String syntax : surtaxes) {
- addCommand(syntax, rank, commandClass);
- }
- }
-
- private void addCommand(String syntax, int rank, Class commandClass) {
- if (registeredCommands.containsKey(syntax.toLowerCase())) {
- log.warn("Error on register command with name: {}. Already exists.", syntax);
- return;
- }
-
- String commandName = syntax.toLowerCase();
- addCommandInfo(commandName, commandClass);
-
- try {
- Command commandInstance = commandClass.getDeclaredConstructor().newInstance(); // thanks Halcyon for noticing commands getting reinstanced every call
- commandInstance.setRank(rank);
-
- registeredCommands.put(commandName, commandInstance);
- } catch (Exception e) {
- log.warn("Failed to create command instance", e);
- }
- }
-
- private void registerLv0Commands() {
- levelCommandsCursor = new Pair<>(new ArrayList(), new ArrayList());
-
- addCommand(new String[]{"help", "commands"}, HelpCommand.class);
- addCommand("droplimit", DropLimitCommand.class);
- addCommand("time", TimeCommand.class);
- addCommand("credits", StaffCommand.class);
- addCommand("uptime", UptimeCommand.class);
- addCommand("gacha", GachaCommand.class);
- addCommand("dispose", DisposeCommand.class);
- addCommand("equiplv", EquipLvCommand.class);
- addCommand("showrates", ShowRatesCommand.class);
- addCommand("rates", RatesCommand.class);
- addCommand("online", OnlineCommand.class);
- addCommand("gm", GmCommand.class);
- addCommand("reportbug", ReportBugCommand.class);
- addCommand("points", ReadPointsCommand.class);
- addCommand("joinevent", JoinEventCommand.class);
- addCommand("leaveevent", LeaveEventCommand.class);
- addCommand("ranks", RanksCommand.class);
- addCommand("str", StatStrCommand.class);
- addCommand("dex", StatDexCommand.class);
- addCommand("int", StatIntCommand.class);
- addCommand("luk", StatLukCommand.class);
- addCommand("toggleexp", ToggleExpCommand.class);
- addCommand("mylawn", MapOwnerClaimCommand.class);
- addCommand("bosshp", BossHpCommand.class);
- addCommand("mobhp", MobHpCommand.class);
-
- commandsNameDesc.add(levelCommandsCursor);
- }
-
-
- private void registerLv1Commands() {
- levelCommandsCursor = new Pair<>(new ArrayList(), new ArrayList());
-
- addCommand("whatdropsfrom", 1, WhatDropsFromCommand.class);
- addCommand("whodrops", 1, WhoDropsCommand.class);
- addCommand("buffme", 1, BuffMeCommand.class);
- addCommand("goto", 1, GotoCommand.class);
-
- commandsNameDesc.add(levelCommandsCursor);
- }
-
-
- private void registerLv2Commands() {
- levelCommandsCursor = new Pair<>(new ArrayList(), new ArrayList());
-
- addCommand("recharge", 2, RechargeCommand.class);
- addCommand("whereami", 2, WhereaMiCommand.class);
- addCommand("hide", 2, HideCommand.class);
- addCommand("unhide", 2, UnHideCommand.class);
- addCommand("sp", 2, SpCommand.class);
- addCommand("ap", 2, ApCommand.class);
- addCommand("empowerme", 2, EmpowerMeCommand.class);
- addCommand("buffmap", 2, BuffMapCommand.class);
- addCommand("buff", 2, BuffCommand.class);
- addCommand("bomb", 2, BombCommand.class);
- addCommand("dc", 2, DcCommand.class);
- addCommand("cleardrops", 2, ClearDropsCommand.class);
- addCommand("clearslot", 2, ClearSlotCommand.class);
- addCommand("clearsavelocs", 2, ClearSavedLocationsCommand.class);
- addCommand("warp", 2, WarpCommand.class);
- addCommand(new String[]{"warphere", "summon"}, 2, SummonCommand.class);
- addCommand(new String[]{"warpto", "reach", "follow"}, 2, ReachCommand.class);
- addCommand("gmshop", 2, GmShopCommand.class);
- addCommand("heal", 2, HealCommand.class);
- addCommand("item", 2, ItemCommand.class);
- addCommand("drop", 2, ItemDropCommand.class);
- addCommand("level", 2, LevelCommand.class);
- addCommand("levelpro", 2, LevelProCommand.class);
- addCommand("setslot", 2, SetSlotCommand.class);
- addCommand("setstat", 2, SetStatCommand.class);
- addCommand("maxstat", 2, MaxStatCommand.class);
- addCommand("maxskill", 2, MaxSkillCommand.class);
- addCommand("resetskill", 2, ResetSkillCommand.class);
- addCommand("search", 2, SearchCommand.class);
- addCommand("jail", 2, JailCommand.class);
- addCommand("unjail", 2, UnJailCommand.class);
- addCommand("job", 2, JobCommand.class);
- addCommand("unbug", 2, UnBugCommand.class);
- addCommand("id", 2, IdCommand.class);
- addCommand("gachalist", GachaListCommand.class);
- addCommand("loot", LootCommand.class);
- addCommand("mobskill", MobSkillCommand.class);
-
- commandsNameDesc.add(levelCommandsCursor);
- }
-
- private void registerLv3Commands() {
- levelCommandsCursor = new Pair<>(new ArrayList(), new ArrayList());
-
- addCommand("debuff", 3, DebuffCommand.class);
- addCommand("fly", 3, FlyCommand.class);
- addCommand("spawn", 3, SpawnCommand.class);
- addCommand("mutemap", 3, MuteMapCommand.class);
- addCommand("checkdmg", 3, CheckDmgCommand.class);
- addCommand("inmap", 3, InMapCommand.class);
- addCommand("reloadevents", 3, ReloadEventsCommand.class);
- addCommand("reloaddrops", 3, ReloadDropsCommand.class);
- addCommand("reloadportals", 3, ReloadPortalsCommand.class);
- addCommand("reloadmap", 3, ReloadMapCommand.class);
- addCommand("reloadshops", 3, ReloadShopsCommand.class);
- addCommand("hpmp", 3, HpMpCommand.class);
- addCommand("maxhpmp", 3, MaxHpMpCommand.class);
- addCommand("music", 3, MusicCommand.class);
- addCommand("monitor", 3, MonitorCommand.class);
- addCommand("monitors", 3, MonitorsCommand.class);
- addCommand("ignore", 3, IgnoreCommand.class);
- addCommand("ignored", 3, IgnoredCommand.class);
- addCommand("pos", 3, PosCommand.class);
- addCommand("togglecoupon", 3, ToggleCouponCommand.class);
- addCommand("togglewhitechat", 3, ChatCommand.class);
- addCommand("fame", 3, FameCommand.class);
- addCommand("givenx", 3, GiveNxCommand.class);
- addCommand("givevp", 3, GiveVpCommand.class);
- addCommand("givems", 3, GiveMesosCommand.class);
- addCommand("giverp", 3, GiveRpCommand.class);
- addCommand("expeds", 3, ExpedsCommand.class);
- addCommand("kill", 3, KillCommand.class);
- addCommand("seed", 3, SeedCommand.class);
- addCommand("maxenergy", 3, MaxEnergyCommand.class);
- addCommand("killall", 3, KillAllCommand.class);
- addCommand("notice", 3, NoticeCommand.class);
- addCommand("rip", 3, RipCommand.class);
- addCommand("openportal", 3, OpenPortalCommand.class);
- addCommand("closeportal", 3, ClosePortalCommand.class);
- addCommand("pe", 3, PeCommand.class);
- addCommand("startevent", 3, StartEventCommand.class);
- addCommand("endevent", 3, EndEventCommand.class);
- addCommand("startmapevent", 3, StartMapEventCommand.class);
- addCommand("stopmapevent", 3, StopMapEventCommand.class);
- addCommand("online2", 3, OnlineTwoCommand.class);
- addCommand("ban", 3, BanCommand.class);
- addCommand("unban", 3, UnBanCommand.class);
- addCommand("healmap", 3, HealMapCommand.class);
- addCommand("healperson", 3, HealPersonCommand.class);
- addCommand("hurt", 3, HurtCommand.class);
- addCommand("killmap", 3, KillMapCommand.class);
- addCommand("night", 3, NightCommand.class);
- addCommand("npc", 3, NpcCommand.class);
- addCommand("face", 3, FaceCommand.class);
- addCommand("hair", 3, HairCommand.class);
- addCommand("startquest", 3, QuestStartCommand.class);
- addCommand("completequest", 3, QuestCompleteCommand.class);
- addCommand("resetquest", 3, QuestResetCommand.class);
- addCommand("timer", 3, TimerCommand.class);
- addCommand("timermap", 3, TimerMapCommand.class);
- addCommand("timerall", 3, TimerAllCommand.class);
- addCommand("warpmap", 3, WarpMapCommand.class);
- addCommand("warparea", 3, WarpAreaCommand.class);
-
- commandsNameDesc.add(levelCommandsCursor);
- }
-
- private void registerLv4Commands() {
- levelCommandsCursor = new Pair<>(new ArrayList(), new ArrayList());
-
- addCommand("servermessage", 4, ServerMessageCommand.class);
- addCommand("proitem", 4, ProItemCommand.class);
- addCommand("seteqstat", 4, SetEqStatCommand.class);
- addCommand("exprate", 4, ExpRateCommand.class);
- addCommand("mesorate", 4, MesoRateCommand.class);
- addCommand("droprate", 4, DropRateCommand.class);
- addCommand("bossdroprate", 4, BossDropRateCommand.class);
- addCommand("questrate", 4, QuestRateCommand.class);
- addCommand("travelrate", 4, TravelRateCommand.class);
- addCommand("fishrate", 4, FishingRateCommand.class);
- addCommand("itemvac", 4, ItemVacCommand.class);
- addCommand("forcevac", 4, ForceVacCommand.class);
- addCommand("zakum", 4, ZakumCommand.class);
- addCommand("horntail", 4, HorntailCommand.class);
- addCommand("pinkbean", 4, PinkbeanCommand.class);
- addCommand("pap", 4, PapCommand.class);
- addCommand("pianus", 4, PianusCommand.class);
- addCommand("cake", 4, CakeCommand.class);
- addCommand("playernpc", 4, PlayerNpcCommand.class);
- addCommand("playernpcremove", 4, PlayerNpcRemoveCommand.class);
- addCommand("pnpc", 4, PnpcCommand.class);
- addCommand("pnpcremove", 4, PnpcRemoveCommand.class);
- addCommand("pmob", 4, PmobCommand.class);
- addCommand("pmobremove", 4, PmobRemoveCommand.class);
-
- commandsNameDesc.add(levelCommandsCursor);
- }
-
- private void registerLv5Commands() {
- levelCommandsCursor = new Pair<>(new ArrayList(), new ArrayList());
-
- addCommand("debug", 5, DebugCommand.class);
- addCommand("set", 5, SetCommand.class);
- addCommand("showpackets", 5, ShowPacketsCommand.class);
- addCommand("showmovelife", 5, ShowMoveLifeCommand.class);
- addCommand("showsessions", 5, ShowSessionsCommand.class);
- addCommand("iplist", 5, IpListCommand.class);
-
- commandsNameDesc.add(levelCommandsCursor);
- }
-
- private void registerLv6Commands() {
- levelCommandsCursor = new Pair<>(new ArrayList(), new ArrayList());
-
- addCommand("setgmlevel", 6, SetGmLevelCommand.class);
- addCommand("warpworld", 6, WarpWorldCommand.class);
- addCommand("saveall", 6, SaveAllCommand.class);
- addCommand("dcall", 6, DCAllCommand.class);
- addCommand("mapplayers", 6, MapPlayersCommand.class);
- addCommand("getacc", 6, GetAccCommand.class);
- addCommand("shutdown", 6, ShutdownCommand.class);
- addCommand("clearquestcache", 6, ClearQuestCacheCommand.class);
- addCommand("clearquest", 6, ClearQuestCommand.class);
- addCommand("supplyratecoupon", 6, SupplyRateCouponCommand.class);
- addCommand("spawnallpnpcs", 6, SpawnAllPNpcsCommand.class);
- addCommand("eraseallpnpcs", 6, EraseAllPNpcsCommand.class);
- addCommand("addchannel", 6, ServerAddChannelCommand.class);
- addCommand("addworld", 6, ServerAddWorldCommand.class);
- addCommand("removechannel", 6, ServerRemoveChannelCommand.class);
- addCommand("removeworld", 6, ServerRemoveWorldCommand.class);
- addCommand("devtest", 6, DevtestCommand.class);
-
- commandsNameDesc.add(levelCommandsCursor);
- }
-
-}
diff --git a/src/main/java/client/command/commands/gm0/DisposeCommand.java b/src/main/java/client/command/commands/gm0/DisposeCommand.java
deleted file mode 100644
index c5f3543deba..00000000000
--- a/src/main/java/client/command/commands/gm0/DisposeCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see where name corresponds to one of the below:");
- for (String name : names) {
- c.getPlayer().yellowMessage(name);
- }
- return;
- }
- String talkStr = "The #b" + gachaName + "#k Gachapon contains the following items.\r\n\r\n";
- for (int i = 0; i < 2; i++) {
- for (int id : gacha.getItems(i)) {
- talkStr += "-" + ItemInformationProvider.getInstance().getName(id) + "\r\n";
- }
- }
- talkStr += "\r\nPlease keep in mind that there are items that are in all gachapons and are not listed here.";
-
- c.getAbstractPlayerInteraction().npcTalk(NpcId.MAPLE_ADMINISTRATOR, talkStr);
- }
-}
diff --git a/src/main/java/client/command/commands/gm0/GmCommand.java b/src/main/java/client/command/commands/gm0/GmCommand.java
deleted file mode 100644
index 5d24133717b..00000000000
--- a/src/main/java/client/command/commands/gm0/GmCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see > worldRanking = Server.getInstance().getWorldPlayerRanking(player.getWorld());
- player.sendPacket(GuildPackets.showPlayerRanks(NpcId.MAPLE_ADMINISTRATOR, worldRanking));
- }
-}
diff --git a/src/main/java/client/command/commands/gm0/RatesCommand.java b/src/main/java/client/command/commands/gm0/RatesCommand.java
deleted file mode 100644
index 95181d6dcf4..00000000000
--- a/src/main/java/client/command/commands/gm0/RatesCommand.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
- String message = player.getLastCommandMessage();
- Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[Bug]:" + Character.makeMapleReadable(player.getName()) + ": " + message));
- Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(1, message));
- log.info("{}: {}", Character.makeMapleReadable(player.getName()), message);
- player.dropMessage(5, "Your bug '" + message + "' was submitted successfully to our developers. Thank you!");
-
- }
-}
diff --git a/src/main/java/client/command/commands/gm0/ShowRatesCommand.java b/src/main/java/client/command/commands/gm0/ShowRatesCommand.java
deleted file mode 100644
index 3a14f49e0fd..00000000000
--- a/src/main/java/client/command/commands/gm0/ShowRatesCommand.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see > towns = new ArrayList<>(GameConstants.GOTO_TOWNS.entrySet());
- sortGotoEntries(towns);
-
- try {
- // thanks shavit for noticing goto areas getting loaded from wz needlessly only for the name retrieval
-
- for (Map.Entry e : towns) {
- GOTO_TOWNS_INFO += ("'" + e.getKey() + "' - #b" + (MapFactory.loadPlaceName(e.getValue())) + "#k\r\n");
- }
-
- List> areas = new ArrayList<>(GameConstants.GOTO_AREAS.entrySet());
- sortGotoEntries(areas);
- for (Map.Entry e : areas) {
- GOTO_AREAS_INFO += ("'" + e.getKey() + "' - #b" + (MapFactory.loadPlaceName(e.getValue())) + "#k\r\n");
- }
- } catch (Exception e) {
- e.printStackTrace();
-
- GOTO_TOWNS_INFO = "(none)";
- GOTO_AREAS_INFO = "(none)";
- }
-
- }
-
- public static String GOTO_TOWNS_INFO = "";
- public static String GOTO_AREAS_INFO = "";
-
- private static void sortGotoEntries(List> listEntries) {
- listEntries.sort((e1, e2) -> e1.getValue().compareTo(e2.getValue()));
- }
-
- @Override
- public void execute(Client c, String[] params) {
- Character player = c.getPlayer();
- if (params.length < 1) {
- String sendStr = "Syntax: #b@goto #k. Available areas:\r\n\r\n#rTowns:#k\r\n" + GOTO_TOWNS_INFO;
- if (player.isGM()) {
- sendStr += ("\r\n#rAreas:#k\r\n" + GOTO_AREAS_INFO);
- }
-
- player.getAbstractPlayerInteraction().npcTalk(NpcId.SPINEL, sendStr);
- return;
- }
-
- if (!player.isAlive()) {
- player.dropMessage(1, "This command cannot be used when you're dead.");
- return;
- }
-
- if (!player.isGM()) {
- if (player.getEventInstance() != null || MiniDungeonInfo.isDungeonMap(player.getMapId()) || FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) {
- player.dropMessage(1, "This command can not be used in this map.");
- return;
- }
- }
-
- Map gotomaps;
- if (player.isGM()) {
- gotomaps = new HashMap<>(GameConstants.GOTO_AREAS); // distinct map registry for GM/users suggested thanks to Vcoc
- gotomaps.putAll(GameConstants.GOTO_TOWNS); // thanks Halcyon (UltimateMors) for pointing out duplicates on listed entries functionality
- } else {
- gotomaps = GameConstants.GOTO_TOWNS;
- }
-
- if (gotomaps.containsKey(params[0])) {
- MapleMap target = c.getChannelServer().getMapFactory().getMap(gotomaps.get(params[0]));
-
- // expedition issue with this command detected thanks to Masterrulax
- Portal targetPortal = target.getRandomPlayerSpawnpoint();
- player.saveLocationOnWarp();
- player.changeMap(target, targetPortal);
- } else {
- // detailed info on goto available areas suggested thanks to Vcoc
- String sendStr = "Area '#r" + params[0] + "#k' is not available. Available areas:\r\n\r\n#rTowns:#k" + GOTO_TOWNS_INFO;
- if (player.isGM()) {
- sendStr += ("\r\n#rAreas:#k\r\n" + GOTO_AREAS_INFO);
- }
-
- player.getAbstractPlayerInteraction().npcTalk(NpcId.SPINEL, sendStr);
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm1/MobHpCommand.java b/src/main/java/client/command/commands/gm1/MobHpCommand.java
deleted file mode 100644
index ee9310eadab..00000000000
--- a/src/main/java/client/command/commands/gm1/MobHpCommand.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
- String monsterName = player.getLastCommandMessage();
- String output = "";
- int limit = 3;
- Iterator> listIterator = MonsterInformationProvider.getMobsIDsFromName(monsterName).iterator();
- for (int i = 0; i < limit; i++) {
- if (listIterator.hasNext()) {
- Pair data = listIterator.next();
- int mobId = data.getLeft();
- String mobName = data.getRight();
- output += mobName + " drops the following items:\r\n\r\n";
- for (MonsterDropEntry drop : MonsterInformationProvider.getInstance().retrieveDrop(mobId)) {
- try {
- String name = ItemInformationProvider.getInstance().getName(drop.itemId);
- if (name == null || name.equals("null") || drop.chance == 0) {
- continue;
- }
- float chance = Math.max(1000000 / drop.chance / (!MonsterInformationProvider.getInstance().isBoss(mobId) ? player.getDropRate() : player.getBossDropRate()), 1);
- output += "- " + name + " (1/" + (int) chance + ")\r\n";
- } catch (Exception ex) {
- ex.printStackTrace();
- continue;
- }
- }
- output += "\r\n";
- }
- }
-
- c.getAbstractPlayerInteraction().npcTalk(NpcId.MAPLE_ADMINISTRATOR, output);
- }
-}
diff --git a/src/main/java/client/command/commands/gm1/WhoDropsCommand.java b/src/main/java/client/command/commands/gm1/WhoDropsCommand.java
deleted file mode 100644
index 1c27c8c9b02..00000000000
--- a/src/main/java/client/command/commands/gm1/WhoDropsCommand.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see - ");
- return;
- }
-
- if (c.tryacquireClient()) {
- try {
- String searchString = player.getLastCommandMessage();
- String output = "";
- Iterator
> listIterator = ItemInformationProvider.getInstance().getItemDataByName(searchString).iterator();
- if (listIterator.hasNext()) {
- int count = 1;
- while (listIterator.hasNext() && count <= 3) {
- Pair data = listIterator.next();
- output += "#b" + data.getRight() + "#k is dropped by:\r\n";
- try (Connection con = DatabaseConnection.getConnection();
- PreparedStatement ps = con.prepareStatement("SELECT dropperid FROM drop_data WHERE itemid = ? LIMIT 50")) {
- ps.setInt(1, data.getLeft());
-
- try (ResultSet rs = ps.executeQuery()) {
- while (rs.next()) {
- String resultName = MonsterInformationProvider.getInstance().getMobNameFromId(rs.getInt("dropperid"));
- if (resultName != null) {
- output += resultName + ", ";
- }
- }
- }
- } catch (Exception e) {
- player.dropMessage(6, "There was a problem retrieving the required data. Please try again.");
- e.printStackTrace();
- return;
- }
- output += "\r\n\r\n";
- count++;
- }
- } else {
- player.dropMessage(5, "The item you searched for doesn't exist.");
- return;
- }
-
- c.getAbstractPlayerInteraction().npcTalk(NpcId.MAPLE_ADMINISTRATOR, output);
- } finally {
- c.releaseClient();
- }
- } else {
- player.dropMessage(5, "Please wait a while for your request to be processed.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/ApCommand.java b/src/main/java/client/command/commands/gm2/ApCommand.java
deleted file mode 100644
index 83068f8f01c..00000000000
--- a/src/main/java/client/command/commands/gm2/ApCommand.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ] ");
- return;
- }
-
- if (params.length < 2) {
- int newAp = Integer.parseInt(params[0]);
- if (newAp < 0) {
- newAp = 0;
- } else if (newAp > YamlConfig.config.server.MAX_AP) {
- newAp = YamlConfig.config.server.MAX_AP;
- }
-
- player.changeRemainingAp(newAp, false);
- } else {
- Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim != null) {
- int newAp = Integer.parseInt(params[1]);
- if (newAp < 0) {
- newAp = 0;
- } else if (newAp > YamlConfig.config.server.MAX_AP) {
- newAp = YamlConfig.config.server.MAX_AP;
- }
-
- victim.changeRemainingAp(newAp, false);
- } else {
- player.message("Player '" + params[0] + "' could not be found.");
- }
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/BombCommand.java b/src/main/java/client/command/commands/gm2/BombCommand.java
deleted file mode 100644
index aa609bfefb0..00000000000
--- a/src/main/java/client/command/commands/gm2/BombCommand.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
- int skillid = Integer.parseInt(params[0]);
-
- Skill skill = SkillFactory.getSkill(skillid);
- if (skill != null) {
- skill.getEffect(skill.getMaxLevel()).applyTo(player);
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/BuffMapCommand.java b/src/main/java/client/command/commands/gm2/BuffMapCommand.java
deleted file mode 100644
index c1433d30c87..00000000000
--- a/src/main/java/client/command/commands/gm2/BuffMapCommand.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
- String type = params[0];
- switch (type) {
- case "all":
- for (int i = 0; i < 101; i++) {
- Item tempItem = c.getPlayer().getInventory(InventoryType.EQUIP).getItem((byte) i);
- if (tempItem == null) {
- continue;
- }
- InventoryManipulator.removeFromSlot(c, InventoryType.EQUIP, (byte) i, tempItem.getQuantity(), false, false);
- }
- for (int i = 0; i < 101; i++) {
- Item tempItem = c.getPlayer().getInventory(InventoryType.USE).getItem((byte) i);
- if (tempItem == null) {
- continue;
- }
- InventoryManipulator.removeFromSlot(c, InventoryType.USE, (byte) i, tempItem.getQuantity(), false, false);
- }
- for (int i = 0; i < 101; i++) {
- Item tempItem = c.getPlayer().getInventory(InventoryType.ETC).getItem((byte) i);
- if (tempItem == null) {
- continue;
- }
- InventoryManipulator.removeFromSlot(c, InventoryType.ETC, (byte) i, tempItem.getQuantity(), false, false);
- }
- for (int i = 0; i < 101; i++) {
- Item tempItem = c.getPlayer().getInventory(InventoryType.SETUP).getItem((byte) i);
- if (tempItem == null) {
- continue;
- }
- InventoryManipulator.removeFromSlot(c, InventoryType.SETUP, (byte) i, tempItem.getQuantity(), false, false);
- }
- for (int i = 0; i < 101; i++) {
- Item tempItem = c.getPlayer().getInventory(InventoryType.CASH).getItem((byte) i);
- if (tempItem == null) {
- continue;
- }
- InventoryManipulator.removeFromSlot(c, InventoryType.CASH, (byte) i, tempItem.getQuantity(), false, false);
- }
- player.yellowMessage("All Slots Cleared.");
- break;
- case "equip":
- for (int i = 0; i < 101; i++) {
- Item tempItem = c.getPlayer().getInventory(InventoryType.EQUIP).getItem((byte) i);
- if (tempItem == null) {
- continue;
- }
- InventoryManipulator.removeFromSlot(c, InventoryType.EQUIP, (byte) i, tempItem.getQuantity(), false, false);
- }
- player.yellowMessage("Equipment Slot Cleared.");
- break;
- case "use":
- for (int i = 0; i < 101; i++) {
- Item tempItem = c.getPlayer().getInventory(InventoryType.USE).getItem((byte) i);
- if (tempItem == null) {
- continue;
- }
- InventoryManipulator.removeFromSlot(c, InventoryType.USE, (byte) i, tempItem.getQuantity(), false, false);
- }
- player.yellowMessage("Use Slot Cleared.");
- break;
- case "setup":
- for (int i = 0; i < 101; i++) {
- Item tempItem = c.getPlayer().getInventory(InventoryType.SETUP).getItem((byte) i);
- if (tempItem == null) {
- continue;
- }
- InventoryManipulator.removeFromSlot(c, InventoryType.SETUP, (byte) i, tempItem.getQuantity(), false, false);
- }
- player.yellowMessage("Set-Up Slot Cleared.");
- break;
- case "etc":
- for (int i = 0; i < 101; i++) {
- Item tempItem = c.getPlayer().getInventory(InventoryType.ETC).getItem((byte) i);
- if (tempItem == null) {
- continue;
- }
- InventoryManipulator.removeFromSlot(c, InventoryType.ETC, (byte) i, tempItem.getQuantity(), false, false);
- }
- player.yellowMessage("ETC Slot Cleared.");
- break;
- case "cash":
- for (int i = 0; i < 101; i++) {
- Item tempItem = c.getPlayer().getInventory(InventoryType.CASH).getItem((byte) i);
- if (tempItem == null) {
- continue;
- }
- InventoryManipulator.removeFromSlot(c, InventoryType.CASH, (byte) i, tempItem.getQuantity(), false, false);
- }
- player.yellowMessage("Cash Slot Cleared.");
- break;
- default:
- player.yellowMessage("Slot" + type + " does not exist!");
- break;
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/DcCommand.java b/src/main/java/client/command/commands/gm2/DcCommand.java
deleted file mode 100644
index 1ae5f093d37..00000000000
--- a/src/main/java/client/command/commands/gm2/DcCommand.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim == null) {
- victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim == null) {
- victim = player.getMap().getCharacterByName(params[0]);
- if (victim != null) {
- try {//sometimes bugged because the map = null
- victim.getClient().disconnect(true, false);
- player.getMap().removePlayer(victim);
- } catch (Exception e) {
- e.printStackTrace();
- }
- } else {
- return;
- }
- }
- }
- if (player.gmLevel() < victim.gmLevel()) {
- victim = player;
- }
- victim.getClient().disconnect(false, false);
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/EmpowerMeCommand.java b/src/main/java/client/command/commands/gm2/EmpowerMeCommand.java
deleted file mode 100644
index 58c52b9b479..00000000000
--- a/src/main/java/client/command/commands/gm2/EmpowerMeCommand.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see handbookDirectory = typeFilePaths();
- private final Map typeItems = new ConcurrentHashMap<>();
-
- private Map typeFilePaths() {
- return Map.ofEntries(
- Map.entry("map", "handbook/Map.txt"),
- Map.entry("etc", "handbook/Etc.txt"),
- Map.entry("npc", "handbook/NPC.txt"),
- Map.entry("use", "handbook/Use.txt"),
- Map.entry("weapon", "handbook/Equip/Weapon.txt") // TODO add more into this
- );
- }
-
- private static class HandbookFileItems {
- private final List items;
-
- public HandbookFileItems(List fileLines) {
- this.items = fileLines.stream()
- .map(this::parseLine)
- .filter(Predicate.not(Objects::isNull))
- .toList();
- }
-
- private HandbookItem parseLine(String line) {
- if (line == null) {
- return null;
- }
-
- String[] splitLine = line.split(" - ", 2);
- if (splitLine.length < 2 || splitLine[1].isBlank()) {
- return null;
- }
- return new HandbookItem(splitLine[0], splitLine[1]);
- }
-
- public List search(String query) {
- if (query == null || query.isBlank()) {
- return Collections.emptyList();
- }
- return items.stream()
- .filter(item -> item.matches(query))
- .toList();
- }
- }
-
- private record HandbookItem(String id, String name) {
-
- public HandbookItem {
- Objects.requireNonNull(id);
- Objects.requireNonNull(name);
- }
-
- public boolean matches(String query) {
- if (query == null) {
- return false;
- }
- return this.name.toLowerCase().contains(query.toLowerCase());
- }
- }
-
- @Override
- public void execute(Client client, final String[] params) {
- final Character chr = client.getPlayer();
- if (params.length < 2) {
- chr.yellowMessage("Syntax: !id ");
- return;
- }
- final String type = params[0].toLowerCase();
- final String[] queryItems = Arrays.copyOfRange(params, 1, params.length);
- final String query = String.join(" ", queryItems);
- chr.yellowMessage("Querying for entry... May take some time... Please try to refine your search.");
- Runnable queryRunnable = () -> {
- try {
- populateIdMap(type);
-
- final HandbookFileItems handbookFileItems = typeItems.get(type);
- if (handbookFileItems == null) {
- return;
- }
- final List searchHits = handbookFileItems.search(query);
-
- if (!searchHits.isEmpty()) {
- String searchHitsText = searchHits.stream()
- .limit(MAX_SEARCH_HITS)
- .map(item -> "Id for %s is: #b%s#k".formatted(item.name, item.id))
- .collect(Collectors.joining(NpcChat.NEW_LINE));
- int hitsCount = Math.min(searchHits.size(), MAX_SEARCH_HITS);
- String summaryText = "Results found: #r%d#k | Returned: #b%d#k/100 | Refine search query to improve time.".formatted(searchHits.size(), hitsCount);
- String fullText = searchHitsText + NpcChat.NEW_LINE + summaryText;
- chr.getAbstractPlayerInteraction().npcTalk(NpcId.MAPLE_ADMINISTRATOR, fullText);
- } else {
- chr.yellowMessage(String.format("Id not found for item: %s, of type: %s.", query, type));
- }
- } catch (IdTypeNotSupportedException e) {
- chr.yellowMessage("Your query type is not supported.");
- } catch (IOException e) {
- chr.yellowMessage("Error reading file, please contact your administrator.");
- }
- };
-
- ThreadManager.getInstance().newTask(queryRunnable);
- }
-
- private void populateIdMap(String type) throws IdTypeNotSupportedException, IOException {
- final String filePath = handbookDirectory.get(type);
- if (filePath == null) {
- throw new IdTypeNotSupportedException();
- }
- if (typeItems.containsKey(type)) {
- return;
- }
-
- final List fileLines = Files.readAllLines(Path.of(filePath));
- typeItems.put(type, new HandbookFileItems(fileLines));
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/ItemCommand.java b/src/main/java/client/command/commands/gm2/ItemCommand.java
deleted file mode 100644
index d74f47b1d21..00000000000
--- a/src/main/java/client/command/commands/gm2/ItemCommand.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- int itemId = Integer.parseInt(params[0]);
- ItemInformationProvider ii = ItemInformationProvider.getInstance();
-
- if (ii.getName(itemId) == null) {
- player.yellowMessage("Item id '" + params[0] + "' does not exist.");
- return;
- }
-
- short quantity = 1;
- if (params.length >= 2) {
- quantity = Short.parseShort(params[1]);
- }
-
- if (YamlConfig.config.server.BLOCK_GENERATE_CASH_ITEM && ii.isCash(itemId)) {
- player.yellowMessage("You cannot create a cash item with this command.");
- return;
- }
-
- if (ItemConstants.isPet(itemId)) {
- if (params.length >= 2) { // thanks to istreety & TacoBell
- quantity = 1;
- long days = Math.max(1, Integer.parseInt(params[1]));
- long expiration = System.currentTimeMillis() + DAYS.toMillis(days);
- int petid = Pet.createPet(itemId);
-
- InventoryManipulator.addById(c, itemId, quantity, player.getName(), petid, expiration);
- return;
- } else {
- player.yellowMessage("Pet Syntax: !item ");
- return;
- }
- }
-
- short flag = 0;
- if (player.gmLevel() < 3) {
- flag |= ItemConstants.ACCOUNT_SHARING;
- flag |= ItemConstants.UNTRADEABLE;
- }
-
- InventoryManipulator.addById(c, itemId, quantity, player.getName(), -1, flag, -1);
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/ItemDropCommand.java b/src/main/java/client/command/commands/gm2/ItemDropCommand.java
deleted file mode 100644
index ff065c651fd..00000000000
--- a/src/main/java/client/command/commands/gm2/ItemDropCommand.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- int itemId = Integer.parseInt(params[0]);
- ItemInformationProvider ii = ItemInformationProvider.getInstance();
-
- if (ii.getName(itemId) == null) {
- player.yellowMessage("Item id '" + params[0] + "' does not exist.");
- return;
- }
-
- short quantity = 1;
- if (params.length >= 2) {
- quantity = Short.parseShort(params[1]);
- }
-
- if (YamlConfig.config.server.BLOCK_GENERATE_CASH_ITEM && ii.isCash(itemId)) {
- player.yellowMessage("You cannot create a cash item with this command.");
- return;
- }
-
- if (ItemConstants.isPet(itemId)) {
- if (params.length >= 2) { // thanks to istreety & TacoBell
- quantity = 1;
- long days = Math.max(1, Integer.parseInt(params[1]));
- long expiration = System.currentTimeMillis() + DAYS.toMillis(days);
- int petid = Pet.createPet(itemId);
-
- Item toDrop = new Item(itemId, (short) 0, quantity, petid);
- toDrop.setExpiration(expiration);
-
- toDrop.setOwner("");
- if (player.gmLevel() < 3) {
- short f = toDrop.getFlag();
- f |= ItemConstants.ACCOUNT_SHARING;
- f |= ItemConstants.UNTRADEABLE;
- f |= ItemConstants.SANDBOX;
-
- toDrop.setFlag(f);
- toDrop.setOwner("TRIAL-MODE");
- }
-
- c.getPlayer().getMap().spawnItemDrop(c.getPlayer(), c.getPlayer(), toDrop, c.getPlayer().getPosition(), true, true);
-
- return;
- } else {
- player.yellowMessage("Pet Syntax: !drop ");
- return;
- }
- }
-
- Item toDrop;
- if (ItemConstants.getInventoryType(itemId) == InventoryType.EQUIP) {
- toDrop = ii.getEquipById(itemId);
- } else {
- toDrop = new Item(itemId, (short) 0, quantity);
- }
-
- toDrop.setOwner(player.getName());
- if (player.gmLevel() < 3) {
- short f = toDrop.getFlag();
- f |= ItemConstants.ACCOUNT_SHARING;
- f |= ItemConstants.UNTRADEABLE;
- f |= ItemConstants.SANDBOX;
-
- toDrop.setFlag(f);
- toDrop.setOwner("TRIAL-MODE");
- }
-
- c.getPlayer().getMap().spawnItemDrop(c.getPlayer(), c.getPlayer(), toDrop, c.getPlayer().getPosition(), true, true);
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/JailCommand.java b/src/main/java/client/command/commands/gm2/JailCommand.java
deleted file mode 100644
index 671199d1e3d..00000000000
--- a/src/main/java/client/command/commands/gm2/JailCommand.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see []");
- return;
- }
-
- int minutesJailed = 5;
- if (params.length >= 2) {
- minutesJailed = Integer.parseInt(params[1]);
- if (minutesJailed <= 0) {
- player.yellowMessage("Syntax: !jail []");
- return;
- }
- }
-
- Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim != null) {
- victim.addJailExpirationTime(MINUTES.toMillis(minutesJailed));
-
- if (victim.getMapId() != MapId.JAIL) { // those gone to jail won't be changing map anyway
- MapleMap target = c.getChannelServer().getMapFactory().getMap(MapId.JAIL);
- Portal targetPortal = target.getPortal(0);
- victim.saveLocationOnWarp();
- victim.changeMap(target, targetPortal);
- player.message(victim.getName() + " was jailed for " + minutesJailed + " minutes.");
- } else {
- player.message(victim.getName() + "'s time in jail has been extended for " + minutesJailed + " minutes.");
- }
-
- } else {
- player.message("Player '" + params[0] + "' could not be found.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/JobCommand.java b/src/main/java/client/command/commands/gm2/JobCommand.java
deleted file mode 100644
index c233499e404..00000000000
--- a/src/main/java/client/command/commands/gm2/JobCommand.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/LevelCommand.java b/src/main/java/client/command/commands/gm2/LevelCommand.java
deleted file mode 100644
index b0846be4eba..00000000000
--- a/src/main/java/client/command/commands/gm2/LevelCommand.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- player.loseExp(player.getExp(), false, false);
- player.setLevel(Math.min(Integer.parseInt(params[0]), player.getMaxClassLevel()) - 1);
-
- player.resetPlayerRates();
- if (YamlConfig.config.server.USE_ADD_RATES_BY_LEVEL) {
- player.setPlayerRates();
- }
- player.setWorldRates();
-
- player.levelUp(false);
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/LevelProCommand.java b/src/main/java/client/command/commands/gm2/LevelProCommand.java
deleted file mode 100644
index 20afd63b502..00000000000
--- a/src/main/java/client/command/commands/gm2/LevelProCommand.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
- while (player.getLevel() < Math.min(player.getMaxClassLevel(), Integer.parseInt(params[0]))) {
- player.levelUp(false);
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/LootCommand.java b/src/main/java/client/command/commands/gm2/LootCommand.java
deleted file mode 100644
index 6ad115e34de..00000000000
--- a/src/main/java/client/command/commands/gm2/LootCommand.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see items = c.getPlayer().getMap().getMapObjectsInRange(c.getPlayer().getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapObjectType.ITEM));
- for (MapObject item : items) {
- MapItem mapItem = (MapItem) item;
- if (mapItem.getOwnerId() == c.getPlayer().getId() || mapItem.getOwnerId() == c.getPlayer().getPartyId()) {
- c.getPlayer().pickupItem(mapItem);
- }
- }
-
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/MaxSkillCommand.java b/src/main/java/client/command/commands/gm2/MaxSkillCommand.java
deleted file mode 100644
index 8f1ffbd9a61..00000000000
--- a/src/main/java/client/command/commands/gm2/MaxSkillCommand.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- }
-
- @Override
- public void execute(Client client, String[] params) {
- if (params.length < 2) {
- throw new IllegalArgumentException("Mob skill command requires two args: mob skill id and level");
- }
-
- String skillId = params[0];
- String skillLevel = params[1];
- Optional possibleType = MobSkillType.from(Integer.parseInt(skillId));
- Optional possibleSkill = possibleType.map(
- type -> MobSkillFactory.getMobSkillOrThrow(type, Integer.parseInt(skillLevel))
- );
- if (possibleSkill.isEmpty()) {
- return;
- }
-
- Character chr = client.getPlayer();
- MobSkill mobSkill = possibleSkill.get();
- chr.getMap().getAllMonsters().forEach(
- monster -> mobSkill.applyEffect(chr, monster, false, Collections.emptyList())
- );
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/ReachCommand.java b/src/main/java/client/command/commands/gm2/ReachCommand.java
deleted file mode 100644
index 41b3bb3a6b1..00000000000
--- a/src/main/java/client/command/commands/gm2/ReachCommand.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim != null && victim.isLoggedin()) {
- if (player.getClient().getChannel() != victim.getClient().getChannel()) {
- player.dropMessage(5, "Player '" + victim.getName() + "' is at channel " + victim.getClient().getChannel() + ".");
- } else {
- MapleMap map = victim.getMap();
- player.saveLocationOnWarp();
- player.forceChangeMap(map, map.findClosestPortal(victim.getPosition()));
- }
- } else {
- player.dropMessage(6, "Unknown player.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/RechargeCommand.java b/src/main/java/client/command/commands/gm2/RechargeCommand.java
deleted file mode 100644
index 3aaa23bb0e9..00000000000
--- a/src/main/java/client/command/commands/gm2/RechargeCommand.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
- StringBuilder sb = new StringBuilder();
-
- String search = joinStringFrom(params, 1);
- long start = System.currentTimeMillis();//for the lulz
- Data data = null;
- if (!params[0].equalsIgnoreCase("ITEM")) {
- int searchType = 0;
-
- if (params[0].equalsIgnoreCase("NPC")) {
- data = npcStringData;
- } else if (params[0].equalsIgnoreCase("MOB") || params[0].equalsIgnoreCase("MONSTER")) {
- data = mobStringData;
- } else if (params[0].equalsIgnoreCase("SKILL")) {
- data = skillStringData;
- } else if (params[0].equalsIgnoreCase("MAP")) {
- data = mapStringData;
- searchType = 1;
- } else if (params[0].equalsIgnoreCase("QUEST")) {
- data = mapStringData;
- searchType = 2;
- } else {
- sb.append("#bInvalid search.\r\nSyntax: '!search [type] [name]', where [type] is MAP, QUEST, NPC, ITEM, MOB, or SKILL.");
- }
- if (data != null) {
- String name;
-
- if (searchType == 0) {
- for (Data searchData : data.getChildren()) {
- name = DataTool.getString(searchData.getChildByPath("name"), "NO-NAME");
- if (name.toLowerCase().contains(search.toLowerCase())) {
- sb.append("#b").append(Integer.parseInt(searchData.getName())).append("#k - #r").append(name).append("\r\n");
- }
- }
- } else if (searchType == 1) {
- String mapName, streetName;
-
- for (Data searchDataDir : data.getChildren()) {
- for (Data searchData : searchDataDir.getChildren()) {
- mapName = DataTool.getString(searchData.getChildByPath("mapName"), "NO-NAME");
- streetName = DataTool.getString(searchData.getChildByPath("streetName"), "NO-NAME");
-
- if (mapName.toLowerCase().contains(search.toLowerCase()) || streetName.toLowerCase().contains(search.toLowerCase())) {
- sb.append("#b").append(Integer.parseInt(searchData.getName())).append("#k - #r").append(streetName).append(" - ").append(mapName).append("\r\n");
- }
- }
- }
- } else {
- for (Quest mq : Quest.getMatchedQuests(search)) {
- sb.append("#b").append(mq.getId()).append("#k - #r");
-
- String parentName = mq.getParentName();
- if (!parentName.isEmpty()) {
- sb.append(parentName).append(" - ");
- }
- sb.append(mq.getName()).append("\r\n");
- }
- }
- }
- } else {
- for (Pair itemPair : ItemInformationProvider.getInstance().getAllItems()) {
- if (sb.length() < 32654) {//ohlol
- if (itemPair.getRight().toLowerCase().contains(search.toLowerCase())) {
- sb.append("#b").append(itemPair.getLeft()).append("#k - #r").append(itemPair.getRight()).append("\r\n");
- }
- } else {
- sb.append("#bCouldn't load all items, there are too many results.\r\n");
- break;
- }
- }
- }
- if (sb.length() == 0) {
- sb.append("#bNo ").append(params[0].toLowerCase()).append("s found.\r\n");
- }
- sb.append("\r\n#kLoaded within ").append((double) (System.currentTimeMillis() - start) / 1000).append(" seconds.");//because I can, and it's free
-
- c.getAbstractPlayerInteraction().npcTalk(NpcId.MAPLE_ADMINISTRATOR, sb.toString());
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/SetSlotCommand.java b/src/main/java/client/command/commands/gm2/SetSlotCommand.java
deleted file mode 100644
index fd8124e2de4..00000000000
--- a/src/main/java/client/command/commands/gm2/SetSlotCommand.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- int slots = (Integer.parseInt(params[0]) / 4) * 4;
- for (int i = 1; i < 5; i++) {
- int curSlots = player.getSlots(i);
- if (slots <= -curSlots) {
- continue;
- }
-
- player.gainSlots(i, slots - curSlots, true);
- }
-
- player.yellowMessage("Slots updated.");
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/SetStatCommand.java b/src/main/java/client/command/commands/gm2/SetStatCommand.java
deleted file mode 100644
index 7eae82c123e..00000000000
--- a/src/main/java/client/command/commands/gm2/SetStatCommand.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- try {
- int x = Integer.parseInt(params[0]);
-
- if (x > Short.MAX_VALUE) {
- x = Short.MAX_VALUE;
- } else if (x < 4) {
- x = 4; // thanks Vcoc for pointing the minimal allowed stat value here
- }
-
- player.updateStrDexIntLuk(x);
- } catch (NumberFormatException nfe) {
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/SpCommand.java b/src/main/java/client/command/commands/gm2/SpCommand.java
deleted file mode 100644
index f905c21a7a3..00000000000
--- a/src/main/java/client/command/commands/gm2/SpCommand.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ] ");
- return;
- }
-
- if (params.length == 1) {
- int newSp = Integer.parseInt(params[0]);
- if (newSp < 0) {
- newSp = 0;
- } else if (newSp > YamlConfig.config.server.MAX_AP) {
- newSp = YamlConfig.config.server.MAX_AP;
- }
-
- player.updateRemainingSp(newSp);
- } else {
- Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim != null) {
- int newSp = Integer.parseInt(params[1]);
- if (newSp < 0) {
- newSp = 0;
- } else if (newSp > YamlConfig.config.server.MAX_AP) {
- newSp = YamlConfig.config.server.MAX_AP;
- }
-
- victim.updateRemainingSp(newSp);
-
- player.dropMessage(5, "SP given.");
- } else {
- player.message("Player '" + params[0] + "' could not be found.");
- }
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/SummonCommand.java b/src/main/java/client/command/commands/gm2/SummonCommand.java
deleted file mode 100644
index b159a176e14..00000000000
--- a/src/main/java/client/command/commands/gm2/SummonCommand.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim == null) {
- //If victim isn't on current channel, loop all channels on current world.
-
- for (Channel ch : Server.getInstance().getChannelsFromWorld(c.getWorld())) {
- victim = ch.getPlayerStorage().getCharacterByName(params[0]);
- if (victim != null) {
- break;//We found the person, no need to continue the loop.
- }
- }
- }
- if (victim != null) {
- if (!victim.isLoggedinWorld()) {
- player.dropMessage(6, "Player currently not logged in or unreachable.");
- return;
- }
-
- if (player.getClient().getChannel() != victim.getClient().getChannel()) {//And then change channel if needed.
- victim.dropMessage("Changing channel, please wait a moment.");
- victim.getClient().changeChannel(player.getClient().getChannel());
- }
-
- try {
- for (int i = 0; i < 7; i++) { // poll for a while until the player reconnects
- if (victim.isLoggedinWorld()) {
- break;
- }
- Thread.sleep(1777);
- }
- } catch (InterruptedException e) {
- }
-
- MapleMap map = player.getMap();
- victim.saveLocationOnWarp();
- victim.forceChangeMap(map, map.findClosestPortal(player.getPosition()));
- } else {
- player.dropMessage(6, "Unknown player.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/UnBugCommand.java b/src/main/java/client/command/commands/gm2/UnBugCommand.java
deleted file mode 100644
index fb175c540d2..00000000000
--- a/src/main/java/client/command/commands/gm2/UnBugCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim != null) {
- if (victim.getJailExpirationTimeLeft() <= 0) {
- player.message("This player is already free.");
- return;
- }
- victim.removeJailExpirationTime();
- victim.message("By lack of concrete proof you are now unjailed. Enjoy freedom!");
- player.message(victim.getName() + " was unjailed.");
- } else {
- player.message("Player '" + params[0] + "' could not be found.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/WarpAreaCommand.java b/src/main/java/client/command/commands/gm2/WarpAreaCommand.java
deleted file mode 100644
index 8d3d986e5fa..00000000000
--- a/src/main/java/client/command/commands/gm2/WarpAreaCommand.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- try {
- MapleMap target = c.getChannelServer().getMapFactory().getMap(Integer.parseInt(params[0]));
- if (target == null) {
- player.yellowMessage("Map ID " + params[0] + " is invalid.");
- return;
- }
-
- Point pos = player.getPosition();
-
- Collection characters = player.getMap().getAllPlayers();
-
- for (Character victim : characters) {
- if (victim.getPosition().distanceSq(pos) <= 50000) {
- victim.saveLocationOnWarp();
- victim.changeMap(target, target.getRandomPlayerSpawnpoint());
- }
- }
- } catch (Exception ex) {
- player.yellowMessage("Map ID " + params[0] + " is invalid.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/WarpCommand.java b/src/main/java/client/command/commands/gm2/WarpCommand.java
deleted file mode 100644
index 4f191a51969..00000000000
--- a/src/main/java/client/command/commands/gm2/WarpCommand.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- try {
- MapleMap target = c.getChannelServer().getMapFactory().getMap(Integer.parseInt(params[0]));
- if (target == null) {
- player.yellowMessage("Map ID " + params[0] + " is invalid.");
- return;
- }
-
- if (!player.isAlive()) {
- player.dropMessage(1, "This command cannot be used when you're dead.");
- return;
- }
-
- if (!player.isGM()) {
- if (player.getEventInstance() != null || MiniDungeonInfo.isDungeonMap(player.getMapId()) || FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) {
- player.dropMessage(1, "This command cannot be used in this map.");
- return;
- }
- }
-
- // expedition issue with this command detected thanks to Masterrulax
- player.saveLocationOnWarp();
- player.changeMap(target, target.getRandomPlayerSpawnpoint());
- } catch (Exception ex) {
- player.yellowMessage("Map ID " + params[0] + " is invalid.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/WarpMapCommand.java b/src/main/java/client/command/commands/gm2/WarpMapCommand.java
deleted file mode 100644
index 3e7c5ab5e17..00000000000
--- a/src/main/java/client/command/commands/gm2/WarpMapCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- try {
- MapleMap target = c.getChannelServer().getMapFactory().getMap(Integer.parseInt(params[0]));
- if (target == null) {
- player.yellowMessage("Map ID " + params[0] + " is invalid.");
- return;
- }
-
- Collection characters = player.getMap().getAllPlayers();
-
- for (Character victim : characters) {
- victim.saveLocationOnWarp();
- victim.changeMap(target, target.getRandomPlayerSpawnpoint());
- }
- } catch (Exception ex) {
- player.yellowMessage("Map ID " + params[0] + " is invalid.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm2/WhereaMiCommand.java b/src/main/java/client/command/commands/gm2/WhereaMiCommand.java
deleted file mode 100644
index b4ddc29d9fb..00000000000
--- a/src/main/java/client/command/commands/gm2/WhereaMiCommand.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see chars = new HashSet<>();
- HashSet npcs = new HashSet<>();
- HashSet playernpcs = new HashSet<>();
- HashSet mobs = new HashSet<>();
-
- for (MapObject mmo : player.getMap().getMapObjects()) {
- if (mmo instanceof NPC npc) {
- npcs.add(npc);
- } else if (mmo instanceof Character mc) {
- chars.add(mc);
- } else if (mmo instanceof Monster mob) {
- if (mob.isAlive()) {
- mobs.add(mob);
- }
- } else if (mmo instanceof PlayerNPC npc) {
- playernpcs.add(npc);
- }
- }
-
- player.yellowMessage("Map ID: " + player.getMap().getId());
-
- player.yellowMessage("Players on this map:");
- for (Character chr : chars) {
- player.dropMessage(5, ">> " + chr.getName() + " - " + chr.getId() + " - Oid: " + chr.getObjectId());
- }
-
- if (!playernpcs.isEmpty()) {
- player.yellowMessage("PlayerNPCs on this map:");
- for (PlayerNPC pnpc : playernpcs) {
- player.dropMessage(5, ">> " + pnpc.getName() + " - Scriptid: " + pnpc.getScriptId() + " - Oid: " + pnpc.getObjectId());
- }
- }
-
- if (!npcs.isEmpty()) {
- player.yellowMessage("NPCs on this map:");
- for (NPC npc : npcs) {
- player.dropMessage(5, ">> " + npc.getName() + " - " + npc.getId() + " - Oid: " + npc.getObjectId());
- }
- }
-
- if (!mobs.isEmpty()) {
- player.yellowMessage("Monsters on this map:");
- for (Monster mob : mobs) {
- if (mob.isAlive()) {
- player.dropMessage(5, ">> " + mob.getName() + " - " + mob.getId() + " - Oid: " + mob.getObjectId());
- }
- }
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/BanCommand.java b/src/main/java/client/command/commands/gm3/BanCommand.java
deleted file mode 100644
index c1ee362cedd..00000000000
--- a/src/main/java/client/command/commands/gm3/BanCommand.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see (Please be descriptive)");
- return;
- }
- String ign = params[0];
- String reason = joinStringFrom(params, 1);
- Character target = c.getChannelServer().getPlayerStorage().getCharacterByName(ign);
- if (target != null) {
- String readableTargetName = Character.makeMapleReadable(target.getName());
- String ip = target.getClient().getRemoteAddress();
- //Ban ip
- try (Connection con = DatabaseConnection.getConnection()) {
- if (ip.matches("/[0-9]{1,3}\\..*")) {
- try (PreparedStatement ps = con.prepareStatement("INSERT INTO ipbans VALUES (DEFAULT, ?, ?)")) {
- ps.setString(1, ip);
- ps.setString(2, String.valueOf(target.getClient().getAccID()));
-
- ps.executeUpdate();
- }
- }
- } catch (SQLException ex) {
- ex.printStackTrace();
- c.getPlayer().message("Error occured while banning IP address");
- c.getPlayer().message(target.getName() + "'s IP was not banned: " + ip);
- }
- reason = c.getPlayer().getName() + " banned " + readableTargetName + " for " + reason + " (IP: " + ip + ")";
- target.ban(reason);
- target.yellowMessage("You have been banned by #b" + c.getPlayer().getName() + " #k.");
- target.yellowMessage("Reason: " + reason);
- c.sendPacket(PacketCreator.getGMEffect(4, (byte) 0));
- final Character rip = target;
- TimerManager.getInstance().schedule(() -> rip.getClient().disconnect(false, false), 5000); //5 Seconds
- Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned."));
- } else if (Character.ban(ign, reason, false)) {
- c.sendPacket(PacketCreator.getGMEffect(4, (byte) 0));
- Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned."));
- } else {
- c.sendPacket(PacketCreator.getGMEffect(6, (byte) 1));
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/ChatCommand.java b/src/main/java/client/command/commands/gm3/ChatCommand.java
deleted file mode 100644
index 0ea9c366372..00000000000
--- a/src/main/java/client/command/commands/gm3/ChatCommand.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
- player.getMap().getPortal(params[0]).setPortalState(false);
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/DebuffCommand.java b/src/main/java/client/command/commands/gm3/DebuffCommand.java
deleted file mode 100644
index dedc6d853ce..00000000000
--- a/src/main/java/client/command/commands/gm3/DebuffCommand.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see skill = Optional.empty();
-
- switch (params[0].toUpperCase()) {
- case "SLOW" -> {
- disease = Disease.SLOW;
- skill = MobSkillFactory.getMobSkill(MobSkillType.SLOW, 7);
- }
- case "SEDUCE" -> {
- disease = Disease.SEDUCE;
- skill = MobSkillFactory.getMobSkill(MobSkillType.SEDUCE, 7);
- }
- case "ZOMBIFY" -> {
- disease = Disease.ZOMBIFY;
- skill = MobSkillFactory.getMobSkill(MobSkillType.UNDEAD, 1);
- }
- case "CONFUSE" -> {
- disease = Disease.CONFUSE;
- skill = MobSkillFactory.getMobSkill(MobSkillType.REVERSE_INPUT, 2);
- }
- case "STUN" -> {
- disease = Disease.STUN;
- skill = MobSkillFactory.getMobSkill(MobSkillType.STUN, 7);
- }
- case "POISON" -> {
- disease = Disease.POISON;
- skill = MobSkillFactory.getMobSkill(MobSkillType.POISON, 5);
- }
- case "SEAL" -> {
- disease = Disease.SEAL;
- skill = MobSkillFactory.getMobSkill(MobSkillType.SEAL, 1);
- }
- case "DARKNESS" -> {
- disease = Disease.DARKNESS;
- skill = MobSkillFactory.getMobSkill(MobSkillType.DARKNESS, 1);
- }
- case "WEAKEN" -> {
- disease = Disease.WEAKEN;
- skill = MobSkillFactory.getMobSkill(MobSkillType.WEAKNESS, 1);
- }
- case "CURSE" -> {
- disease = Disease.CURSE;
- skill = MobSkillFactory.getMobSkill(MobSkillType.CURSE, 1);
- }
- }
-
- if (disease == null || skill.isEmpty()) {
- player.yellowMessage("Syntax: !debuff SLOW|SEDUCE|ZOMBIFY|CONFUSE|STUN|POISON|SEAL|DARKNESS|WEAKEN|CURSE");
- return;
- }
-
- for (MapObject mmo : player.getMap().getMapObjectsInRange(player.getPosition(), 777777.7, Arrays.asList(MapObjectType.PLAYER))) {
- Character chr = (Character) mmo;
-
- if (chr.getId() != player.getId()) {
- chr.giveDebuff(disease, skill.get());
- }
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/EndEventCommand.java b/src/main/java/client/command/commands/gm3/EndEventCommand.java
deleted file mode 100644
index ceb13efd910..00000000000
--- a/src/main/java/client/command/commands/gm3/EndEventCommand.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see expeds = ch.getExpeditions();
- if (expeds.isEmpty()) {
- player.yellowMessage("No Expeditions in Channel " + ch.getId());
- continue;
- }
- player.yellowMessage("Expeditions in Channel " + ch.getId());
- int id = 0;
- for (Expedition exped : expeds) {
- id++;
- player.yellowMessage("> Expedition " + id);
- player.yellowMessage(">> Type: " + exped.getType().toString());
- player.yellowMessage(">> Status: " + (exped.isRegistering() ? "REGISTERING" : "UNDERWAY"));
- player.yellowMessage(">> Size: " + exped.getMembers().size());
- player.yellowMessage(">> Leader: " + exped.getLeader().getName());
- int memId = 2;
- for (Entry e : exped.getMembers().entrySet()) {
- if (exped.isLeader(e.getKey())) {
- continue;
- }
- player.yellowMessage(">>> Member " + memId + ": " + e.getValue());
- memId++;
- }
- }
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/FaceCommand.java b/src/main/java/client/command/commands/gm3/FaceCommand.java
deleted file mode 100644
index 2ceed1145c0..00000000000
--- a/src/main/java/client/command/commands/gm3/FaceCommand.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ] ");
- return;
- }
-
- try {
- if (params.length == 1) {
- int itemId = Integer.parseInt(params[0]);
- if (!ItemConstants.isFace(itemId) || ItemInformationProvider.getInstance().getName(itemId) == null) {
- player.yellowMessage("Face id '" + params[0] + "' does not exist.");
- return;
- }
-
- player.setFace(itemId);
- player.updateSingleStat(Stat.FACE, itemId);
- player.equipChanged();
- } else {
- int itemId = Integer.parseInt(params[1]);
- if (!ItemConstants.isFace(itemId) || ItemInformationProvider.getInstance().getName(itemId) == null) {
- player.yellowMessage("Face id '" + params[1] + "' does not exist.");
- }
-
- Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim != null) {
- victim.setFace(itemId);
- victim.updateSingleStat(Stat.FACE, itemId);
- victim.equipChanged();
- } else {
- player.yellowMessage("Player '" + params[0] + "' has not been found on this channel.");
- }
- }
- } catch (Exception e) {
- }
-
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/FameCommand.java b/src/main/java/client/command/commands/gm3/FameCommand.java
deleted file mode 100644
index 3cd2819e0be..00000000000
--- a/src/main/java/client/command/commands/gm3/FameCommand.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim != null) {
- victim.setFame(Integer.parseInt(params[1]));
- victim.updateSingleStat(Stat.FAME, victim.getFame());
- player.message("FAME given.");
- } else {
- player.message("Player '" + params[0] + "' could not be found.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/FlyCommand.java b/src/main/java/client/command/commands/gm3/FlyCommand.java
deleted file mode 100644
index 21d92bc258a..00000000000
--- a/src/main/java/client/command/commands/gm3/FlyCommand.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- Integer accid = c.getAccID();
- Server srv = Server.getInstance();
- String sendStr = "";
- if (params[0].equalsIgnoreCase("on")) {
- sendStr += "Enabled Fly feature (F1). With fly active, you cannot attack.";
- if (!srv.canFly(accid)) {
- sendStr += " Re-login to take effect.";
- }
-
- srv.changeFly(c.getAccID(), true);
- } else {
- sendStr += "Disabled Fly feature. You can now attack.";
- if (srv.canFly(accid)) {
- sendStr += " Re-login to take effect.";
- }
-
- srv.changeFly(c.getAccID(), false);
- }
-
- player.dropMessage(6, sendStr);
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/GiveMesosCommand.java b/src/main/java/client/command/commands/gm3/GiveMesosCommand.java
deleted file mode 100644
index f625c0ed789..00000000000
--- a/src/main/java/client/command/commands/gm3/GiveMesosCommand.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ] ");
- return;
- }
-
- String recv_, value_;
- long mesos_ = 0;
-
- if (params.length == 2) {
- recv_ = params[0];
- value_ = params[1];
- } else {
- recv_ = c.getPlayer().getName();
- value_ = params[0];
- }
-
- try {
- mesos_ = Long.parseLong(value_);
- if (mesos_ > Integer.MAX_VALUE) {
- mesos_ = Integer.MAX_VALUE;
- } else if (mesos_ < Integer.MIN_VALUE) {
- mesos_ = Integer.MIN_VALUE;
- }
- } catch (NumberFormatException nfe) {
- if (value_.contentEquals("max")) { // "max" descriptor suggestion thanks to Vcoc
- mesos_ = Integer.MAX_VALUE;
- } else if (value_.contentEquals("min")) {
- mesos_ = Integer.MIN_VALUE;
- }
- }
-
- Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv_);
- if (victim != null) {
- victim.gainMeso((int) mesos_, true);
- player.message("MESO given.");
- } else {
- player.message("Player '" + recv_ + "' could not be found.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/GiveNxCommand.java b/src/main/java/client/command/commands/gm3/GiveNxCommand.java
deleted file mode 100644
index 783d35d699b..00000000000
--- a/src/main/java/client/command/commands/gm3/GiveNxCommand.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ] ");
- return;
- }
-
- String recv, typeStr = "nx";
- int value, type = 1;
- if (params.length > 1) {
- if (params[0].length() == 2) {
- switch (params[0]) {
- case "mp": // maplePoint
- type = 2;
- break;
- case "np": // nxPrepaid
- type = 4;
- break;
- default:
- type = 1;
- }
- typeStr = params[0];
-
- if (params.length > 2) {
- recv = params[1];
- value = Integer.parseInt(params[2]);
- } else {
- recv = c.getPlayer().getName();
- value = Integer.parseInt(params[1]);
- }
- } else {
- recv = params[0];
- value = Integer.parseInt(params[1]);
- }
- } else {
- recv = c.getPlayer().getName();
- value = Integer.parseInt(params[0]);
- }
-
- Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv);
- if (victim != null) {
- victim.getCashShop().gainCash(type, value);
- player.message(typeStr.toUpperCase() + " given.");
- } else {
- player.message("Player '" + recv + "' could not be found.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/GiveRpCommand.java b/src/main/java/client/command/commands/gm3/GiveRpCommand.java
deleted file mode 100644
index 84d8155e67d..00000000000
--- a/src/main/java/client/command/commands/gm3/GiveRpCommand.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package client.command.commands.gm3;
-
-import client.Character;
-import client.Client;
-import client.command.Command;
-
-public class GiveRpCommand extends Command {
- {
- setDescription("Give reward points to a player.");
- }
-
- @Override
- public void execute(Client client, String[] params) {
- Character player = client.getPlayer();
- if (params.length < 2) {
- player.yellowMessage("Syntax: !giverp ");
- return;
- }
-
- Character victim = client.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim != null) {
- victim.setRewardPoints(victim.getRewardPoints() + Integer.parseInt(params[1]));
- player.message("RP given. Player " + params[0] + " now has " + victim.getRewardPoints()
- + " reward points.");
- } else {
- player.message("Player '" + params[0] + "' could not be found.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/GiveVpCommand.java b/src/main/java/client/command/commands/gm3/GiveVpCommand.java
deleted file mode 100644
index 6bad23706a7..00000000000
--- a/src/main/java/client/command/commands/gm3/GiveVpCommand.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim != null) {
- victim.getClient().addVotePoints(Integer.parseInt(params[1]));
- player.message("VP given.");
- } else {
- player.message("Player '" + params[0] + "' could not be found.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/HairCommand.java b/src/main/java/client/command/commands/gm3/HairCommand.java
deleted file mode 100644
index eaaebaae651..00000000000
--- a/src/main/java/client/command/commands/gm3/HairCommand.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ] ");
- return;
- }
-
- try {
- if (params.length == 1) {
- int itemId = Integer.parseInt(params[0]);
- if (!ItemConstants.isHair(itemId) || ItemInformationProvider.getInstance().getName(itemId) == null) {
- player.yellowMessage("Hair id '" + params[0] + "' does not exist.");
- return;
- }
-
- player.setHair(itemId);
- player.updateSingleStat(Stat.HAIR, itemId);
- player.equipChanged();
- } else {
- int itemId = Integer.parseInt(params[1]);
- if (!ItemConstants.isHair(itemId) || ItemInformationProvider.getInstance().getName(itemId) == null) {
- player.yellowMessage("Hair id '" + params[1] + "' does not exist.");
- return;
- }
-
- Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim != null) {
- victim.setHair(itemId);
- victim.updateSingleStat(Stat.HAIR, itemId);
- victim.equipChanged();
- } else {
- player.yellowMessage("Player '" + params[0] + "' has not been found on this channel.");
- }
- }
- } catch (Exception e) {
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/HealMapCommand.java b/src/main/java/client/command/commands/gm3/HealMapCommand.java
deleted file mode 100644
index 295e46f6337..00000000000
--- a/src/main/java/client/command/commands/gm3/HealMapCommand.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ] ");
- }
-
- if (victim != null) {
- victim.updateHpMp(statUpdate);
- } else {
- player.message("Player '" + params[0] + "' could not be found on this world.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/HurtCommand.java b/src/main/java/client/command/commands/gm3/HurtCommand.java
deleted file mode 100644
index ee4dc87ce0e..00000000000
--- a/src/main/java/client/command/commands/gm3/HurtCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
- Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim == null) {
- player.message("Player '" + params[0] + "' could not be found on this world.");
- return;
- }
-
- boolean ignored = AutobanFactory.toggleIgnored(victim.getId());
- player.yellowMessage(victim.getName() + " is " + (ignored ? "now being ignored." : "no longer being ignored."));
- String message_ = player.getName() + (ignored ? " has started ignoring " : " has stopped ignoring ") + victim.getName() + ".";
- Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, message_));
-
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/IgnoredCommand.java b/src/main/java/client/command/commands/gm3/IgnoredCommand.java
deleted file mode 100644
index f15ccd863a3..00000000000
--- a/src/main/java/client/command/commands/gm3/IgnoredCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see monsters = map.getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapObjectType.MONSTER));
- int count = 0;
- for (MapObject monstermo : monsters) {
- Monster monster = (Monster) monstermo;
- if (!monster.getStats().isFriendly() && !(monster.getId() >= MobId.DEAD_HORNTAIL_MIN && monster.getId() <= MobId.HORNTAIL)) {
- map.damageMonster(player, monster, Integer.MAX_VALUE);
- count++;
- }
- }
- player.dropMessage(5, "Killed " + count + " monsters.");
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/KillCommand.java b/src/main/java/client/command/commands/gm3/KillCommand.java
deleted file mode 100644
index aefb43e55a0..00000000000
--- a/src/main/java/client/command/commands/gm3/KillCommand.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim != null) {
- victim.updateHpMp(0);
- Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, player.getName() + " used !kill on " + victim.getName()));
- } else {
- player.message("Player '" + params[0] + "' could not be found.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/KillMapCommand.java b/src/main/java/client/command/commands/gm3/KillMapCommand.java
deleted file mode 100644
index babcb59807b..00000000000
--- a/src/main/java/client/command/commands/gm3/KillMapCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ] ");
- }
-
- if (victim != null) {
- int extraHp = victim.getCurrentMaxHp() - victim.getClientMaxHp();
- int extraMp = victim.getCurrentMaxMp() - victim.getClientMaxMp();
- statUpdate = Math.max(1 + Math.max(extraHp, extraMp), statUpdate);
-
- int maxhpUpdate = statUpdate - extraHp;
- int maxmpUpdate = statUpdate - extraMp;
- victim.updateMaxHpMaxMp(maxhpUpdate, maxmpUpdate);
- } else {
- player.message("Player '" + params[0] + "' could not be found on this world.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/MonitorCommand.java b/src/main/java/client/command/commands/gm3/MonitorCommand.java
deleted file mode 100644
index 7b138192526..00000000000
--- a/src/main/java/client/command/commands/gm3/MonitorCommand.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
- Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim == null) {
- player.message("Player '" + params[0] + "' could not be found on this world.");
- return;
- }
- boolean monitored = MonitoredChrLogger.toggleMonitored(victim.getId());
- player.yellowMessage(victim.getId() + " is " + (monitored ? "now being monitored." : "no longer being monitored."));
- String message = player.getName() + (monitored ? " has started monitoring " : " has stopped monitoring ") + victim.getId() + ".";
- Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(5, message));
-
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/MonitorsCommand.java b/src/main/java/client/command/commands/gm3/MonitorsCommand.java
deleted file mode 100644
index 841433a7c74..00000000000
--- a/src/main/java/client/command/commands/gm3/MonitorsCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see #k\r\n\r\n";
- sendMsg += getSongList();
-
- c.sendPacket(PacketCreator.getNPCTalk(NpcId.BILLY, (byte) 0, sendMsg, "00 00", (byte) 0));
- return;
- }
-
- String song = player.getLastCommandMessage();
- for (String s : GameConstants.GAME_SONGS) {
- if (s.equalsIgnoreCase(song)) { // thanks Masterrulax for finding an issue here
- player.getMap().broadcastMessage(PacketCreator.musicChange(s));
- player.yellowMessage("Now playing song " + s + ".");
- return;
- }
- }
-
- String sendMsg = "";
- sendMsg += "Song not found, please enter a song below.\r\n\r\n";
- sendMsg += getSongList();
-
- c.sendPacket(PacketCreator.getNPCTalk(NpcId.BILLY, (byte) 0, sendMsg, "00 00", (byte) 0));
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/MuteMapCommand.java b/src/main/java/client/command/commands/gm3/MuteMapCommand.java
deleted file mode 100644
index f442723bef9..00000000000
--- a/src/main/java/client/command/commands/gm3/MuteMapCommand.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
- NPC npc = LifeFactory.getNPC(Integer.parseInt(params[0]));
- if (npc != null) {
- npc.setPosition(player.getPosition());
- npc.setCy(player.getPosition().y);
- npc.setRx0(player.getPosition().x + 50);
- npc.setRx1(player.getPosition().x - 50);
- npc.setFh(player.getMap().getFootholds().findBelow(c.getPlayer().getPosition()).getId());
- player.getMap().addMapObject(npc);
- player.getMap().broadcastMessage(PacketCreator.spawnNPC(npc));
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/OnlineTwoCommand.java b/src/main/java/client/command/commands/gm3/OnlineTwoCommand.java
deleted file mode 100644
index cdba346eb3b..00000000000
--- a/src/main/java/client/command/commands/gm3/OnlineTwoCommand.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
- player.getMap().getPortal(params[0]).setPortalState(true);
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/PeCommand.java b/src/main/java/client/command/commands/gm3/PeCommand.java
deleted file mode 100644
index 6ee35f394a2..00000000000
--- a/src/main/java/client/command/commands/gm3/PeCommand.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- int questId = Integer.parseInt(params[0]);
-
- if (player.getQuestStatus(questId) == 1) {
- Quest quest = Quest.getInstance(questId);
- if (quest != null && quest.getNpcRequirement(true) != -1) {
- c.getAbstractPlayerInteraction().forceCompleteQuest(questId, quest.getNpcRequirement(true));
- } else {
- c.getAbstractPlayerInteraction().forceCompleteQuest(questId);
- }
-
- player.dropMessage(5, "QUEST " + questId + " completed.");
- } else {
- player.dropMessage(5, "QUESTID " + questId + " not started or already completed.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/QuestResetCommand.java b/src/main/java/client/command/commands/gm3/QuestResetCommand.java
deleted file mode 100644
index cfb35da64a2..00000000000
--- a/src/main/java/client/command/commands/gm3/QuestResetCommand.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- int questid_ = Integer.parseInt(params[0]);
-
- if (player.getQuestStatus(questid_) != 0) {
- Quest quest = Quest.getInstance(questid_);
- if (quest != null) {
- quest.reset(player);
- player.dropMessage(5, "QUEST " + questid_ + " reseted.");
- } else { // should not occur
- player.dropMessage(5, "QUESTID " + questid_ + " is invalid.");
- }
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/QuestStartCommand.java b/src/main/java/client/command/commands/gm3/QuestStartCommand.java
deleted file mode 100644
index 3eeee90331c..00000000000
--- a/src/main/java/client/command/commands/gm3/QuestStartCommand.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- int questid = Integer.parseInt(params[0]);
-
- if (player.getQuestStatus(questid) == 0) {
- Quest quest = Quest.getInstance(questid);
- if (quest != null && quest.getNpcRequirement(false) != -1) {
- c.getAbstractPlayerInteraction().forceStartQuest(questid, quest.getNpcRequirement(false));
- } else {
- c.getAbstractPlayerInteraction().forceStartQuest(questid);
- }
-
- player.dropMessage(5, "QUEST " + questid + " started.");
- } else {
- player.dropMessage(5, "QUESTID " + questid + " already started/completed.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java b/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java
deleted file mode 100644
index da88d321b80..00000000000
--- a/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see characters = player.getMap().getAllPlayers();
-
- for (Character chr : characters) {
- chr.saveLocationOnWarp();
- chr.changeMap(newMap);
- if (chr.getId() != callerid) {
- chr.dropMessage("You have been relocated due to map reloading. Sorry for the inconvenience.");
- }
- }
- newMap.respawn();
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/ReloadPortalsCommand.java b/src/main/java/client/command/commands/gm3/ReloadPortalsCommand.java
deleted file mode 100644
index 44f593c8017..00000000000
--- a/src/main/java/client/command/commands/gm3/ReloadPortalsCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see []");
- return;
- }
-
- Monster monster = LifeFactory.getMonster(Integer.parseInt(params[0]));
- if (monster == null) {
- return;
- }
- if (params.length == 2) {
- for (int i = 0; i < Integer.parseInt(params[1]); i++) {
- player.getMap().spawnMonsterOnGroundBelow(LifeFactory.getMonster(Integer.parseInt(params[0])), player.getPosition());
- }
- } else {
- player.getMap().spawnMonsterOnGroundBelow(LifeFactory.getMonster(Integer.parseInt(params[0])), player.getPosition());
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/StartEventCommand.java b/src/main/java/client/command/commands/gm3/StartEventCommand.java
deleted file mode 100644
index c5072bdc92d..00000000000
--- a/src/main/java/client/command/commands/gm3/StartEventCommand.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see |remove");
- return;
- }
-
- if (params[0].equalsIgnoreCase("remove")) {
- for (Character victim : player.getWorldServer().getPlayerStorage().getAllCharacters()) {
- victim.sendPacket(PacketCreator.removeClock());
- }
- } else {
- try {
- int seconds = Integer.parseInt(params[0]);
- for (Character victim : player.getWorldServer().getPlayerStorage().getAllCharacters()) {
- victim.sendPacket(PacketCreator.getClock(seconds));
- }
- } catch (NumberFormatException e) {
- player.yellowMessage("Syntax: !timerall |remove");
- }
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/TimerCommand.java b/src/main/java/client/command/commands/gm3/TimerCommand.java
deleted file mode 100644
index 9c7a5cfb545..00000000000
--- a/src/main/java/client/command/commands/gm3/TimerCommand.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see |remove");
- return;
- }
-
- Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim != null) {
- if (params[1].equalsIgnoreCase("remove")) {
- victim.sendPacket(PacketCreator.removeClock());
- } else {
- try {
- victim.sendPacket(PacketCreator.getClock(Integer.parseInt(params[1])));
- } catch (NumberFormatException e) {
- player.yellowMessage("Syntax: !timer |remove");
- }
- }
- } else {
- player.message("Player '" + params[0] + "' could not be found.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/TimerMapCommand.java b/src/main/java/client/command/commands/gm3/TimerMapCommand.java
deleted file mode 100644
index 2456dd682b8..00000000000
--- a/src/main/java/client/command/commands/gm3/TimerMapCommand.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see |remove");
- return;
- }
-
- if (params[0].equalsIgnoreCase("remove")) {
- for (Character victim : player.getMap().getCharacters()) {
- victim.sendPacket(PacketCreator.removeClock());
- }
- } else {
- try {
- int seconds = Integer.parseInt(params[0]);
- for (Character victim : player.getMap().getCharacters()) {
- victim.sendPacket(PacketCreator.getClock(seconds));
- }
- } catch (NumberFormatException e) {
- player.yellowMessage("Syntax: !timermap |remove");
- }
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/ToggleCouponCommand.java b/src/main/java/client/command/commands/gm3/ToggleCouponCommand.java
deleted file mode 100644
index 03046c04bae..00000000000
--- a/src/main/java/client/command/commands/gm3/ToggleCouponCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
- Server.getInstance().toggleCoupon(Integer.parseInt(params[0]));
- }
-}
diff --git a/src/main/java/client/command/commands/gm3/UnBanCommand.java b/src/main/java/client/command/commands/gm3/UnBanCommand.java
deleted file mode 100644
index dca847cde99..00000000000
--- a/src/main/java/client/command/commands/gm3/UnBanCommand.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- try (Connection con = DatabaseConnection.getConnection()) {
- int aid = Character.getAccountIdByName(params[0]);
-
- try (PreparedStatement p = con.prepareStatement("UPDATE accounts SET banned = -1 WHERE id = " + aid)) {
- p.executeUpdate();
- }
-
- try (PreparedStatement p = con.prepareStatement("DELETE FROM ipbans WHERE aid = " + aid)) {
- p.executeUpdate();
- }
- } catch (Exception e) {
- e.printStackTrace();
- player.message("Failed to unban " + params[0]);
- return;
- }
- player.message("Unbanned " + params[0]);
- }
-}
diff --git a/src/main/java/client/command/commands/gm4/BossDropRateCommand.java b/src/main/java/client/command/commands/gm4/BossDropRateCommand.java
deleted file mode 100644
index 0bf9a549274..00000000000
--- a/src/main/java/client/command/commands/gm4/BossDropRateCommand.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- int bossdroprate = Math.max(Integer.parseInt(params[0]), 1);
- c.getWorldServer().setBossDropRate(bossdroprate);
- c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Boss Drop Rate has been changed to " + bossdroprate + "x."));
- }
-}
diff --git a/src/main/java/client/command/commands/gm4/CakeCommand.java b/src/main/java/client/command/commands/gm4/CakeCommand.java
deleted file mode 100644
index 3b2ba63f1a2..00000000000
--- a/src/main/java/client/command/commands/gm4/CakeCommand.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- int droprate = Math.max(Integer.parseInt(params[0]), 1);
- c.getWorldServer().setDropRate(droprate);
- c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Drop Rate has been changed to " + droprate + "x."));
-
- }
-}
diff --git a/src/main/java/client/command/commands/gm4/ExpRateCommand.java b/src/main/java/client/command/commands/gm4/ExpRateCommand.java
deleted file mode 100644
index 5b363c6927a..00000000000
--- a/src/main/java/client/command/commands/gm4/ExpRateCommand.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- int exprate = Math.max(Integer.parseInt(params[0]), 1);
- c.getWorldServer().setExpRate(exprate);
- c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Exp Rate has been changed to " + exprate + "x."));
- }
-}
diff --git a/src/main/java/client/command/commands/gm4/FishingRateCommand.java b/src/main/java/client/command/commands/gm4/FishingRateCommand.java
deleted file mode 100644
index 532d94f6495..00000000000
--- a/src/main/java/client/command/commands/gm4/FishingRateCommand.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- int fishrate = Math.max(Integer.parseInt(params[0]), 1);
- c.getWorldServer().setFishingRate(fishrate);
- c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Fishing Rate has been changed to " + fishrate + "x."));
- }
-}
diff --git a/src/main/java/client/command/commands/gm4/ForceVacCommand.java b/src/main/java/client/command/commands/gm4/ForceVacCommand.java
deleted file mode 100644
index 02a3a816a9c..00000000000
--- a/src/main/java/client/command/commands/gm4/ForceVacCommand.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see items = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapObjectType.ITEM));
- for (MapObject item : items) {
- MapItem mapItem = (MapItem) item;
-
- mapItem.lockItem();
- try {
- if (mapItem.isPickedUp()) {
- continue;
- }
-
- if (mapItem.getMeso() > 0) {
- player.gainMeso(mapItem.getMeso(), true);
- } else if (player.applyConsumeOnPickup(mapItem.getItemId())) { // thanks Vcoc for pointing out consumables on pickup not being processed here
- } else if (ItemId.isNxCard(mapItem.getItemId())) {
- // Add NX to account, show effect and make item disappear
- player.getCashShop().gainCash(1, mapItem.getItemId() == ItemId.NX_CARD_100 ? 100 : 250);
- } else if (mapItem.getItem().getItemId() >= 5000000 && mapItem.getItem().getItemId() <= 5000100) {
- int petId = Pet.createPet(mapItem.getItem().getItemId());
- if (petId == -1) {
- continue;
- }
- InventoryManipulator.addById(c, mapItem.getItem().getItemId(), mapItem.getItem().getQuantity(), null, petId);
- } else if (InventoryManipulator.addFromDrop(c, mapItem.getItem(), true)) {
- if (mapItem.getItemId() == ItemId.NX_CARD_100) {
- player.updateAriantScore();
- }
- }
-
- player.getMap().pickItemDrop(PacketCreator.removeItemFromMap(mapItem.getObjectId(), 2, player.getId()), mapItem);
- } finally {
- mapItem.unlockItem();
- }
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm4/HorntailCommand.java b/src/main/java/client/command/commands/gm4/HorntailCommand.java
deleted file mode 100644
index dffe66d390f..00000000000
--- a/src/main/java/client/command/commands/gm4/HorntailCommand.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see list = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapObjectType.ITEM));
- for (MapObject item : list) {
- player.pickupItem(item);
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm4/MesoRateCommand.java b/src/main/java/client/command/commands/gm4/MesoRateCommand.java
deleted file mode 100644
index 4680c0cefc3..00000000000
--- a/src/main/java/client/command/commands/gm4/MesoRateCommand.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- int mesorate = Math.max(Integer.parseInt(params[0]), 1);
- c.getWorldServer().setMesoRate(mesorate);
- c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Meso Rate has been changed to " + mesorate + "x."));
- }
-}
diff --git a/src/main/java/client/command/commands/gm4/PapCommand.java b/src/main/java/client/command/commands/gm4/PapCommand.java
deleted file mode 100644
index f0ddecc7924..00000000000
--- a/src/main/java/client/command/commands/gm4/PapCommand.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- if (!PlayerNPC.spawnPlayerNPC(player.getMapId(), player.getPosition(), c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]))) {
- player.dropMessage(5, "Could not deploy PlayerNPC. Either there's no room available here or depleted out scriptids to use.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java b/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java
deleted file mode 100644
index 68616156ba0..00000000000
--- a/src/main/java/client/command/commands/gm4/PlayerNpcRemoveCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
- PlayerNPC.removePlayerNPC(c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]));
- }
-}
diff --git a/src/main/java/client/command/commands/gm4/PmobCommand.java b/src/main/java/client/command/commands/gm4/PmobCommand.java
deleted file mode 100644
index 7b918a8d940..00000000000
--- a/src/main/java/client/command/commands/gm4/PmobCommand.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see []");
- return;
- }
-
- // command suggestion thanks to HighKey21, none, bibiko94 (TAYAMO), asafgb
- int mapId = player.getMapId();
- int mobId = Integer.parseInt(params[0]);
- int mobTime = (params.length > 1) ? Integer.parseInt(params[1]) : -1;
-
- Point checkpos = player.getMap().getGroundBelow(player.getPosition());
- int xpos = checkpos.x;
- int ypos = checkpos.y;
- int fh = player.getMap().getFootholds().findBelow(checkpos).getId();
-
- Monster mob = LifeFactory.getMonster(mobId);
- if (mob != null && !mob.getName().equals("MISSINGNO")) {
- mob.setPosition(checkpos);
- mob.setCy(ypos);
- mob.setRx0(xpos + 50);
- mob.setRx1(xpos - 50);
- mob.setFh(fh);
- try (Connection con = DatabaseConnection.getConnection();
- PreparedStatement ps = con.prepareStatement("INSERT INTO plife ( life, f, fh, cy, rx0, rx1, type, x, y, world, map, mobtime, hide ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )")) {
- ps.setInt(1, mobId);
- ps.setInt(2, 0);
- ps.setInt(3, fh);
- ps.setInt(4, ypos);
- ps.setInt(5, xpos + 50);
- ps.setInt(6, xpos - 50);
- ps.setString(7, "m");
- ps.setInt(8, xpos);
- ps.setInt(9, ypos);
- ps.setInt(10, player.getWorld());
- ps.setInt(11, mapId);
- ps.setInt(12, mobTime);
- ps.setInt(13, 0);
- ps.executeUpdate();
-
- for (Channel ch : player.getWorldServer().getChannels()) {
- MapleMap map = ch.getMapFactory().getMap(mapId);
- map.addMonsterSpawn(mob, mobTime, -1);
- map.addAllMonsterSpawn(mob, mobTime, -1);
- }
-
- player.yellowMessage("Pmob created.");
- } catch (SQLException e) {
- e.printStackTrace();
- player.dropMessage(5, "Failed to store pmob in the database.");
- }
- } else {
- player.dropMessage(5, "You have entered an invalid mob id.");
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/client/command/commands/gm4/PmobRemoveCommand.java b/src/main/java/client/command/commands/gm4/PmobRemoveCommand.java
deleted file mode 100644
index f2abbea2a0f..00000000000
--- a/src/main/java/client/command/commands/gm4/PmobRemoveCommand.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see >> toRemove = new LinkedList<>();
- try (Connection con = DatabaseConnection.getConnection()) {
- final PreparedStatement ps;
- if (mobId > -1) {
- String select = "SELECT * FROM plife WHERE world = ? AND map = ? AND type LIKE ? AND life = ?";
- ps = con.prepareStatement(select, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE);
- ps.setInt(1, player.getWorld());
- ps.setInt(2, mapId);
- ps.setString(3, "m");
- ps.setInt(4, mobId);
- } else {
- String select = "SELECT * FROM plife WHERE world = ? AND map = ? AND type LIKE ? AND x >= ? AND x <= ? AND y >= ? AND y <= ?";
- ps = con.prepareStatement(select, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE);
- ps.setInt(1, player.getWorld());
- ps.setInt(2, mapId);
- ps.setString(3, "m");
- ps.setInt(4, xpos - 50);
- ps.setInt(5, xpos + 50);
- ps.setInt(6, ypos - 50);
- ps.setInt(7, ypos + 50);
- }
-
- try (ResultSet rs = ps.executeQuery()) {
- while (true) {
- rs.beforeFirst();
- if (!rs.next()) {
- break;
- }
-
- toRemove.add(new Pair<>(rs.getInt("life"), new Pair<>(rs.getInt("x"), rs.getInt("y"))));
- rs.deleteRow();
- }
- }
- ps.close();
- } catch (SQLException e) {
- e.printStackTrace();
- player.dropMessage(5, "Failed to remove pmob from the database.");
- }
-
- if (!toRemove.isEmpty()) {
- for (Channel ch : player.getWorldServer().getChannels()) {
- MapleMap map = ch.getMapFactory().getMap(mapId);
-
- for (Pair> r : toRemove) {
- map.removeMonsterSpawn(r.getLeft(), r.getRight().getLeft(), r.getRight().getRight());
- map.removeAllMonsterSpawn(r.getLeft(), r.getRight().getLeft(), r.getRight().getRight());
- }
- }
- }
-
- player.yellowMessage("Cleared " + toRemove.size() + " pmob placements.");
- }
-}
\ No newline at end of file
diff --git a/src/main/java/client/command/commands/gm4/PnpcCommand.java b/src/main/java/client/command/commands/gm4/PnpcCommand.java
deleted file mode 100644
index e6212b27c49..00000000000
--- a/src/main/java/client/command/commands/gm4/PnpcCommand.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- // command suggestion thanks to HighKey21, none, bibiko94 (TAYAMO), asafgb
- int mapId = player.getMapId();
- int npcId = Integer.parseInt(params[0]);
- if (player.getMap().containsNPC(npcId)) {
- player.dropMessage(5, "This map already contains the specified NPC.");
- return;
- }
-
- NPC npc = LifeFactory.getNPC(npcId);
-
- Point checkpos = player.getMap().getGroundBelow(player.getPosition());
- int xpos = checkpos.x;
- int ypos = checkpos.y;
- int fh = player.getMap().getFootholds().findBelow(checkpos).getId();
-
- if (npc != null && !npc.getName().equals("MISSINGNO")) {
- try (Connection con = DatabaseConnection.getConnection();
- PreparedStatement ps = con.prepareStatement("INSERT INTO plife ( life, f, fh, cy, rx0, rx1, type, x, y, world, map, mobtime, hide ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )")) {
- ps.setInt(1, npcId);
- ps.setInt(2, 0);
- ps.setInt(3, fh);
- ps.setInt(4, ypos);
- ps.setInt(5, xpos + 50);
- ps.setInt(6, xpos - 50);
- ps.setString(7, "n");
- ps.setInt(8, xpos);
- ps.setInt(9, ypos);
- ps.setInt(10, player.getWorld());
- ps.setInt(11, mapId);
- ps.setInt(12, -1);
- ps.setInt(13, 0);
- ps.executeUpdate();
-
- for (Channel ch : player.getWorldServer().getChannels()) {
- npc = LifeFactory.getNPC(npcId);
- npc.setPosition(checkpos);
- npc.setCy(ypos);
- npc.setRx0(xpos + 50);
- npc.setRx1(xpos - 50);
- npc.setFh(fh);
-
- MapleMap map = ch.getMapFactory().getMap(mapId);
- map.addMapObject(npc);
- map.broadcastMessage(PacketCreator.spawnNPC(npc));
- }
-
- player.yellowMessage("Pnpc created.");
- } catch (SQLException e) {
- e.printStackTrace();
- player.dropMessage(5, "Failed to store pNPC in the database.");
- }
- } else {
- player.dropMessage(5, "You have entered an invalid NPC id.");
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java b/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java
deleted file mode 100644
index a062496d150..00000000000
--- a/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see >> toRemove = new LinkedList<>();
- try (Connection con = DatabaseConnection.getConnection()) {
- final PreparedStatement ps;
- if (npcId > -1) {
- String select = "SELECT * FROM plife WHERE world = ? AND map = ? AND type LIKE ? AND life = ?";
- ps = con.prepareStatement(select, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE);
- ps.setInt(1, player.getWorld());
- ps.setInt(2, mapId);
- ps.setString(3, "n");
- ps.setInt(4, npcId);
- } else {
- String select = "SELECT * FROM plife WHERE world = ? AND map = ? AND type LIKE ? AND x >= ? AND x <= ? AND y >= ? AND y <= ?";
- ps = con.prepareStatement(select, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE);
- ps.setInt(1, player.getWorld());
- ps.setInt(2, mapId);
- ps.setString(3, "n");
- ps.setInt(4, xpos - 50);
- ps.setInt(5, xpos + 50);
- ps.setInt(6, ypos - 50);
- ps.setInt(7, ypos + 50);
- }
-
- try (ResultSet rs = ps.executeQuery()) {
- while (true) {
- rs.beforeFirst();
- if (!rs.next()) {
- break;
- }
-
- toRemove.add(new Pair<>(rs.getInt("life"), new Pair<>(rs.getInt("x"), rs.getInt("y"))));
- rs.deleteRow();
- }
- }
-
- ps.close();
- } catch (SQLException e) {
- e.printStackTrace();
- player.dropMessage(5, "Failed to remove pNPC from the database.");
- }
-
- if (!toRemove.isEmpty()) {
- for (Channel ch : player.getWorldServer().getChannels()) {
- MapleMap map = ch.getMapFactory().getMap(mapId);
-
- for (Pair> r : toRemove) {
- map.destroyNPC(r.getLeft());
- }
- }
- }
-
- player.yellowMessage("Cleared " + toRemove.size() + " pNPC placements.");
- }
-}
\ No newline at end of file
diff --git a/src/main/java/client/command/commands/gm4/ProItemCommand.java b/src/main/java/client/command/commands/gm4/ProItemCommand.java
deleted file mode 100644
index 7ecab53fad5..00000000000
--- a/src/main/java/client/command/commands/gm4/ProItemCommand.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see []");
- return;
- }
-
- ItemInformationProvider ii = ItemInformationProvider.getInstance();
- int itemid = Integer.parseInt(params[0]);
-
- if (ii.getName(itemid) == null) {
- player.yellowMessage("Item id '" + params[0] + "' does not exist.");
- return;
- }
-
- short stat = (short) Math.max(0, Short.parseShort(params[1]));
- short spdjmp = params.length >= 3 ? (short) Math.max(0, Short.parseShort(params[2])) : 0;
-
- InventoryType type = ItemConstants.getInventoryType(itemid);
- if (type.equals(InventoryType.EQUIP)) {
- Item it = ii.getEquipById(itemid);
- it.setOwner(player.getName());
-
- hardsetItemStats((Equip) it, stat, spdjmp);
- InventoryManipulator.addFromDrop(c, it);
- } else {
- player.dropMessage(6, "Make sure it's an equippable item.");
- }
- }
-
- private static void hardsetItemStats(Equip equip, short stat, short spdjmp) {
- equip.setStr(stat);
- equip.setDex(stat);
- equip.setInt(stat);
- equip.setLuk(stat);
- equip.setMatk(stat);
- equip.setWatk(stat);
- equip.setAcc(stat);
- equip.setAvoid(stat);
- equip.setJump(spdjmp);
- equip.setSpeed(spdjmp);
- equip.setWdef(stat);
- equip.setMdef(stat);
- equip.setHp(stat);
- equip.setMp(stat);
-
- short flag = equip.getFlag();
- flag |= ItemConstants.UNTRADEABLE;
- equip.setFlag(flag);
- }
-}
diff --git a/src/main/java/client/command/commands/gm4/QuestRateCommand.java b/src/main/java/client/command/commands/gm4/QuestRateCommand.java
deleted file mode 100644
index c880d7a166c..00000000000
--- a/src/main/java/client/command/commands/gm4/QuestRateCommand.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- int questrate = Math.max(Integer.parseInt(params[0]), 1);
- c.getWorldServer().setQuestRate(questrate);
- c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Quest Rate has been changed to " + questrate + "x."));
-
- }
-}
diff --git a/src/main/java/client/command/commands/gm4/ServerMessageCommand.java b/src/main/java/client/command/commands/gm4/ServerMessageCommand.java
deleted file mode 100644
index 2fd43e483cd..00000000000
--- a/src/main/java/client/command/commands/gm4/ServerMessageCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see []");
- return;
- }
-
- short newStat = (short) Math.max(0, Integer.parseInt(params[0]));
- short newSpdJmp = params.length >= 2 ? (short) Integer.parseInt(params[1]) : 0;
- Inventory equip = player.getInventory(InventoryType.EQUIP);
-
- for (byte i = 1; i <= equip.getSlotLimit(); i++) {
- try {
- Equip eq = (Equip) equip.getItem(i);
- if (eq == null) {
- continue;
- }
-
- eq.setWdef(newStat);
- eq.setAcc(newStat);
- eq.setAvoid(newStat);
- eq.setJump(newSpdJmp);
- eq.setMatk(newStat);
- eq.setMdef(newStat);
- eq.setHp(newStat);
- eq.setMp(newStat);
- eq.setSpeed(newSpdJmp);
- eq.setWatk(newStat);
- eq.setDex(newStat);
- eq.setInt(newStat);
- eq.setStr(newStat);
- eq.setLuk(newStat);
-
- short flag = eq.getFlag();
- flag |= ItemConstants.UNTRADEABLE;
- eq.setFlag(flag);
-
- player.forceUpdateItem(eq);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm4/TravelRateCommand.java b/src/main/java/client/command/commands/gm4/TravelRateCommand.java
deleted file mode 100644
index aabb8605aaa..00000000000
--- a/src/main/java/client/command/commands/gm4/TravelRateCommand.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- int travelrate = Math.max(Integer.parseInt(params[0]), 1);
- c.getWorldServer().setTravelRate(travelrate);
- c.getWorldServer().broadcastPacket(PacketCreator.serverNotice(6, "[Rate] Travel Rate has been changed to " + travelrate + "x."));
- }
-}
diff --git a/src/main/java/client/command/commands/gm4/ZakumCommand.java b/src/main/java/client/command/commands/gm4/ZakumCommand.java
deleted file mode 100644
index eeea31f45f1..00000000000
--- a/src/main/java/client/command/commands/gm4/ZakumCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- switch (params[0]) {
- case "type":
- case "help":
- String msgTypes = "Available #bdebug types#k:\r\n\r\n";
- for (int i = 0; i < debugTypes.length; i++) {
- msgTypes += ("#L" + i + "#" + debugTypes[i] + "#l\r\n");
- }
-
- c.getAbstractPlayerInteraction().npcTalk(NpcId.STEWARD, msgTypes);
- break;
-
- case "monster":
- List monsters = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapObjectType.MONSTER));
- for (MapObject monstermo : monsters) {
- Monster monster = (Monster) monstermo;
- Character controller = monster.getController();
- player.message("Monster ID: " + monster.getId() + " Aggro target: " + ((controller != null) ? controller.getName() + " Has aggro: " + monster.isControllerHasAggro() + " Knowns aggro: " + monster.isControllerKnowsAboutAggro() : ""));
- }
- break;
-
- case "packet":
- //player.getMap().broadcastMessage(PacketCreator.customPacket(joinStringFrom(params, 1)));
- break;
-
- case "portal":
- Portal portal = player.getMap().findClosestPortal(player.getPosition());
- if (portal != null) {
- player.dropMessage(6, "Closest portal: " + portal.getId() + " '" + portal.getName() + "' Type: " + portal.getType() + " --> toMap: " + portal.getTargetMapId() + " scriptname: '" + portal.getScriptName() + "' state: " + (portal.getPortalState() ? 1 : 0) + ".");
- } else {
- player.dropMessage(6, "There is no portal on this map.");
- }
- break;
-
- case "spawnpoint":
- SpawnPoint sp = player.getMap().findClosestSpawnpoint(player.getPosition());
- if (sp != null) {
- player.dropMessage(6, "Closest mob spawn point: " + " Position: x " + sp.getPosition().getX() + " y " + sp.getPosition().getY() + " Spawns mobid: '" + sp.getMonsterId() + "' --> canSpawn: " + !sp.getDenySpawn() + " canSpawnRightNow: " + sp.shouldSpawn() + ".");
- } else {
- player.dropMessage(6, "There is no mob spawn point on this map.");
- }
- break;
-
- case "pos":
- player.dropMessage(6, "Current map position: (" + player.getPosition().getX() + ", " + player.getPosition().getY() + ").");
- break;
-
- case "map":
- player.dropMessage(6, "Current map id " + player.getMap().getId() + ", event: '" + ((player.getMap().getEventInstance() != null) ? player.getMap().getEventInstance().getName() : "null") + "'; Players: " + player.getMap().getAllPlayers().size() + ", Mobs: " + player.getMap().countMonsters() + ", Reactors: " + player.getMap().countReactors() + ", Items: " + player.getMap().countItems() + ", Objects: " + player.getMap().getMapObjects().size() + ".");
- break;
-
- case "mobsp":
- player.getMap().reportMonsterSpawnPoints(player);
- break;
-
- case "event":
- if (player.getEventInstance() == null) {
- player.dropMessage(6, "Player currently not in an event.");
- } else {
- player.dropMessage(6, "Current event name: " + player.getEventInstance().getName() + ".");
- }
- break;
-
- case "areas":
- player.dropMessage(6, "Configured areas on map " + player.getMapId() + ":");
-
- byte index = 0;
- for (Rectangle rect : player.getMap().getAreas()) {
- player.dropMessage(6, "Id: " + index + " -> posX: " + rect.getX() + " posY: '" + rect.getY() + "' dX: " + rect.getWidth() + " dY: " + rect.getHeight() + ".");
- index++;
- }
- break;
-
- case "reactors":
- player.dropMessage(6, "Current reactor states on map " + player.getMapId() + ":");
-
- for (MapObject mmo : player.getMap().getReactors()) {
- Reactor mr = (Reactor) mmo;
- player.dropMessage(6, "Id: " + mr.getId() + " Oid: " + mr.getObjectId() + " name: '" + mr.getName() + "' -> Type: " + mr.getReactorType() + " State: " + mr.getState() + " Event State: " + mr.getEventState() + " Position: x " + mr.getPosition().getX() + " y " + mr.getPosition().getY() + ".");
- }
- break;
-
- case "servercoupons":
- case "coupons":
- String s = "Currently active SERVER coupons: ";
- for (Integer i : Server.getInstance().getActiveCoupons()) {
- s += (i + " ");
- }
-
- player.dropMessage(6, s);
- break;
-
- case "playercoupons":
- String st = "Currently active PLAYER coupons: ";
- for (Integer i : player.getActiveCoupons()) {
- st += (i + " ");
- }
-
- player.dropMessage(6, st);
- break;
-
- case "timer":
- TimerManager tMan = TimerManager.getInstance();
- player.dropMessage(6, "Total Task: " + tMan.getTaskCount() + " Current Task: " + tMan.getQueuedTasks() + " Active Task: " + tMan.getActiveCount() + " Completed Task: " + tMan.getCompletedTaskCount());
- break;
-
- case "marriage":
- c.getChannelServer().debugMarriageStatus();
- break;
-
- case "buff":
- c.getPlayer().debugListAllBuffs();
- break;
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm5/IpListCommand.java b/src/main/java/client/command/commands/gm5/IpListCommand.java
deleted file mode 100644
index 3661c8f31b9..00000000000
--- a/src/main/java/client/command/commands/gm5/IpListCommand.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see chars = w.getPlayerStorage().getAllCharacters();
-
- if (!chars.isEmpty()) {
- str += "\r\n" + GameConstants.WORLD_NAMES[w.getId()] + "\r\n";
-
- for (Character chr : chars) {
- str += " " + chr.getName() + " - " + chr.getClient().getRemoteAddress() + "\r\n";
- }
- }
- }
-
- c.getAbstractPlayerInteraction().npcTalk(22000, str);
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/client/command/commands/gm5/SetCommand.java b/src/main/java/client/command/commands/gm5/SetCommand.java
deleted file mode 100644
index f42dd1fb1bf..00000000000
--- a/src/main/java/client/command/commands/gm5/SetCommand.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
- Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
- if (victim != null) {
- player.message(victim.getName() + "'s account name is " + victim.getClient().getAccountName() + ".");
- } else {
- player.message("Player '" + params[0] + "' could not be found on this world.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm6/MapPlayersCommand.java b/src/main/java/client/command/commands/gm6/MapPlayersCommand.java
deleted file mode 100644
index 2404bd9bc06..00000000000
--- a/src/main/java/client/command/commands/gm6/MapPlayersCommand.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- final int worldid = Integer.parseInt(params[0]);
-
- ThreadManager.getInstance().newTask(() -> {
- int chid = Server.getInstance().addChannel(worldid);
- if (player.isLoggedinWorld()) {
- if (chid >= 0) {
- player.dropMessage(5, "NEW Channel " + chid + " successfully deployed on world " + worldid + ".");
- } else {
- if (chid == -3) {
- player.dropMessage(5, "Invalid worldid detected. Channel creation aborted.");
- } else if (chid == -2) {
- player.dropMessage(5, "Reached channel limit on worldid " + worldid + ". Channel creation aborted.");
- } else if (chid == -1) {
- player.dropMessage(5, "Error detected when loading the 'world.ini' file. Channel creation aborted.");
- } else {
- player.dropMessage(5, "NEW Channel failed to be deployed. Check if the needed port is already in use or other limitations are taking place.");
- }
- }
- }
- });
- }
-}
diff --git a/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java b/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java
deleted file mode 100644
index ae611f904d4..00000000000
--- a/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- final int worldId = Integer.parseInt(params[0]);
- ThreadManager.getInstance().newTask(() -> {
- if (Server.getInstance().removeChannel(worldId)) {
- if (player.isLoggedinWorld()) {
- player.dropMessage(5, "Successfully removed a channel on World " + worldId + ". Current channel count: " + Server.getInstance().getWorld(worldId).getChannelsSize() + ".");
- }
- } else {
- if (player.isLoggedinWorld()) {
- player.dropMessage(5, "Failed to remove last Channel on world " + worldId + ". Check if either that world exists or there are people currently playing there.");
- }
- }
- });
- }
-}
diff --git a/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java b/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java
deleted file mode 100644
index 522d891c637..00000000000
--- a/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- int newLevel = Integer.parseInt(params[1]);
- Character target = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
- if (target != null) {
- target.setGMLevel(newLevel);
- target.getClient().setGMLevel(newLevel);
-
- target.dropMessage("You are now a level " + newLevel + " GM. See @commands for a list of available commands.");
- player.dropMessage(target + " is now a level " + newLevel + " GM.");
- } else {
- player.dropMessage("Player '" + params[0] + "' was not found on this channel.");
- }
- }
-}
diff --git a/src/main/java/client/command/commands/gm6/ShutdownCommand.java b/src/main/java/client/command/commands/gm6/ShutdownCommand.java
deleted file mode 100644
index a083c9b63f3..00000000000
--- a/src/main/java/client/command/commands/gm6/ShutdownCommand.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see |NOW]");
- return;
- }
-
- int time = 60000;
- if (params[0].equalsIgnoreCase("now")) {
- time = 1;
- } else {
- time *= Integer.parseInt(params[0]);
- }
-
- if (time > 1) {
- int seconds = (time / (int) SECONDS.toMillis(1)) % 60;
- int minutes = (time / (int) MINUTES.toMillis(1)) % 60;
- int hours = (time / (int) HOURS.toMillis(1)) % 24;
- int days = (time / (int) DAYS.toMillis(1));
-
- String strTime = "";
- if (days > 0) {
- strTime += days + " days, ";
- }
- if (hours > 0) {
- strTime += hours + " hours, ";
- }
- strTime += minutes + " minutes, ";
- strTime += seconds + " seconds";
-
- for (World w : Server.getInstance().getWorlds()) {
- for (Character chr : w.getPlayerStorage().getAllCharacters()) {
- chr.dropMessage("Server is undergoing maintenance process, and will be shutdown in " + strTime + ". Prepare yourself to quit safely in the mean time.");
- }
- }
- }
-
- TimerManager.getInstance().schedule(Server.getInstance().shutdown(false), time);
- }
-}
diff --git a/src/main/java/client/command/commands/gm6/SpawnAllPNpcsCommand.java b/src/main/java/client/command/commands/gm6/SpawnAllPNpcsCommand.java
deleted file mode 100644
index d3633ff07ea..00000000000
--- a/src/main/java/client/command/commands/gm6/SpawnAllPNpcsCommand.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- YamlConfig.config.server.USE_SUPPLY_RATE_COUPONS = params[0].compareToIgnoreCase("no") != 0;
- player.dropMessage(5, "Rate coupons are now " + (YamlConfig.config.server.USE_SUPPLY_RATE_COUPONS ? "enabled" : "disabled") + " for purchase at the Cash Shop.");
- }
-}
diff --git a/src/main/java/client/command/commands/gm6/WarpWorldCommand.java b/src/main/java/client/command/commands/gm6/WarpWorldCommand.java
deleted file mode 100644
index 9384749ecdb..00000000000
--- a/src/main/java/client/command/commands/gm6/WarpWorldCommand.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- This file is part of the HeavenMS MapleStory Server, commands OdinMS-based
- Copyleft (L) 2016 - 2019 RonanLana
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation version 3 as published by
- the Free Software Foundation. You may not use, modify or distribute
- this program under any other version of the GNU Affero General Public
- License.
-
- 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see ");
- return;
- }
-
- Server server = Server.getInstance();
- byte worldb = Byte.parseByte(params[0]);
- if (worldb <= (server.getWorldsSize() - 1)) {
- try {
- String[] socket = server.getInetSocket(c, worldb, c.getChannel());
- c.getWorldServer().removePlayer(player);
- player.getMap().removePlayer(player);//LOL FORGOT THIS ><
- player.setSessionTransitionState();
- player.setWorld(worldb);
- player.saveCharToDB();//To set the new world :O (true because else 2 player instances are created, one in both worlds)
- c.sendPacket(PacketCreator.getChannelChange(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1])));
- } catch (UnknownHostException | NumberFormatException ex) {
- ex.printStackTrace();
- player.message("Unexpected error when changing worlds, are you sure the world you are trying to warp to has the same amount of channels?");
- }
-
- } else {
- player.message("Invalid world; highest number available: " + (server.getWorldsSize() - 1));
- }
- }
-}
diff --git a/src/main/java/net/PacketProcessor.java b/src/main/java/net/PacketProcessor.java
index 6a27fb70852..4a5b3cb936a 100644
--- a/src/main/java/net/PacketProcessor.java
+++ b/src/main/java/net/PacketProcessor.java
@@ -67,7 +67,6 @@
import net.server.channel.handlers.FamilyUseHandler;
import net.server.channel.handlers.FieldDamageMobHandler;
import net.server.channel.handlers.FredrickHandler;
-import net.server.channel.handlers.GeneralChatHandler;
import net.server.channel.handlers.GiveFameHandler;
import net.server.channel.handlers.GrenadeEffectHandler;
import net.server.channel.handlers.GuildOperationHandler;
@@ -305,7 +304,6 @@ private void registerChannelHandlers() {
registerHandler(RecvOpcode.WORLD_TRANSFER, new TransferWorldHandler());
registerHandler(RecvOpcode.CHANGE_CHANNEL, new ChangeChannelHandler());
registerHandler(RecvOpcode.STRANGE_DATA, LoginRequiringNoOpHandler.getInstance());
- registerHandler(RecvOpcode.GENERAL_CHAT, new GeneralChatHandler());
registerHandler(RecvOpcode.WHISPER, new WhisperHandler());
registerHandler(RecvOpcode.NPC_TALK, new NPCTalkHandler());
registerHandler(RecvOpcode.NPC_TALK_MORE, new NPCMoreTalkHandler());
diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java
index 39450ed4c74..9033e7a3d7c 100644
--- a/src/main/java/net/server/Server.java
+++ b/src/main/java/net/server/Server.java
@@ -25,7 +25,6 @@
import client.Client;
import client.Family;
import client.SkillFactory;
-import client.command.CommandsExecutor;
import client.inventory.Item;
import client.inventory.ItemFactory;
import client.inventory.manipulator.CashIdGenerator;
@@ -939,7 +938,6 @@ public void init() {
log.info("Ashes is now online after {} ms.", initDuration.toMillis());
OpcodeConstants.generateOpcodeNames();
- CommandsExecutor.getInstance();
for (Channel ch : this.getAllChannels()) {
ch.reloadEventScriptManager();
diff --git a/src/main/java/net/server/channel/handlers/GeneralChatHandler.java b/src/main/java/net/server/channel/handlers/GeneralChatHandler.java
deleted file mode 100644
index 1826d868561..00000000000
--- a/src/main/java/net/server/channel/handlers/GeneralChatHandler.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-This file is part of the OdinMS Maple Story Server
-Copyright (C) 2008 Patrick Huy
-Matthias Butz
-Jan Christian Meyer
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation version 3 as published by
-the Free Software Foundation. You may not use, modify or distribute
-this program under any other version of the GNU Affero General Public
-License.
-
-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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program. If not, see