diff --git a/src/main/java/client/AbstractCharacterListener.java b/src/main/java/client/AbstractCharacterListener.java index eaa3da7227..b3ae102f20 100644 --- a/src/main/java/client/AbstractCharacterListener.java +++ b/src/main/java/client/AbstractCharacterListener.java @@ -20,7 +20,6 @@ package client; /** - * * @author Ronan */ public interface AbstractCharacterListener { diff --git a/src/main/java/client/BuddyList.java b/src/main/java/client/BuddyList.java index 4ce83e62fe..fdc98f3cff 100644 --- a/src/main/java/client/BuddyList.java +++ b/src/main/java/client/BuddyList.java @@ -40,31 +40,32 @@ public class BuddyList { public enum BuddyAddResult { BUDDYLIST_FULL, ALREADY_ON_LIST, OK } - private Map buddies = new LinkedHashMap<>(); + + private final Map buddies = new LinkedHashMap<>(); private int capacity; - private Deque pendingRequests = new LinkedList<>(); + private final Deque pendingRequests = new LinkedList<>(); public BuddyList(int capacity) { this.capacity = capacity; } public boolean contains(int characterId) { - synchronized(buddies) { + synchronized (buddies) { return buddies.containsKey(characterId); } } public boolean containsVisible(int characterId) { BuddylistEntry ble; - synchronized(buddies) { + synchronized (buddies) { ble = buddies.get(characterId); } - + if (ble == null) { return false; } return ble.isVisible(); - + } public int getCapacity() { @@ -76,7 +77,7 @@ public class BuddyList { } public BuddylistEntry get(int characterId) { - synchronized(buddies) { + synchronized (buddies) { return buddies.get(characterId); } } @@ -88,36 +89,36 @@ public class BuddyList { return ble; } } - + return null; } public void put(BuddylistEntry entry) { - synchronized(buddies) { + synchronized (buddies) { buddies.put(entry.getCharacterId(), entry); } } public void remove(int characterId) { - synchronized(buddies) { + synchronized (buddies) { buddies.remove(characterId); } } public Collection getBuddies() { - synchronized(buddies) { + synchronized (buddies) { return Collections.unmodifiableCollection(buddies.values()); } } public boolean isFull() { - synchronized(buddies) { + synchronized (buddies) { return buddies.size() >= capacity; } } public int[] getBuddyIds() { - synchronized(buddies) { + synchronized (buddies) { int[] buddyIds = new int[buddies.size()]; int i = 0; for (BuddylistEntry ble : buddies.values()) { @@ -126,12 +127,12 @@ public class BuddyList { return buddyIds; } } - + public void broadcast(Packet packet, PlayerStorage pstorage) { - for(int bid : getBuddyIds()) { + for (int bid : getBuddyIds()) { Character chr = pstorage.getCharacterById(bid); - - if(chr != null && chr.isLoggedinWorld()) { + + if (chr != null && chr.isLoggedinWorld()) { chr.sendPacket(packet); } } diff --git a/src/main/java/client/BuddylistEntry.java b/src/main/java/client/BuddylistEntry.java index 73d1608e5d..99b9766e14 100644 --- a/src/main/java/client/BuddylistEntry.java +++ b/src/main/java/client/BuddylistEntry.java @@ -22,17 +22,16 @@ package client; public class BuddylistEntry { - private String name; + private final String name; private String group; - private int cid; + private final int cid; private int channel; private boolean visible; /** - * * @param name * @param characterId - * @param channel should be -1 if the buddy is offline + * @param channel should be -1 if the buddy is offline * @param visible */ public BuddylistEntry(String name, String group, int characterId, int channel, boolean visible) { @@ -102,9 +101,6 @@ public class BuddylistEntry { return false; } final BuddylistEntry other = (BuddylistEntry) obj; - if (cid != other.cid) { - return false; - } - return true; + return cid == other.cid; } } diff --git a/src/main/java/client/CharacterNameAndId.java b/src/main/java/client/CharacterNameAndId.java index 204f0c0157..1f7db9d4ac 100644 --- a/src/main/java/client/CharacterNameAndId.java +++ b/src/main/java/client/CharacterNameAndId.java @@ -22,8 +22,8 @@ package client; public class CharacterNameAndId { - private int id; - private String name; + private final int id; + private final String name; public CharacterNameAndId(int id, String name) { super(); diff --git a/src/main/java/client/Client.java b/src/main/java/client/Client.java index 97542ef771..9d1ec881e1 100644 --- a/src/main/java/client/Client.java +++ b/src/main/java/client/Client.java @@ -153,7 +153,7 @@ public class Client extends ChannelInboundHandlerAdapter { } public static Client createMock() { - return new Client(null, -1,null, null, -123, -123); + return new Client(null, -1, null, null, -123, -123); } @Override diff --git a/src/main/java/client/FamilyEntry.java b/src/main/java/client/FamilyEntry.java index 5eb525dee6..cea2c8d212 100644 --- a/src/main/java/client/FamilyEntry.java +++ b/src/main/java/client/FamilyEntry.java @@ -447,7 +447,9 @@ public class FamilyEntry { public synchronized boolean isJunior(FamilyEntry entry) { //require locking since result accuracy is vital if (juniors[0] == entry) { return true; - } else return juniors[1] == entry; + } else { + return juniors[1] == entry; + } } public synchronized boolean removeJunior(FamilyEntry junior) { diff --git a/src/main/java/client/MonsterBook.java b/src/main/java/client/MonsterBook.java index 461c51f0ba..1919fb344c 100644 --- a/src/main/java/client/MonsterBook.java +++ b/src/main/java/client/MonsterBook.java @@ -37,12 +37,12 @@ import java.util.concurrent.locks.Lock; public final class MonsterBook { private static final Semaphore semaphore = new Semaphore(10); - + private int specialCard = 0; private int normalCard = 0; private int bookLevel = 1; - private Map cards = new LinkedHashMap<>(); - private Lock lock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.BOOK); + private final Map cards = new LinkedHashMap<>(); + private final Lock lock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.BOOK); public Set> getCardSet() { lock.lock(); @@ -52,23 +52,23 @@ public final class MonsterBook { lock.unlock(); } } - + public void addCard(final Client c, final int cardid) { c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.showForeignCardEffect(c.getPlayer().getId()), false); - + Integer qty; lock.lock(); try { qty = cards.get(cardid); - - if(qty != null) { - if(qty < 5) { + + if (qty != null) { + if (qty < 5) { cards.put(cardid, qty + 1); } } else { cards.put(cardid, 1); qty = 0; - + if (cardid / 1000 >= 2388) { specialCard++; } else { @@ -78,12 +78,12 @@ public final class MonsterBook { } finally { lock.unlock(); } - - if(qty < 5) { + + if (qty < 5) { if (qty == 0) { // leveling system only accounts unique cards calculateLevel(); } - + c.sendPacket(PacketCreator.addCard(false, cardid, qty + 1)); c.sendPacket(PacketCreator.showGainCard()); } else { @@ -95,13 +95,13 @@ public final class MonsterBook { lock.lock(); try { int collectionExp = (normalCard + specialCard); - + int level = 0, expToNextlevel = 1; do { level++; expToNextlevel += level * 10; } while (collectionExp >= expToNextlevel); - + bookLevel = level; // thanks IxianMace for noticing book level differing between book UI and character info UI } finally { lock.unlock(); @@ -183,16 +183,16 @@ public final class MonsterBook { private static int saveStringConcat(char[] data, int pos, Integer i) { return saveStringConcat(data, pos, i.toString()); } - + private static int saveStringConcat(char[] data, int pos, String s) { int len = s.length(); - for(int j = 0; j < len; j++) { + for (int j = 0; j < len; j++) { data[pos + j] = s.charAt(j); } - + return pos + len; } - + private static String getSaveString(Integer charid, Set> cardSet) { semaphore.acquireUninterruptibly(); try { @@ -210,13 +210,13 @@ public final class MonsterBook { i = saveStringConcat(save, i, all.getValue()); //1 char due to being 0 ~ 5 i = saveStringConcat(save, i, "),"); } - + return new String(save, 0, i - 1); } finally { semaphore.release(); } } - + public void saveCards(final int charid) { Set> cardSet = getCardSet(); @@ -237,7 +237,7 @@ public final class MonsterBook { e.printStackTrace(); } } - + public static int[] getCardTierSize() { try (Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT COUNT(*) FROM monstercarddata GROUP BY floor(cardid / 1000);", ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); diff --git a/src/main/java/client/Skill.java b/src/main/java/client/Skill.java index 95d1ab5062..8d53d0d615 100644 --- a/src/main/java/client/Skill.java +++ b/src/main/java/client/Skill.java @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; public class Skill { - private int id; - private List effects = new ArrayList<>(); + private final int id; + private final List effects = new ArrayList<>(); private Element element; private int animationTime; - private int job; + private final int job; private boolean action; public Skill(int id) { @@ -54,18 +54,18 @@ public class Skill { public boolean isFourthJob() { if (job == 2212) { - return false; + return false; } if (id == 22170001 || id == 22171003 || id == 22171004 || id == 22181002 || id == 22181003) { - return true; + return true; } - return job % 10 == 2; + return job % 10 == 2; } public void setElement(Element elem) { element = elem; } - + public Element getElement() { return element; } @@ -73,11 +73,11 @@ public class Skill { public int getAnimationTime() { return animationTime; } - + public void setAnimationTime(int time) { animationTime = time; } - + public void incAnimationTime(int time) { animationTime += time; } @@ -85,7 +85,7 @@ public class Skill { public boolean isBeginnerSkill() { return id % 10000000 < 10000; } - + public void setAction(boolean act) { action = act; } @@ -93,7 +93,7 @@ public class Skill { public boolean getAction() { return action; } - + public void addLevelEffect(StatEffect effect) { effects.add(effect); } diff --git a/src/main/java/client/SkillFactory.java b/src/main/java/client/SkillFactory.java index 16dd09841d..d4386c58f9 100644 --- a/src/main/java/client/SkillFactory.java +++ b/src/main/java/client/SkillFactory.java @@ -58,7 +58,7 @@ public class SkillFactory { skills = loadedSkills; } - + private static Skill loadFromData(int id, Data data) { Skill ret = new Skill(id); boolean isBuff = false; @@ -77,7 +77,7 @@ public class SkillFactory { } else { Data action_ = data.getChildByPath("action"); boolean action = false; - if (action_ == null) { + if (action_ == null) { if (data.getChildByPath("prepare/action") != null) { action = true; } else { @@ -88,10 +88,10 @@ public class SkillFactory { break; } } - } else { - action = true; - } - ret.setAction(action); + } else { + action = true; + } + ret.setAction(action); Data hit = data.getChildByPath("hit"); Data ball = data.getChildByPath("ball"); isBuff = effect != null && hit == null && ball == null; @@ -185,7 +185,7 @@ public class SkillFactory { case ILMage.SEAL: case ILWizard.SLOW: case ILMage.SPELL_BOOSTER: - case ILArchMage.HEROS_WILL: + case ILArchMage.HEROS_WILL: case ILArchMage.INFINITY: case ILArchMage.MANA_REFLECTION: case ILArchMage.MAPLE_WARRIOR: @@ -227,7 +227,7 @@ public class SkillFactory { case Bandit.DAGGER_BOOSTER: case Bandit.HASTE: case ChiefBandit.MESO_GUARD: - case ChiefBandit.PICKPOCKET: + case ChiefBandit.PICKPOCKET: case Shadower.HEROS_WILL: case Shadower.MAPLE_WARRIOR: case Shadower.NINJA_AMBUSH: @@ -339,8 +339,9 @@ public class SkillFactory { } if (data.getChildByPath(skill.toString()) != null) { for (Data skilldata : data.getChildByPath(skill.toString()).getChildren()) { - if (skilldata.getName().equals("name")) + if (skilldata.getName().equals("name")) { return DataTool.getString(skilldata, null); + } } } diff --git a/src/main/java/client/SkillMacro.java b/src/main/java/client/SkillMacro.java index b129c5feee..3accb7e1d5 100644 --- a/src/main/java/client/SkillMacro.java +++ b/src/main/java/client/SkillMacro.java @@ -25,9 +25,9 @@ public class SkillMacro { private int skill1; private int skill2; private int skill3; - private String name; - private int shout; - private int position; + private final String name; + private final int shout; + private final int position; public SkillMacro(int skill1, int skill2, int skill3, String name, int shout, int position) { this.skill1 = skill1; @@ -49,7 +49,7 @@ public class SkillMacro { public int getSkill3() { return skill3; } - + public void setSkill1(int skill) { skill1 = skill; } diff --git a/src/main/java/client/autoban/AutobanFactory.java b/src/main/java/client/autoban/AutobanFactory.java index 2fba4249a7..3ac1f488b9 100644 --- a/src/main/java/client/autoban/AutobanFactory.java +++ b/src/main/java/client/autoban/AutobanFactory.java @@ -30,75 +30,74 @@ import tools.FilePrinter; import tools.PacketCreator; /** - * * @author kevintjuh93 */ public enum AutobanFactory { - MOB_COUNT, - GENERAL, - FIX_DAMAGE, - DAMAGE_HACK(15, 60 * 1000), - DISTANCE_HACK(10, 120 * 1000), - PORTAL_DISTANCE(5, 30000), - PACKET_EDIT, - ACC_HACK, - CREATION_GENERATOR, - HIGH_HP_HEALING, - FAST_HP_HEALING(15), - FAST_MP_HEALING(20, 30000), - GACHA_EXP, - TUBI(20, 15000), - SHORT_ITEM_VAC, - ITEM_VAC, - FAST_ITEM_PICKUP(5, 30000), - FAST_ATTACK(10, 30000), - MPCON(25, 30000); + MOB_COUNT, + GENERAL, + FIX_DAMAGE, + DAMAGE_HACK(15, 60 * 1000), + DISTANCE_HACK(10, 120 * 1000), + PORTAL_DISTANCE(5, 30000), + PACKET_EDIT, + ACC_HACK, + CREATION_GENERATOR, + HIGH_HP_HEALING, + FAST_HP_HEALING(15), + FAST_MP_HEALING(20, 30000), + GACHA_EXP, + TUBI(20, 15000), + SHORT_ITEM_VAC, + ITEM_VAC, + FAST_ITEM_PICKUP(5, 30000), + FAST_ATTACK(10, 30000), + MPCON(25, 30000); - private int points; - private long expiretime; + private final int points; + private final long expiretime; - private AutobanFactory() { - this(1, -1); - } + AutobanFactory() { + this(1, -1); + } - private AutobanFactory(int points) { - this.points = points; - this.expiretime = -1; - } + AutobanFactory(int points) { + this.points = points; + this.expiretime = -1; + } - private AutobanFactory(int points, long expire) { - this.points = points; - this.expiretime = expire; - } + AutobanFactory(int points, long expire) { + this.points = points; + this.expiretime = expire; + } - public int getMaximum() { - return points; - } + public int getMaximum() { + return points; + } - public long getExpire() { - return expiretime; - } + public long getExpire() { + return expiretime; + } - public void addPoint(AutobanManager ban, String reason) { - ban.addPoint(this, reason); - } - - public void alert(Character chr, String reason) { - if(YamlConfig.config.server.USE_AUTOBAN == true) { - if (chr != null && MapleLogger.ignored.contains(chr.getId())){ - return; - } - Server.getInstance().broadcastGMMessage((chr != null ? chr.getWorld() : 0), PacketCreator.sendYellowTip((chr != null ? Character.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason)); + public void addPoint(AutobanManager ban, String reason) { + ban.addPoint(this, reason); + } + + public void alert(Character chr, String reason) { + if (YamlConfig.config.server.USE_AUTOBAN == true) { + if (chr != null && MapleLogger.ignored.contains(chr.getId())) { + return; } + Server.getInstance().broadcastGMMessage((chr != null ? chr.getWorld() : 0), PacketCreator.sendYellowTip((chr != null ? Character.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason)); + } if (YamlConfig.config.server.USE_AUTOBAN_LOG) { - FilePrinter.print(FilePrinter.AUTOBAN_WARNING, (chr != null ? Character.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason); - } - } - - public void autoban(Character chr, String value) { - if(YamlConfig.config.server.USE_AUTOBAN == true) { - chr.autoban("Autobanned for (" + this.name() + ": " + value + ")"); - //chr.sendPolice("You will be disconnected for (" + this.name() + ": " + value + ")"); - } - } + FilePrinter.print(FilePrinter.AUTOBAN_WARNING, (chr != null ? Character.makeMapleReadable(chr.getName()) : "") + " caused " + this.name() + " " + reason); + } + } + + public void autoban(Character chr, String value) { + if (YamlConfig.config.server.USE_AUTOBAN == true) { + chr.autoban("Autobanned for (" + this.name() + ": " + value + ")"); + //chr.sendPolice("You will be disconnected for (" + this.name() + ": " + value + ")"); + } + } } diff --git a/src/main/java/client/autoban/AutobanManager.java b/src/main/java/client/autoban/AutobanManager.java index 1a3b782b20..56e092f92b 100644 --- a/src/main/java/client/autoban/AutobanManager.java +++ b/src/main/java/client/autoban/AutobanManager.java @@ -14,19 +14,18 @@ import java.util.HashMap; import java.util.Map; /** - * * @author kevintjuh93 */ public class AutobanManager { - private Character chr; - private Map points = new HashMap<>(); - private Map lastTime = new HashMap<>(); + private final Character chr; + private final Map points = new HashMap<>(); + private final Map lastTime = new HashMap<>(); private int misses = 0; private int lastmisses = 0; private int samemisscount = 0; - private long[] spam = new long[20]; - private int[] timestamp = new int[20]; - private byte[] timestampcounter = new byte[20]; + private final long[] spam = new long[20]; + private final int[] timestamp = new int[20]; + private final byte[] timestampcounter = new byte[20]; public AutobanManager(Character chr) { @@ -34,23 +33,25 @@ public class AutobanManager { } public void addPoint(AutobanFactory fac, String reason) { - if (YamlConfig.config.server.USE_AUTOBAN) { - if (chr.isGM() || chr.isBanned()){ - return; + if (YamlConfig.config.server.USE_AUTOBAN) { + if (chr.isGM() || chr.isBanned()) { + return; } - + if (lastTime.containsKey(fac)) { if (lastTime.get(fac) < (Server.getInstance().getCurrentTime() - fac.getExpire())) { points.put(fac, points.get(fac) / 2); //So the points are not completely gone. } } - if (fac.getExpire() != -1) + if (fac.getExpire() != -1) { lastTime.put(fac, Server.getInstance().getCurrentTime()); + } if (points.containsKey(fac)) { points.put(fac, points.get(fac) + 1); - } else + } else { points.put(fac, 1); + } if (points.get(fac) >= fac.getMaximum()) { chr.autoban(reason); @@ -70,20 +71,21 @@ public class AutobanManager { if (lastmisses == misses && misses > 6) { samemisscount++; } - if (samemisscount > 4) - chr.sendPolice("You will be disconnected for miss godmode."); - //chr.autoban("Autobanned for : " + misses + " Miss godmode", 1); - else if (samemisscount > 0) - - this.lastmisses = misses; + if (samemisscount > 4) { + chr.sendPolice("You will be disconnected for miss godmode."); + } + //chr.autoban("Autobanned for : " + misses + " Miss godmode", 1); + else if (samemisscount > 0) { + this.lastmisses = misses; + } this.misses = 0; } - + //Don't use the same type for more than 1 thing public void spam(int type) { this.spam[type] = Server.getInstance().getCurrentTime(); } - + public void spam(int type, int timestamp) { this.spam[type] = timestamp; } @@ -95,7 +97,7 @@ public class AutobanManager { /** * Timestamp checker * - * type:
+ * type:
* 1: Pet Food
* 2: InventoryMerge
* 3: InventorySort
@@ -110,13 +112,13 @@ public class AutobanManager { * @return Timestamp checker */ public void setTimestamp(int type, int time, int times) { - if (this.timestamp[type] == time) { + if (this.timestamp[type] == time) { this.timestampcounter[type]++; if (this.timestampcounter[type] >= times) { if (YamlConfig.config.server.USE_AUTOBAN) { chr.getClient().disconnect(false, false); } - + FilePrinter.print(FilePrinter.EXPLOITS, "Player " + chr + " was caught spamming TYPE " + type + " and has been disconnected."); } } else { diff --git a/src/main/java/client/command/Command.java b/src/main/java/client/command/Command.java index 79966530c6..6fd6080be9 100644 --- a/src/main/java/client/command/Command.java +++ b/src/main/java/client/command/Command.java @@ -39,7 +39,7 @@ public abstract class Command { protected void setDescription(String description) { this.description = description; } - + public int getRank() { return rank; } diff --git a/src/main/java/client/command/CommandsExecutor.java b/src/main/java/client/command/CommandsExecutor.java index d80b48aac5..b34f0c6c72 100644 --- a/src/main/java/client/command/CommandsExecutor.java +++ b/src/main/java/client/command/CommandsExecutor.java @@ -38,29 +38,29 @@ import java.text.SimpleDateFormat; import java.util.*; public class CommandsExecutor { - + public static CommandsExecutor instance = new CommandsExecutor(); - + public static CommandsExecutor getInstance() { return instance; } - + private static final char USER_HEADING = '@'; private static final char GM_HEADING = '!'; - - public static boolean isCommand(Client client, String content){ + + public static boolean isCommand(Client client, String content) { char heading = content.charAt(0); - if (client.getPlayer().isGM()){ + if (client.getPlayer().isGM()) { return heading == USER_HEADING || heading == GM_HEADING; } return heading == USER_HEADING; } - private HashMap registeredCommands = new HashMap<>(); + private final HashMap registeredCommands = new HashMap<>(); private Pair, List> levelCommandsCursor; - private List, List>> commandsNameDesc = new ArrayList<>(); + private final List, List>> commandsNameDesc = new ArrayList<>(); - private CommandsExecutor(){ + private CommandsExecutor() { registerLv0Commands(); registerLv1Commands(); registerLv2Commands(); @@ -73,8 +73,8 @@ public class CommandsExecutor { public List, List>> getGmCommands() { return commandsNameDesc; } - - public void handle(Client client, String message){ + + public void handle(Client client, String message) { if (client.tryacquireClient()) { try { handleInternal(client, message); @@ -85,8 +85,8 @@ public class CommandsExecutor { client.getPlayer().dropMessage(5, "Try again in a while... Latest commands are currently being processed."); } } - - private void handleInternal(Client client, String message){ + + private void handleInternal(Client client, String message) { if (client.getPlayer().getMapId() == 300000012) { client.getPlayer().yellowMessage("You do not have permission to use commands while in jail."); return; @@ -96,17 +96,17 @@ public class CommandsExecutor { 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){ + 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()){ + if (client.getPlayer().gmLevel() < command.getRank()) { client.getPlayer().yellowMessage("You do not have permission to use this command."); return; } @@ -116,12 +116,12 @@ public class CommandsExecutor { } else { params = new String[]{}; } - + command.execute(client, params); writeLog(client, message); } - private void writeLog(Client client, String command){ + private void writeLog(Client client, String command) { SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy HH:mm"); FilePrinter.print(FilePrinter.USED_COMMANDS, client.getPlayer().getName() + " used: " + command + " on " + sdf.format(Calendar.getInstance().getTime())); @@ -131,41 +131,42 @@ public class CommandsExecutor { try { levelCommandsCursor.getRight().add(commandClass.newInstance().getDescription()); levelCommandsCursor.getLeft().add(name); - } catch(Exception e) { + } catch (Exception e) { e.printStackTrace(); } } - - private void addCommand(String[] syntaxs, Class commandClass){ - for (String syntax : syntaxs){ + + private void addCommand(String[] syntaxs, Class commandClass) { + for (String syntax : syntaxs) { addCommand(syntax, 0, commandClass); } } - private void addCommand(String syntax, Class commandClass){ + + private void addCommand(String syntax, Class commandClass) { //for (String syntax : syntaxs){ - addCommand(syntax, 0, commandClass); + addCommand(syntax, 0, commandClass); //} } - private void addCommand(String[] surtaxes, int rank, Class commandClass){ - for (String syntax : surtaxes){ + 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())){ + private void addCommand(String syntax, int rank, Class commandClass) { + if (registeredCommands.containsKey(syntax.toLowerCase())) { System.out.println("Error on register command with name: " + syntax + ". Already exists."); return; } - + String commandName = syntax.toLowerCase(); addCommandInfo(commandName, commandClass); - + try { Command commandInstance = commandClass.newInstance(); // thanks Halcyon for noticing commands getting reinstanced every call commandInstance.setRank(rank); - + registeredCommands.put(commandName, commandInstance); } catch (InstantiationException e) { e.printStackTrace(); @@ -174,9 +175,9 @@ public class CommandsExecutor { } } - private void registerLv0Commands(){ + 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); @@ -186,7 +187,7 @@ public class CommandsExecutor { addCommand("gacha", GachaCommand.class); addCommand("dispose", DisposeCommand.class); addCommand("changel", ChangeLanguageCommand.class); - addCommand("equiplv", EquipLvCommand.class); + addCommand("equiplv", EquipLvCommand.class); addCommand("showrates", ShowRatesCommand.class); addCommand("rates", RatesCommand.class); addCommand("online", OnlineCommand.class); @@ -205,26 +206,26 @@ public class CommandsExecutor { 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(){ + 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); @@ -261,13 +262,13 @@ public class CommandsExecutor { addCommand("id", 2, IdCommand.class); addCommand("gachalist", GachaListCommand.class); addCommand("loot", LootCommand.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); @@ -331,9 +332,9 @@ public class CommandsExecutor { commandsNameDesc.add(levelCommandsCursor); } - private void registerLv4Commands(){ + 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); @@ -358,26 +359,26 @@ public class CommandsExecutor { addCommand("pnpcremove", 4, PnpcRemoveCommand.class); addCommand("pmob", 4, PmobCommand.class); addCommand("pmobremove", 4, PmobRemoveCommand.class); - + commandsNameDesc.add(levelCommandsCursor); } - private void registerLv5Commands(){ + 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(){ + 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); @@ -394,7 +395,7 @@ public class CommandsExecutor { addCommand("addworld", 6, ServerAddWorldCommand.class); addCommand("removechannel", 6, ServerRemoveChannelCommand.class); addCommand("removeworld", 6, ServerRemoveWorldCommand.class); - + commandsNameDesc.add(levelCommandsCursor); } diff --git a/src/main/java/client/command/commands/gm0/BuyBackCommand.java b/src/main/java/client/command/commands/gm0/BuyBackCommand.java index 0fc257f5fb..00d0a94521 100644 --- a/src/main/java/client/command/commands/gm0/BuyBackCommand.java +++ b/src/main/java/client/command/commands/gm0/BuyBackCommand.java @@ -31,14 +31,14 @@ public class BuyBackCommand extends Command { { setDescription("Revive yourself after a death."); } - + @Override public void execute(Client c, String[] params) { if (params.length < 1) { c.getPlayer().yellowMessage("Syntax: @buyback "); return; } - + if (params[0].contentEquals("now")) { BuybackProcessor.processBuyback(c); } else { diff --git a/src/main/java/client/command/commands/gm0/DisposeCommand.java b/src/main/java/client/command/commands/gm0/DisposeCommand.java index 091d434dfc..c5f3543deb 100644 --- a/src/main/java/client/command/commands/gm0/DisposeCommand.java +++ b/src/main/java/client/command/commands/gm0/DisposeCommand.java @@ -33,7 +33,7 @@ public class DisposeCommand extends Command { { setDescription("Dispose to fix NPC chat."); } - + @Override public void execute(Client c, String[] params) { NPCScriptManager.getInstance().dispose(c); diff --git a/src/main/java/client/command/commands/gm0/DropLimitCommand.java b/src/main/java/client/command/commands/gm0/DropLimitCommand.java index 8bcdf92d02..5792d47bdb 100644 --- a/src/main/java/client/command/commands/gm0/DropLimitCommand.java +++ b/src/main/java/client/command/commands/gm0/DropLimitCommand.java @@ -31,11 +31,11 @@ public class DropLimitCommand extends Command { { setDescription("Check drop limit of current map."); } - + @Override public void execute(Client c, String[] params) { int dropCount = c.getPlayer().getMap().getDroppedItemCount(); - if(((float) dropCount) / YamlConfig.config.server.ITEM_LIMIT_ON_MAP < 0.75f) { + if (((float) dropCount) / YamlConfig.config.server.ITEM_LIMIT_ON_MAP < 0.75f) { c.getPlayer().showHint("Current drop count: #b" + dropCount + "#k / #e" + YamlConfig.config.server.ITEM_LIMIT_ON_MAP + "#n", 300); } else { c.getPlayer().showHint("Current drop count: #r" + dropCount + "#k / #e" + YamlConfig.config.server.ITEM_LIMIT_ON_MAP + "#n", 300); diff --git a/src/main/java/client/command/commands/gm0/GachaCommand.java b/src/main/java/client/command/commands/gm0/GachaCommand.java index 95856616dc..e41fa91ec3 100644 --- a/src/main/java/client/command/commands/gm0/GachaCommand.java +++ b/src/main/java/client/command/commands/gm0/GachaCommand.java @@ -38,29 +38,29 @@ public class GachaCommand extends Command { Gachapon.GachaponType gacha = null; String search = c.getPlayer().getLastCommandMessage(); String gachaName = ""; - String [] names = {"Henesys", "Ellinia", "Perion", "Kerning City", "Sleepywood", "Mushroom Shrine", "Showa Spa Male", "Showa Spa Female", "New Leaf City", "Nautilus Harbor"}; - int [] ids = {9100100, 9100101, 9100102, 9100103, 9100104, 9100105, 9100106, 9100107, 9100109, 9100117}; - for (int i = 0; i < names.length; i++){ - if (search.equalsIgnoreCase(names[i])){ + String[] names = {"Henesys", "Ellinia", "Perion", "Kerning City", "Sleepywood", "Mushroom Shrine", "Showa Spa Male", "Showa Spa Female", "New Leaf City", "Nautilus Harbor"}; + int[] ids = {9100100, 9100101, 9100102, 9100103, 9100104, 9100105, 9100106, 9100107, 9100109, 9100117}; + for (int i = 0; i < names.length; i++) { + if (search.equalsIgnoreCase(names[i])) { gachaName = names[i]; gacha = Gachapon.GachaponType.getByNpcId(ids[i]); } } - if (gacha == null){ + if (gacha == null) { c.getPlayer().yellowMessage("Please use @gacha where name corresponds to one of the below:"); - for (String name : names){ + 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)){ + 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(9010000, talkStr); } } diff --git a/src/main/java/client/command/commands/gm0/JoinEventCommand.java b/src/main/java/client/command/commands/gm0/JoinEventCommand.java index 0a9b50b348..81ce7a2071 100644 --- a/src/main/java/client/command/commands/gm0/JoinEventCommand.java +++ b/src/main/java/client/command/commands/gm0/JoinEventCommand.java @@ -37,15 +37,16 @@ public class JoinEventCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - if(!FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) { + if (!FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) { Event event = c.getChannelServer().getEvent(); - if(event != null) { - if(event.getMapId() != player.getMapId()) { - if(event.getLimit() > 0) { + if (event != null) { + if (event.getMapId() != player.getMapId()) { + if (event.getLimit() > 0) { player.saveLocation("EVENT"); - if(event.getMapId() == 109080000 || event.getMapId() == 109060001) + if (event.getMapId() == 109080000 || event.getMapId() == 109060001) { player.setTeam(event.getLimit() % 2); + } event.minusLimit(); diff --git a/src/main/java/client/command/commands/gm0/LeaveEventCommand.java b/src/main/java/client/command/commands/gm0/LeaveEventCommand.java index d1457efa33..496b3917b2 100644 --- a/src/main/java/client/command/commands/gm0/LeaveEventCommand.java +++ b/src/main/java/client/command/commands/gm0/LeaveEventCommand.java @@ -36,19 +36,19 @@ public class LeaveEventCommand extends Command { public void execute(Client c, String[] params) { Character player = c.getPlayer(); int returnMap = player.getSavedLocation("EVENT"); - if(returnMap != -1) { - if(player.getOla() != null) { + if (returnMap != -1) { + if (player.getOla() != null) { player.getOla().resetTimes(); player.setOla(null); } - if(player.getFitness() != null) { + if (player.getFitness() != null) { player.getFitness().resetTimes(); player.setFitness(null); } player.saveLocationOnWarp(); player.changeMap(returnMap); - if(c.getChannelServer().getEvent() != null) { + if (c.getChannelServer().getEvent() != null) { c.getChannelServer().getEvent().addLimit(); } } else { diff --git a/src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java b/src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java index 960f0c82dd..8ff939a21a 100644 --- a/src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java +++ b/src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java @@ -39,7 +39,7 @@ public class MapOwnerClaimCommand extends Command { if (c.tryacquireClient()) { try { Character chr = c.getPlayer(); - + if (YamlConfig.config.server.USE_MAP_OWNERSHIP_SYSTEM) { if (chr.getEventInstance() == null) { MapleMap map = chr.getMap(); diff --git a/src/main/java/client/command/commands/gm0/RanksCommand.java b/src/main/java/client/command/commands/gm0/RanksCommand.java index 55a66364ce..af5d1854a8 100644 --- a/src/main/java/client/command/commands/gm0/RanksCommand.java +++ b/src/main/java/client/command/commands/gm0/RanksCommand.java @@ -40,7 +40,7 @@ public class RanksCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - + List> worldRanking = Server.getInstance().getWorldPlayerRanking(player.getWorld()); player.sendPacket(GuildPackets.showPlayerRanks(9010000, worldRanking)); } diff --git a/src/main/java/client/command/commands/gm0/RatesCommand.java b/src/main/java/client/command/commands/gm0/RatesCommand.java index 00f14cddfa..95181d6dcf 100644 --- a/src/main/java/client/command/commands/gm0/RatesCommand.java +++ b/src/main/java/client/command/commands/gm0/RatesCommand.java @@ -36,14 +36,16 @@ public class RatesCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - + // travel rates not applicable since it's intrinsically a server/environment rate rather than a character rate String showMsg_ = "#eCHARACTER RATES#n" + "\r\n\r\n"; showMsg_ += "EXP Rate: #e#b" + player.getExpRate() + "x#k#n" + (player.hasNoviceExpRate() ? " - novice rate" : "") + "\r\n"; showMsg_ += "MESO Rate: #e#b" + player.getMesoRate() + "x#k#n" + "\r\n"; showMsg_ += "DROP Rate: #e#b" + player.getDropRate() + "x#k#n" + "\r\n"; showMsg_ += "BOSS DROP Rate: #e#b" + player.getBossDropRate() + "x#k#n" + "\r\n"; - if(YamlConfig.config.server.USE_QUEST_RATE) showMsg_ += "QUEST Rate: #e#b" + c.getWorldServer().getQuestRate() + "x#k#n" + "\r\n"; + if (YamlConfig.config.server.USE_QUEST_RATE) { + showMsg_ += "QUEST Rate: #e#b" + c.getWorldServer().getQuestRate() + "x#k#n" + "\r\n"; + } player.showHint(showMsg_, 300); } diff --git a/src/main/java/client/command/commands/gm0/ShowRatesCommand.java b/src/main/java/client/command/commands/gm0/ShowRatesCommand.java index 6dd5c93b78..3a14f49e0f 100644 --- a/src/main/java/client/command/commands/gm0/ShowRatesCommand.java +++ b/src/main/java/client/command/commands/gm0/ShowRatesCommand.java @@ -39,32 +39,40 @@ public class ShowRatesCommand extends Command { String showMsg = "#eEXP RATE#n" + "\r\n"; showMsg += "World EXP Rate: #k" + c.getWorldServer().getExpRate() + "x#k" + "\r\n"; showMsg += "Player EXP Rate: #k" + player.getRawExpRate() + "x#k" + "\r\n"; - if(player.getCouponExpRate() != 1) showMsg += "Coupon EXP Rate: #k" + player.getCouponExpRate() + "x#k" + "\r\n"; + if (player.getCouponExpRate() != 1) { + showMsg += "Coupon EXP Rate: #k" + player.getCouponExpRate() + "x#k" + "\r\n"; + } showMsg += "EXP Rate: #e#b" + player.getExpRate() + "x#k#n" + (player.hasNoviceExpRate() ? " - novice rate" : "") + "\r\n"; showMsg += "\r\n" + "#eMESO RATE#n" + "\r\n"; showMsg += "World MESO Rate: #k" + c.getWorldServer().getMesoRate() + "x#k" + "\r\n"; showMsg += "Player MESO Rate: #k" + player.getRawMesoRate() + "x#k" + "\r\n"; - if(player.getCouponMesoRate() != 1) showMsg += "Coupon MESO Rate: #k" + player.getCouponMesoRate() + "x#k" + "\r\n"; + if (player.getCouponMesoRate() != 1) { + showMsg += "Coupon MESO Rate: #k" + player.getCouponMesoRate() + "x#k" + "\r\n"; + } showMsg += "MESO Rate: #e#b" + player.getMesoRate() + "x#k#n" + "\r\n"; showMsg += "\r\n" + "#eDROP RATE#n" + "\r\n"; showMsg += "World DROP Rate: #k" + c.getWorldServer().getDropRate() + "x#k" + "\r\n"; showMsg += "Player DROP Rate: #k" + player.getRawDropRate() + "x#k" + "\r\n"; - if(player.getCouponDropRate() != 1) showMsg += "Coupon DROP Rate: #k" + player.getCouponDropRate() + "x#k" + "\r\n"; + if (player.getCouponDropRate() != 1) { + showMsg += "Coupon DROP Rate: #k" + player.getCouponDropRate() + "x#k" + "\r\n"; + } showMsg += "DROP Rate: #e#b" + player.getDropRate() + "x#k#n" + "\r\n"; - + showMsg += "\r\n" + "#eBOSS DROP RATE#n" + "\r\n"; showMsg += "World BOSS DROP Rate: #k" + c.getWorldServer().getBossDropRate() + "x#k" + "\r\n"; showMsg += "Player DROP Rate: #k" + player.getRawDropRate() + "x#k" + "\r\n"; - if(player.getCouponDropRate() != 1) showMsg += "Coupon DROP Rate: #k" + player.getCouponDropRate() + "x#k" + "\r\n"; + if (player.getCouponDropRate() != 1) { + showMsg += "Coupon DROP Rate: #k" + player.getCouponDropRate() + "x#k" + "\r\n"; + } showMsg += "BOSS DROP Rate: #e#b" + player.getBossDropRate() + "x#k#n" + "\r\n"; - if(YamlConfig.config.server.USE_QUEST_RATE) { + if (YamlConfig.config.server.USE_QUEST_RATE) { showMsg += "\r\n" + "#eQUEST RATE#n" + "\r\n"; showMsg += "World QUEST Rate: #e#b" + c.getWorldServer().getQuestRate() + "x#k#n" + "\r\n"; } - + showMsg += "\r\n"; showMsg += "World TRAVEL Rate: #e#b" + c.getWorldServer().getTravelRate() + "x#k#n" + "\r\n"; diff --git a/src/main/java/client/command/commands/gm0/StatStrCommand.java b/src/main/java/client/command/commands/gm0/StatStrCommand.java index 128ce5a825..2c8b7eaf84 100644 --- a/src/main/java/client/command/commands/gm0/StatStrCommand.java +++ b/src/main/java/client/command/commands/gm0/StatStrCommand.java @@ -48,7 +48,7 @@ public class StatStrCommand extends Command { } else { amount = Math.min(remainingAp, YamlConfig.config.server.MAX_AP - player.getStr()); } - + if (!player.assignStr(Math.max(amount, 0))) { player.dropMessage("Please make sure your AP is not over " + YamlConfig.config.server.MAX_AP + " and you have enough to distribute."); } diff --git a/src/main/java/client/command/commands/gm0/TimeCommand.java b/src/main/java/client/command/commands/gm0/TimeCommand.java index 69990f5c80..22a3502ee9 100644 --- a/src/main/java/client/command/commands/gm0/TimeCommand.java +++ b/src/main/java/client/command/commands/gm0/TimeCommand.java @@ -35,7 +35,7 @@ public class TimeCommand extends Command { { setDescription("Show current server time."); } - + @Override public void execute(Client client, String[] params) { DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss"); diff --git a/src/main/java/client/command/commands/gm0/UptimeCommand.java b/src/main/java/client/command/commands/gm0/UptimeCommand.java index 75fece3174..916d7687ba 100644 --- a/src/main/java/client/command/commands/gm0/UptimeCommand.java +++ b/src/main/java/client/command/commands/gm0/UptimeCommand.java @@ -35,10 +35,10 @@ public class UptimeCommand extends Command { @Override public void execute(Client c, String[] params) { long milliseconds = System.currentTimeMillis() - Server.uptime; - int seconds = (int) (milliseconds / 1000) % 60 ; - int minutes = (int) ((milliseconds / (1000*60)) % 60); - int hours = (int) ((milliseconds / (1000*60*60)) % 24); - int days = (int) ((milliseconds / (1000*60*60*24))); + int seconds = (int) (milliseconds / 1000) % 60; + int minutes = (int) ((milliseconds / (1000 * 60)) % 60); + int hours = (int) ((milliseconds / (1000 * 60 * 60)) % 24); + int days = (int) ((milliseconds / (1000 * 60 * 60 * 24))); c.getPlayer().yellowMessage("Server has been online for " + days + " days " + hours + " hours " + minutes + " minutes and " + seconds + " seconds."); } } diff --git a/src/main/java/client/command/commands/gm1/BossHpCommand.java b/src/main/java/client/command/commands/gm1/BossHpCommand.java index 930528d2a8..4156cfd25c 100644 --- a/src/main/java/client/command/commands/gm1/BossHpCommand.java +++ b/src/main/java/client/command/commands/gm1/BossHpCommand.java @@ -36,11 +36,11 @@ public class BossHpCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - for(Monster monster : player.getMap().getAllMonsters()) { - if(monster != null && monster.isBoss() && monster.getHp() > 0) { + for (Monster monster : player.getMap().getAllMonsters()) { + if (monster != null && monster.isBoss() && monster.getHp() > 0) { long percent = monster.getHp() * 100L / monster.getMaxHp(); String bar = "["; - for (int i = 0; i < 100; i++){ + for (int i = 0; i < 100; i++) { bar += i < percent ? "|" : "."; } bar += "]"; diff --git a/src/main/java/client/command/commands/gm1/GotoCommand.java b/src/main/java/client/command/commands/gm1/GotoCommand.java index 83d0725b78..c47f83d080 100644 --- a/src/main/java/client/command/commands/gm1/GotoCommand.java +++ b/src/main/java/client/command/commands/gm1/GotoCommand.java @@ -36,16 +36,16 @@ import java.util.Map; import java.util.Map.Entry; public class GotoCommand extends Command { - + { setDescription("Warp to a predefined map."); - + List> 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"); } @@ -57,16 +57,16 @@ public class GotoCommand extends Command { } } 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())); } @@ -74,16 +74,16 @@ public class GotoCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - if (params.length < 1){ + 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(9000020, sendStr); return; } - + if (!player.isAlive()) { player.dropMessage(1, "This command cannot be used when you're dead."); return; @@ -103,10 +103,10 @@ public class GotoCommand extends Command { } 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(); @@ -117,7 +117,7 @@ public class GotoCommand extends Command { if (player.isGM()) { sendStr += ("\r\n#rAreas:#k\r\n" + GOTO_AREAS_INFO); } - + player.getAbstractPlayerInteraction().npcTalk(9000020, sendStr); } } diff --git a/src/main/java/client/command/commands/gm1/MobHpCommand.java b/src/main/java/client/command/commands/gm1/MobHpCommand.java index 9db3a19a4b..ee9310eada 100644 --- a/src/main/java/client/command/commands/gm1/MobHpCommand.java +++ b/src/main/java/client/command/commands/gm1/MobHpCommand.java @@ -36,7 +36,7 @@ public class MobHpCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - for(Monster monster : player.getMap().getAllMonsters()) { + for (Monster monster : player.getMap().getAllMonsters()) { if (monster != null && monster.getHp() > 0) { player.yellowMessage(monster.getName() + " (" + monster.getId() + ") has " + monster.getHp() + " / " + monster.getMaxHp() + " HP."); diff --git a/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java b/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java index 1f00375b58..f05ffb30ef 100644 --- a/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java +++ b/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java @@ -50,20 +50,20 @@ public class WhatDropsFromCommand extends Command { int limit = 3; Iterator> listIterator = MonsterInformationProvider.getMobsIDsFromName(monsterName).iterator(); for (int i = 0; i < limit; i++) { - if(listIterator.hasNext()) { + 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)){ + for (MonsterDropEntry drop : MonsterInformationProvider.getInstance().retrieveDrop(mobId)) { try { String name = ItemInformationProvider.getInstance().getName(drop.itemId); - if (name == null || name.equals("null") || drop.chance == 0){ + 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){ + } catch (Exception ex) { ex.printStackTrace(); continue; } @@ -71,7 +71,7 @@ public class WhatDropsFromCommand extends Command { output += "\r\n"; } } - + c.getAbstractPlayerInteraction().npcTalk(9010000, output); } } diff --git a/src/main/java/client/command/commands/gm2/ApCommand.java b/src/main/java/client/command/commands/gm2/ApCommand.java index ca08e7f24c..83068f8f01 100644 --- a/src/main/java/client/command/commands/gm2/ApCommand.java +++ b/src/main/java/client/command/commands/gm2/ApCommand.java @@ -43,16 +43,22 @@ public class ApCommand extends Command { 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; + 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; + if (newAp < 0) { + newAp = 0; + } else if (newAp > YamlConfig.config.server.MAX_AP) { + newAp = YamlConfig.config.server.MAX_AP; + } victim.changeRemainingAp(newAp, false); } else { diff --git a/src/main/java/client/command/commands/gm2/BuffCommand.java b/src/main/java/client/command/commands/gm2/BuffCommand.java index ed18d151c1..a6033bb43c 100644 --- a/src/main/java/client/command/commands/gm2/BuffCommand.java +++ b/src/main/java/client/command/commands/gm2/BuffCommand.java @@ -44,6 +44,8 @@ public class BuffCommand extends Command { int skillid = Integer.parseInt(params[0]); Skill skill = SkillFactory.getSkill(skillid); - if (skill != null) skill.getEffect(skill.getMaxLevel()).applyTo(player); + if (skill != null) { + skill.getEffect(skill.getMaxLevel()).applyTo(player); + } } } diff --git a/src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java b/src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java index 2fd76f829b..0a5a87bdcc 100644 --- a/src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java +++ b/src/main/java/client/command/commands/gm2/ClearSavedLocationsCommand.java @@ -36,7 +36,7 @@ public class ClearSavedLocationsCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(), victim; - + if (params.length > 0) { victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); if (victim == null) { @@ -46,11 +46,11 @@ public class ClearSavedLocationsCommand extends Command { } else { victim = c.getPlayer(); } - + for (SavedLocationType type : SavedLocationType.values()) { victim.clearSavedLocation(type); } - + player.message("Cleared " + params[0] + "'s saved locations."); } } diff --git a/src/main/java/client/command/commands/gm2/ClearSlotCommand.java b/src/main/java/client/command/commands/gm2/ClearSlotCommand.java index e53ef46090..63f3135073 100644 --- a/src/main/java/client/command/commands/gm2/ClearSlotCommand.java +++ b/src/main/java/client/command/commands/gm2/ClearSlotCommand.java @@ -47,32 +47,37 @@ public class ClearSlotCommand extends Command { case "all": for (int i = 0; i < 101; i++) { Item tempItem = c.getPlayer().getInventory(InventoryType.EQUIP).getItem((byte) i); - if (tempItem == null) + 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) + 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) + 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) + 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) + if (tempItem == null) { continue; + } InventoryManipulator.removeFromSlot(c, InventoryType.CASH, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("All Slots Cleared."); @@ -80,8 +85,9 @@ public class ClearSlotCommand extends Command { case "equip": for (int i = 0; i < 101; i++) { Item tempItem = c.getPlayer().getInventory(InventoryType.EQUIP).getItem((byte) i); - if (tempItem == null) + if (tempItem == null) { continue; + } InventoryManipulator.removeFromSlot(c, InventoryType.EQUIP, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("Equipment Slot Cleared."); @@ -89,8 +95,9 @@ public class ClearSlotCommand extends Command { case "use": for (int i = 0; i < 101; i++) { Item tempItem = c.getPlayer().getInventory(InventoryType.USE).getItem((byte) i); - if (tempItem == null) + if (tempItem == null) { continue; + } InventoryManipulator.removeFromSlot(c, InventoryType.USE, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("Use Slot Cleared."); @@ -98,8 +105,9 @@ public class ClearSlotCommand extends Command { case "setup": for (int i = 0; i < 101; i++) { Item tempItem = c.getPlayer().getInventory(InventoryType.SETUP).getItem((byte) i); - if (tempItem == null) + if (tempItem == null) { continue; + } InventoryManipulator.removeFromSlot(c, InventoryType.SETUP, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("Set-Up Slot Cleared."); @@ -107,8 +115,9 @@ public class ClearSlotCommand extends Command { case "etc": for (int i = 0; i < 101; i++) { Item tempItem = c.getPlayer().getInventory(InventoryType.ETC).getItem((byte) i); - if (tempItem == null) + if (tempItem == null) { continue; + } InventoryManipulator.removeFromSlot(c, InventoryType.ETC, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("ETC Slot Cleared."); @@ -116,8 +125,9 @@ public class ClearSlotCommand extends Command { case "cash": for (int i = 0; i < 101; i++) { Item tempItem = c.getPlayer().getInventory(InventoryType.CASH).getItem((byte) i); - if (tempItem == null) + if (tempItem == null) { continue; + } InventoryManipulator.removeFromSlot(c, InventoryType.CASH, (byte) i, tempItem.getQuantity(), false, false); } player.yellowMessage("Cash Slot Cleared."); diff --git a/src/main/java/client/command/commands/gm2/GachaListCommand.java b/src/main/java/client/command/commands/gm2/GachaListCommand.java index 4c7b416857..805f550e53 100644 --- a/src/main/java/client/command/commands/gm2/GachaListCommand.java +++ b/src/main/java/client/command/commands/gm2/GachaListCommand.java @@ -23,7 +23,6 @@ import client.Client; import client.command.Command; /** - * * @author Ronan */ public class GachaListCommand extends Command { diff --git a/src/main/java/client/command/commands/gm2/IdCommand.java b/src/main/java/client/command/commands/gm2/IdCommand.java index 4896357499..ad0c25ad8c 100644 --- a/src/main/java/client/command/commands/gm2/IdCommand.java +++ b/src/main/java/client/command/commands/gm2/IdCommand.java @@ -47,7 +47,7 @@ public class IdCommand extends Command { if (resultList.size() > 0) { int count = 0; - for (Map.Entry entry: resultList.entrySet()) { + for (Map.Entry entry : resultList.entrySet()) { sb.append(String.format("Id for %s is: #b%s#k", entry.getKey(), entry.getValue()) + "\r\n"); if (++count > 100) { break; @@ -65,7 +65,7 @@ public class IdCommand extends Command { player.yellowMessage("Error reading file, please contact your administrator."); } }; - + ThreadManager.getInstance().newTask(queryRunnable); } @@ -85,16 +85,20 @@ public class IdCommand extends Command { } private String joinStringArr(String[] arr, String separator) { - if (null == arr || 0 == arr.length) return ""; + if (null == arr || 0 == arr.length) { + return ""; + } StringBuilder sb = new StringBuilder(256); sb.append(arr[0]); - for (int i = 1; i < arr.length; i++) sb.append(separator).append(arr[i]); + for (int i = 1; i < arr.length; i++) { + sb.append(separator).append(arr[i]); + } return sb.toString(); } private Map fetchResults(Map queryMap, String queryItem) { Map results = new HashMap<>(); - for (String item: queryMap.keySet()) { + for (String item : queryMap.keySet()) { if (item.indexOf(queryItem) != -1) { results.put(item, queryMap.get(item)); } diff --git a/src/main/java/client/command/commands/gm2/ItemCommand.java b/src/main/java/client/command/commands/gm2/ItemCommand.java index f1e696f76d..f709a46bd0 100644 --- a/src/main/java/client/command/commands/gm2/ItemCommand.java +++ b/src/main/java/client/command/commands/gm2/ItemCommand.java @@ -40,7 +40,7 @@ public class ItemCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - + if (params.length < 1) { player.yellowMessage("Syntax: !item "); return; @@ -49,13 +49,15 @@ public class ItemCommand extends Command { int itemId = Integer.parseInt(params[0]); ItemInformationProvider ii = ItemInformationProvider.getInstance(); - if(ii.getName(itemId) == null) { + 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 (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."); @@ -63,26 +65,26 @@ public class ItemCommand extends Command { } 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 * 24 * 60 * 60 * 1000); - int petid = Pet.createPet(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 * 24 * 60 * 60 * 1000); + int petid = Pet.createPet(itemId); - InventoryManipulator.addById(c, itemId, quantity, player.getName(), petid, expiration); - return; - } else { - player.yellowMessage("Pet Syntax: !item "); - return; - } + 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; + 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 index c276f6477c..6611d148bb 100644 --- a/src/main/java/client/command/commands/gm2/ItemDropCommand.java +++ b/src/main/java/client/command/commands/gm2/ItemDropCommand.java @@ -41,7 +41,7 @@ public class ItemDropCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - + if (params.length < 1) { player.yellowMessage("Syntax: !drop "); return; @@ -50,13 +50,15 @@ public class ItemDropCommand extends Command { int itemId = Integer.parseInt(params[0]); ItemInformationProvider ii = ItemInformationProvider.getInstance(); - if(ii.getName(itemId) == null) { + 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 (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."); @@ -64,7 +66,7 @@ public class ItemDropCommand extends Command { } if (ItemConstants.isPet(itemId)) { - if (params.length >= 2){ // thanks to istreety & TacoBell + if (params.length >= 2) { // thanks to istreety & TacoBell quantity = 1; long days = Math.max(1, Integer.parseInt(params[1])); long expiration = System.currentTimeMillis() + (days * 24 * 60 * 60 * 1000); @@ -74,12 +76,12 @@ public class ItemDropCommand extends Command { toDrop.setExpiration(expiration); toDrop.setOwner(""); - if(player.gmLevel() < 3) { + 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"); } @@ -89,10 +91,10 @@ public class ItemDropCommand extends Command { return; } else { player.yellowMessage("Pet Syntax: !drop "); - return; + return; } } - + Item toDrop; if (ItemConstants.getInventoryType(itemId) == InventoryType.EQUIP) { toDrop = ii.getEquipById(itemId); @@ -101,7 +103,7 @@ public class ItemDropCommand extends Command { } toDrop.setOwner(player.getName()); - if(player.gmLevel() < 3) { + if (player.gmLevel() < 3) { short f = toDrop.getFlag(); f |= ItemConstants.ACCOUNT_SHARING; f |= ItemConstants.UNTRADEABLE; diff --git a/src/main/java/client/command/commands/gm2/LevelCommand.java b/src/main/java/client/command/commands/gm2/LevelCommand.java index 65e4051f96..b0846be4eb 100644 --- a/src/main/java/client/command/commands/gm2/LevelCommand.java +++ b/src/main/java/client/command/commands/gm2/LevelCommand.java @@ -45,7 +45,9 @@ public class LevelCommand extends Command { player.setLevel(Math.min(Integer.parseInt(params[0]), player.getMaxClassLevel()) - 1); player.resetPlayerRates(); - if (YamlConfig.config.server.USE_ADD_RATES_BY_LEVEL) player.setPlayerRates(); + 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/MaxSkillCommand.java b/src/main/java/client/command/commands/gm2/MaxSkillCommand.java index 99ac7d4bdf..a91cd89097 100644 --- a/src/main/java/client/command/commands/gm2/MaxSkillCommand.java +++ b/src/main/java/client/command/commands/gm2/MaxSkillCommand.java @@ -45,7 +45,8 @@ public class MaxSkillCommand extends Command { } catch (NumberFormatException nfe) { nfe.printStackTrace(); break; - } catch (NullPointerException npe) { } + } catch (NullPointerException npe) { + } } if (player.getJob().isA(Job.ARAN1) || player.getJob().isA(Job.LEGEND)) { diff --git a/src/main/java/client/command/commands/gm2/MaxStatCommand.java b/src/main/java/client/command/commands/gm2/MaxStatCommand.java index 66dfa410e9..f3e7dd1c8b 100644 --- a/src/main/java/client/command/commands/gm2/MaxStatCommand.java +++ b/src/main/java/client/command/commands/gm2/MaxStatCommand.java @@ -40,7 +40,9 @@ public class MaxStatCommand extends Command { player.loseExp(player.getExp(), false, false); player.setLevel(255); player.resetPlayerRates(); - if (YamlConfig.config.server.USE_ADD_RATES_BY_LEVEL) player.setPlayerRates(); + if (YamlConfig.config.server.USE_ADD_RATES_BY_LEVEL) { + player.setPlayerRates(); + } player.setWorldRates(); player.updateStrDexIntLuk(Short.MAX_VALUE); player.setFame(13337); diff --git a/src/main/java/client/command/commands/gm2/RechargeCommand.java b/src/main/java/client/command/commands/gm2/RechargeCommand.java index 1597bc714f..3aaa23bb0e 100644 --- a/src/main/java/client/command/commands/gm2/RechargeCommand.java +++ b/src/main/java/client/command/commands/gm2/RechargeCommand.java @@ -41,16 +41,16 @@ public class RechargeCommand extends Command { Character player = c.getPlayer(); ItemInformationProvider ii = ItemInformationProvider.getInstance(); for (Item torecharge : c.getPlayer().getInventory(InventoryType.USE).list()) { - if (ItemConstants.isThrowingStar(torecharge.getItemId())){ + if (ItemConstants.isThrowingStar(torecharge.getItemId())) { torecharge.setQuantity(ii.getSlotMax(c, torecharge.getItemId())); c.getPlayer().forceUpdateItem(torecharge); - } else if (ItemConstants.isArrow(torecharge.getItemId())){ + } else if (ItemConstants.isArrow(torecharge.getItemId())) { torecharge.setQuantity(ii.getSlotMax(c, torecharge.getItemId())); c.getPlayer().forceUpdateItem(torecharge); - } else if (ItemConstants.isBullet(torecharge.getItemId())){ + } else if (ItemConstants.isBullet(torecharge.getItemId())) { torecharge.setQuantity(ii.getSlotMax(c, torecharge.getItemId())); c.getPlayer().forceUpdateItem(torecharge); - } else if (ItemConstants.isConsumable(torecharge.getItemId())){ + } else if (ItemConstants.isConsumable(torecharge.getItemId())) { torecharge.setQuantity(ii.getSlotMax(c, torecharge.getItemId())); c.getPlayer().forceUpdateItem(torecharge); } diff --git a/src/main/java/client/command/commands/gm2/SearchCommand.java b/src/main/java/client/command/commands/gm2/SearchCommand.java index 42044d4357..395edda007 100644 --- a/src/main/java/client/command/commands/gm2/SearchCommand.java +++ b/src/main/java/client/command/commands/gm2/SearchCommand.java @@ -40,10 +40,10 @@ public class SearchCommand extends Command { private static Data mobStringData; private static Data skillStringData; private static Data mapStringData; - + { setDescription("Search String.wz."); - + DataProvider dataProvider = DataProviderFactory.getDataProvider(WZFiles.STRING); npcStringData = dataProvider.getData("Npc.img"); mobStringData = dataProvider.getData("Mob.img"); @@ -60,12 +60,12 @@ public class SearchCommand extends Command { } StringBuilder sb = new StringBuilder(); - String search = joinStringFrom(params,1); + 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")) { @@ -83,7 +83,7 @@ public class SearchCommand extends Command { } if (data != null) { String name; - + if (searchType == 0) { for (Data searchData : data.getChildren()) { name = DataTool.getString(searchData.getChildByPath("name"), "NO-NAME"); @@ -93,12 +93,12 @@ public class SearchCommand extends Command { } } 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"); } @@ -107,7 +107,7 @@ public class SearchCommand extends Command { } 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(" - "); diff --git a/src/main/java/client/command/commands/gm2/SetSlotCommand.java b/src/main/java/client/command/commands/gm2/SetSlotCommand.java index b27c2b031d..fd8124e2de 100644 --- a/src/main/java/client/command/commands/gm2/SetSlotCommand.java +++ b/src/main/java/client/command/commands/gm2/SetSlotCommand.java @@ -39,17 +39,17 @@ public class SetSlotCommand extends Command { player.yellowMessage("Syntax: !setslot "); 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 index d78f4d7ace..7eae82c123 100644 --- a/src/main/java/client/command/commands/gm2/SetStatCommand.java +++ b/src/main/java/client/command/commands/gm2/SetStatCommand.java @@ -43,10 +43,14 @@ public class SetStatCommand extends Command { 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 + 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) {} + } 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 index 44f62967e6..f905c21a7a 100644 --- a/src/main/java/client/command/commands/gm2/SpCommand.java +++ b/src/main/java/client/command/commands/gm2/SpCommand.java @@ -43,16 +43,22 @@ public class SpCommand extends Command { 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; + 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; + if (newSp < 0) { + newSp = 0; + } else if (newSp > YamlConfig.config.server.MAX_AP) { + newSp = YamlConfig.config.server.MAX_AP; + } victim.updateRemainingSp(newSp); diff --git a/src/main/java/client/command/commands/gm2/SummonCommand.java b/src/main/java/client/command/commands/gm2/SummonCommand.java index 261cfa7b4e..b159a176e1 100644 --- a/src/main/java/client/command/commands/gm2/SummonCommand.java +++ b/src/main/java/client/command/commands/gm2/SummonCommand.java @@ -46,7 +46,7 @@ public class SummonCommand extends Command { 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) { @@ -59,19 +59,22 @@ public class SummonCommand extends Command { 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; + if (victim.isLoggedinWorld()) { + break; + } Thread.sleep(1777); } - } catch (InterruptedException e) {} - + } catch (InterruptedException e) { + } + MapleMap map = player.getMap(); victim.saveLocationOnWarp(); victim.forceChangeMap(map, map.findClosestPortal(player.getPosition())); diff --git a/src/main/java/client/command/commands/gm2/WarpAreaCommand.java b/src/main/java/client/command/commands/gm2/WarpAreaCommand.java index 391737af17..8d3d986e5f 100644 --- a/src/main/java/client/command/commands/gm2/WarpAreaCommand.java +++ b/src/main/java/client/command/commands/gm2/WarpAreaCommand.java @@ -54,7 +54,7 @@ public class WarpAreaCommand extends Command { Point pos = player.getPosition(); Collection characters = player.getMap().getAllPlayers(); - + for (Character victim : characters) { if (victim.getPosition().distanceSq(pos) <= 50000) { victim.saveLocationOnWarp(); diff --git a/src/main/java/client/command/commands/gm2/WarpCommand.java b/src/main/java/client/command/commands/gm2/WarpCommand.java index 423da33013..4f191a5196 100644 --- a/src/main/java/client/command/commands/gm2/WarpCommand.java +++ b/src/main/java/client/command/commands/gm2/WarpCommand.java @@ -49,19 +49,19 @@ public class WarpCommand extends Command { 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()); diff --git a/src/main/java/client/command/commands/gm2/WarpMapCommand.java b/src/main/java/client/command/commands/gm2/WarpMapCommand.java index 33a19d6af0..3e7c5ab5e1 100644 --- a/src/main/java/client/command/commands/gm2/WarpMapCommand.java +++ b/src/main/java/client/command/commands/gm2/WarpMapCommand.java @@ -51,7 +51,7 @@ public class WarpMapCommand extends Command { } Collection characters = player.getMap().getAllPlayers(); - + for (Character victim : characters) { victim.saveLocationOnWarp(); victim.changeMap(target, target.getRandomPlayerSpawnpoint()); diff --git a/src/main/java/client/command/commands/gm2/WhereaMiCommand.java b/src/main/java/client/command/commands/gm2/WhereaMiCommand.java index e80e70933d..d1c69ea7ac 100644 --- a/src/main/java/client/command/commands/gm2/WhereaMiCommand.java +++ b/src/main/java/client/command/commands/gm2/WhereaMiCommand.java @@ -41,12 +41,12 @@ public class WhereaMiCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - + HashSet 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 npc = (NPC) mmo; @@ -64,28 +64,28 @@ public class WhereaMiCommand extends Command { 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) { diff --git a/src/main/java/client/command/commands/gm3/CheckDmgCommand.java b/src/main/java/client/command/commands/gm3/CheckDmgCommand.java index 9ec879ce1b..82ffe11cd0 100644 --- a/src/main/java/client/command/commands/gm3/CheckDmgCommand.java +++ b/src/main/java/client/command/commands/gm3/CheckDmgCommand.java @@ -42,8 +42,12 @@ public class CheckDmgCommand extends Command { Integer watkBuff = victim.getBuffedValue(BuffStat.WATK); Integer matkBuff = victim.getBuffedValue(BuffStat.MATK); int blessing = victim.getSkillLevel(10000000 * player.getJobType() + 12); - if (watkBuff == null) watkBuff = 0; - if (matkBuff == null) matkBuff = 0; + if (watkBuff == null) { + watkBuff = 0; + } + if (matkBuff == null) { + matkBuff = 0; + } player.dropMessage(5, "Cur Str: " + victim.getTotalStr() + " Cur Dex: " + victim.getTotalDex() + " Cur Int: " + victim.getTotalInt() + " Cur Luk: " + victim.getTotalLuk()); player.dropMessage(5, "Cur WATK: " + victim.getTotalWatk() + " Cur MATK: " + victim.getTotalMagic()); diff --git a/src/main/java/client/command/commands/gm3/FlyCommand.java b/src/main/java/client/command/commands/gm3/FlyCommand.java index 788fe43512..21d92bc258 100644 --- a/src/main/java/client/command/commands/gm3/FlyCommand.java +++ b/src/main/java/client/command/commands/gm3/FlyCommand.java @@ -46,12 +46,16 @@ public class FlyCommand extends Command { 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."; + 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."; + if (srv.canFly(accid)) { + sendStr += " Re-login to take effect."; + } srv.changeFly(c.getAccID(), false); } diff --git a/src/main/java/client/command/commands/gm3/GiveMesosCommand.java b/src/main/java/client/command/commands/gm3/GiveMesosCommand.java index 1b5a4f8c0d..f625c0ed78 100644 --- a/src/main/java/client/command/commands/gm3/GiveMesosCommand.java +++ b/src/main/java/client/command/commands/gm3/GiveMesosCommand.java @@ -42,7 +42,7 @@ public class GiveMesosCommand extends Command { String recv_, value_; long mesos_ = 0; - + if (params.length == 2) { recv_ = params[0]; value_ = params[1]; @@ -50,7 +50,7 @@ public class GiveMesosCommand extends Command { recv_ = c.getPlayer().getName(); value_ = params[0]; } - + try { mesos_ = Long.parseLong(value_); if (mesos_ > Integer.MAX_VALUE) { @@ -65,7 +65,7 @@ public class GiveMesosCommand extends Command { mesos_ = Integer.MIN_VALUE; } } - + Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recv_); if (victim != null) { victim.gainMeso((int) mesos_, true); diff --git a/src/main/java/client/command/commands/gm3/GiveNxCommand.java b/src/main/java/client/command/commands/gm3/GiveNxCommand.java index c68ac18e94..783d35d699 100644 --- a/src/main/java/client/command/commands/gm3/GiveNxCommand.java +++ b/src/main/java/client/command/commands/gm3/GiveNxCommand.java @@ -55,7 +55,7 @@ public class GiveNxCommand extends Command { type = 1; } typeStr = params[0]; - + if (params.length > 2) { recv = params[1]; value = Integer.parseInt(params[2]); diff --git a/src/main/java/client/command/commands/gm3/GiveRpCommand.java b/src/main/java/client/command/commands/gm3/GiveRpCommand.java index da5cb5d65d..84d8155e67 100644 --- a/src/main/java/client/command/commands/gm3/GiveRpCommand.java +++ b/src/main/java/client/command/commands/gm3/GiveRpCommand.java @@ -21,7 +21,7 @@ public class GiveRpCommand extends Command { if (victim != null) { victim.setRewardPoints(victim.getRewardPoints() + Integer.parseInt(params[1])); player.message("RP given. Player " + params[0] + " now has " + victim.getRewardPoints() - + " reward points." ); + + " reward points."); } else { player.message("Player '" + params[0] + "' could not be found."); } diff --git a/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java b/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java index 6f31badb81..ed940562fd 100644 --- a/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java +++ b/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java @@ -36,7 +36,7 @@ public class MaxHpMpCommand extends Command { public void execute(Client c, String[] params) { Character player = c.getPlayer(); Character victim = player; - + int statUpdate = 1; if (params.length >= 2) { victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); @@ -46,7 +46,7 @@ public class MaxHpMpCommand extends Command { } else { player.yellowMessage("Syntax: !maxhpmp [] "); } - + if (victim != null) { int extraHp = victim.getCurrentMaxHp() - victim.getClientMaxHp(); int extraMp = victim.getCurrentMaxMp() - victim.getClientMaxMp(); diff --git a/src/main/java/client/command/commands/gm3/MusicCommand.java b/src/main/java/client/command/commands/gm3/MusicCommand.java index 1f3f4f4557..c41f14f237 100644 --- a/src/main/java/client/command/commands/gm3/MusicCommand.java +++ b/src/main/java/client/command/commands/gm3/MusicCommand.java @@ -39,24 +39,24 @@ public class MusicCommand extends Command { for (String s : GameConstants.GAME_SONGS) { songList += (" " + s + "\r\n"); } - + return songList; } - + @Override public void execute(Client c, String[] params) { - + Character player = c.getPlayer(); if (params.length < 1) { String sendMsg = ""; - + sendMsg += "Syntax: #r!music #k\r\n\r\n"; sendMsg += getSongList(); - + c.sendPacket(PacketCreator.getNPCTalk(1052015, (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 @@ -65,11 +65,11 @@ public class MusicCommand extends Command { return; } } - + String sendMsg = ""; sendMsg += "Song not found, please enter a song below.\r\n\r\n"; sendMsg += getSongList(); - + c.sendPacket(PacketCreator.getNPCTalk(1052015, (byte) 0, sendMsg, "00 00", (byte) 0)); } } diff --git a/src/main/java/client/command/commands/gm3/QuestCompleteCommand.java b/src/main/java/client/command/commands/gm3/QuestCompleteCommand.java index 85403e4e7e..98bdeb5f7b 100644 --- a/src/main/java/client/command/commands/gm3/QuestCompleteCommand.java +++ b/src/main/java/client/command/commands/gm3/QuestCompleteCommand.java @@ -36,8 +36,8 @@ public class QuestCompleteCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - - if (params.length < 1){ + + if (params.length < 1) { player.yellowMessage("Syntax: !completequest "); return; } @@ -51,7 +51,7 @@ public class QuestCompleteCommand extends Command { } 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 index 7cd3cc8c41..cfb35da64a 100644 --- a/src/main/java/client/command/commands/gm3/QuestResetCommand.java +++ b/src/main/java/client/command/commands/gm3/QuestResetCommand.java @@ -36,8 +36,8 @@ public class QuestResetCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - - if (params.length < 1){ + + if (params.length < 1) { player.yellowMessage("Syntax: !resetquest "); return; } diff --git a/src/main/java/client/command/commands/gm3/QuestStartCommand.java b/src/main/java/client/command/commands/gm3/QuestStartCommand.java index 5e11e27622..3eeee90331 100644 --- a/src/main/java/client/command/commands/gm3/QuestStartCommand.java +++ b/src/main/java/client/command/commands/gm3/QuestStartCommand.java @@ -36,8 +36,8 @@ public class QuestStartCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - - if (params.length < 1){ + + if (params.length < 1) { player.yellowMessage("Syntax: !startquest "); return; } @@ -51,7 +51,7 @@ public class QuestStartCommand extends Command { } 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/ReloadMapCommand.java b/src/main/java/client/command/commands/gm3/ReloadMapCommand.java index 99ea41e5db..1708697456 100644 --- a/src/main/java/client/command/commands/gm3/ReloadMapCommand.java +++ b/src/main/java/client/command/commands/gm3/ReloadMapCommand.java @@ -42,12 +42,13 @@ public class ReloadMapCommand extends Command { int callerid = c.getPlayer().getId(); Collection characters = player.getMap().getAllPlayers(); - + for (Character chr : characters) { chr.saveLocationOnWarp(); chr.changeMap(newMap); - if (chr.getId() != callerid) + 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/StartEventCommand.java b/src/main/java/client/command/commands/gm3/StartEventCommand.java index aaadb2f5a8..c5072bdc92 100644 --- a/src/main/java/client/command/commands/gm3/StartEventCommand.java +++ b/src/main/java/client/command/commands/gm3/StartEventCommand.java @@ -39,8 +39,9 @@ public class StartEventCommand extends Command { public void execute(Client c, String[] params) { Character player = c.getPlayer(); int players = 50; - if (params.length > 1) + if (params.length > 1) { players = Integer.parseInt(params[0]); + } c.getChannelServer().setEvent(new Event(player.getMapId(), players)); Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.earnTitleMessage( "[Event] An event has started on " diff --git a/src/main/java/client/command/commands/gm4/BossDropRateCommand.java b/src/main/java/client/command/commands/gm4/BossDropRateCommand.java index 4cfddda6be..0bf9a54927 100644 --- a/src/main/java/client/command/commands/gm4/BossDropRateCommand.java +++ b/src/main/java/client/command/commands/gm4/BossDropRateCommand.java @@ -25,7 +25,6 @@ import client.command.Command; import tools.PacketCreator; /** - * * @author Ronan */ public class BossDropRateCommand extends Command { diff --git a/src/main/java/client/command/commands/gm4/ForceVacCommand.java b/src/main/java/client/command/commands/gm4/ForceVacCommand.java index 170c856b46..3a949e734b 100644 --- a/src/main/java/client/command/commands/gm4/ForceVacCommand.java +++ b/src/main/java/client/command/commands/gm4/ForceVacCommand.java @@ -50,7 +50,9 @@ public class ForceVacCommand extends Command { mapItem.lockItem(); try { - if (mapItem.isPickedUp()) continue; + if (mapItem.isPickedUp()) { + continue; + } if (mapItem.getMeso() > 0) { player.gainMeso(mapItem.getMeso(), true); diff --git a/src/main/java/client/command/commands/gm4/PapCommand.java b/src/main/java/client/command/commands/gm4/PapCommand.java index e89a01b1d1..5616014933 100644 --- a/src/main/java/client/command/commands/gm4/PapCommand.java +++ b/src/main/java/client/command/commands/gm4/PapCommand.java @@ -36,7 +36,7 @@ public class PapCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - + // thanks Conrad for noticing mobid typo here player.getMap().spawnMonsterOnGroundBelow(LifeFactory.getMonster(8500001), player.getPosition()); } diff --git a/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java b/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java index bf41fee68a..a062496d15 100644 --- a/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java +++ b/src/main/java/client/command/commands/gm4/PnpcRemoveCommand.java @@ -47,14 +47,14 @@ public class PnpcRemoveCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - + int mapId = player.getMapId(); int npcId = params.length > 0 ? Integer.parseInt(params[0]) : -1; - + Point pos = player.getPosition(); int xpos = pos.x; int ypos = pos.y; - + List>> toRemove = new LinkedList<>(); try (Connection con = DatabaseConnection.getConnection()) { final PreparedStatement ps; @@ -76,7 +76,7 @@ public class PnpcRemoveCommand extends Command { ps.setInt(6, ypos - 50); ps.setInt(7, ypos + 50); } - + try (ResultSet rs = ps.executeQuery()) { while (true) { rs.beforeFirst(); @@ -94,9 +94,9 @@ public class PnpcRemoveCommand extends Command { e.printStackTrace(); player.dropMessage(5, "Failed to remove pNPC from the database."); } - + if (!toRemove.isEmpty()) { - for (Channel ch: player.getWorldServer().getChannels()) { + for (Channel ch : player.getWorldServer().getChannels()) { MapleMap map = ch.getMapFactory().getMap(mapId); for (Pair> r : toRemove) { @@ -104,7 +104,7 @@ public class PnpcRemoveCommand extends Command { } } } - + 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 index e9808bafca..7ecab53fad 100644 --- a/src/main/java/client/command/commands/gm4/ProItemCommand.java +++ b/src/main/java/client/command/commands/gm4/ProItemCommand.java @@ -45,18 +45,18 @@ public class ProItemCommand extends Command { player.yellowMessage("Syntax: !proitem []"); return; } - + ItemInformationProvider ii = ItemInformationProvider.getInstance(); int itemid = Integer.parseInt(params[0]); - - if(ii.getName(itemid) == null) { + + 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); @@ -68,6 +68,7 @@ public class ProItemCommand extends Command { 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); diff --git a/src/main/java/client/command/commands/gm4/SetEqStatCommand.java b/src/main/java/client/command/commands/gm4/SetEqStatCommand.java index b4b1832871..115654b4b6 100644 --- a/src/main/java/client/command/commands/gm4/SetEqStatCommand.java +++ b/src/main/java/client/command/commands/gm4/SetEqStatCommand.java @@ -47,11 +47,13 @@ public class SetEqStatCommand extends Command { 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; + if (eq == null) { + continue; + } eq.setWdef(newStat); eq.setAcc(newStat); diff --git a/src/main/java/client/command/commands/gm5/DebugCommand.java b/src/main/java/client/command/commands/gm5/DebugCommand.java index 3d9da3d52a..5e736c3bc9 100644 --- a/src/main/java/client/command/commands/gm5/DebugCommand.java +++ b/src/main/java/client/command/commands/gm5/DebugCommand.java @@ -41,7 +41,7 @@ import java.util.List; public class DebugCommand extends Command { private final static String[] debugTypes = {"monster", "packet", "portal", "spawnpoint", "pos", "map", "mobsp", "event", "areas", "reactors", "servercoupons", "playercoupons", "timer", "marriage", "buff", ""}; - + { setDescription("Show a debug message."); } @@ -59,13 +59,13 @@ public class DebugCommand extends Command { case "type": case "help": String msgTypes = "Available #bdebug types#k:\r\n\r\n"; - for(int i = 0; i < debugTypes.length; i++) { + for (int i = 0; i < debugTypes.length; i++) { msgTypes += ("#L" + i + "#" + debugTypes[i] + "#l\r\n"); } - + c.getAbstractPlayerInteraction().npcTalk(9201143, msgTypes); break; - + case "monster": List monsters = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapObjectType.MONSTER)); for (MapObject monstermo : monsters) { @@ -81,16 +81,20 @@ public class DebugCommand extends Command { case "portal": Portal portal = player.getMap().findClosestPortal(player.getPosition()); - if (portal != null) + 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."); + } else { + player.dropMessage(6, "There is no portal on this map."); + } break; case "spawnpoint": SpawnPoint sp = player.getMap().findClosestSpawnpoint(player.getPosition()); - if (sp != null) + 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."); + } else { + player.dropMessage(6, "There is no mob spawn point on this map."); + } break; case "pos": @@ -106,8 +110,11 @@ public class DebugCommand extends Command { 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() + "."); + 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": @@ -156,7 +163,7 @@ public class DebugCommand extends Command { 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 index 3d3a8bfd00..3661c8f31b 100644 --- a/src/main/java/client/command/commands/gm5/IpListCommand.java +++ b/src/main/java/client/command/commands/gm5/IpListCommand.java @@ -29,7 +29,6 @@ import net.server.world.World; import java.util.Collection; /** - * * @author Mist * @author Blood (Tochi) * @author Ronan @@ -42,20 +41,20 @@ public class IpListCommand extends Command { @Override public void execute(Client c, String[] params) { String str = "Player-IP relation:"; - + for (World w : Server.getInstance().getWorlds()) { Collection 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/ShowSessionsCommand.java b/src/main/java/client/command/commands/gm5/ShowSessionsCommand.java index 6116f99d21..acc4d78e51 100644 --- a/src/main/java/client/command/commands/gm5/ShowSessionsCommand.java +++ b/src/main/java/client/command/commands/gm5/ShowSessionsCommand.java @@ -24,7 +24,6 @@ import client.command.Command; import net.server.coordinator.session.SessionCoordinator; /** - * * @author Ronan */ public class ShowSessionsCommand extends Command { diff --git a/src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java b/src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java index 0f58fedea1..4f438c6b53 100644 --- a/src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java +++ b/src/main/java/client/command/commands/gm6/ServerAddChannelCommand.java @@ -37,7 +37,7 @@ public class ServerAddChannelCommand extends Command { @Override public void execute(Client c, String[] params) { final Character player = c.getPlayer(); - + if (params.length < 1) { player.dropMessage(5, "Syntax: @addchannel "); return; @@ -47,15 +47,15 @@ public class ServerAddChannelCommand extends Command { ThreadManager.getInstance().newTask(() -> { int chid = Server.getInstance().addChannel(worldid); - if(player.isLoggedinWorld()) { - if(chid >= 0) { + if (player.isLoggedinWorld()) { + if (chid >= 0) { player.dropMessage(5, "NEW Channel " + chid + " successfully deployed on world " + worldid + "."); } else { - if(chid == -3) { + if (chid == -3) { player.dropMessage(5, "Invalid worldid detected. Channel creation aborted."); - } else if(chid == -2) { + } else if (chid == -2) { player.dropMessage(5, "Reached channel limit on worldid " + worldid + ". Channel creation aborted."); - } else if(chid == -1) { + } 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 index a177cedb48..ae611f904d 100644 --- a/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java +++ b/src/main/java/client/command/commands/gm6/ServerAddWorldCommand.java @@ -37,15 +37,15 @@ public class ServerAddWorldCommand extends Command { @Override public void execute(Client c, String[] params) { final Character player = c.getPlayer(); - + ThreadManager.getInstance().newTask(() -> { int wid = Server.getInstance().addWorld(); - if(player.isLoggedinWorld()) { - if(wid >= 0) { + if (player.isLoggedinWorld()) { + if (wid >= 0) { player.dropMessage(5, "NEW World " + wid + " successfully deployed."); } else { - if(wid == -2) { + if (wid == -2) { player.dropMessage(5, "Error detected when loading the 'world.ini' file. World creation aborted."); } else { player.dropMessage(5, "NEW World failed to be deployed. Check if needed ports are already in use or maximum world count has been reached."); diff --git a/src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java b/src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java index 16958a5e29..e005140327 100644 --- a/src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java +++ b/src/main/java/client/command/commands/gm6/ServerRemoveChannelCommand.java @@ -37,7 +37,7 @@ public class ServerRemoveChannelCommand extends Command { @Override public void execute(Client c, String[] params) { final Character player = c.getPlayer(); - + if (params.length < 1) { player.dropMessage(5, "Syntax: @removechannel "); return; @@ -45,12 +45,12 @@ public class ServerRemoveChannelCommand extends Command { final int worldId = Integer.parseInt(params[0]); ThreadManager.getInstance().newTask(() -> { - if(Server.getInstance().removeChannel(worldId)) { - if(player.isLoggedinWorld()) { + 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()) { + 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 index f9df512306..522d891c63 100644 --- a/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java +++ b/src/main/java/client/command/commands/gm6/ServerRemoveWorldCommand.java @@ -37,21 +37,21 @@ public class ServerRemoveWorldCommand extends Command { @Override public void execute(Client c, String[] params) { final Character player = c.getPlayer(); - + final int rwid = Server.getInstance().getWorldsSize() - 1; - if(rwid <= 0) { + if (rwid <= 0) { player.dropMessage(5, "Unable to remove world 0."); return; } ThreadManager.getInstance().newTask(() -> { - if(Server.getInstance().removeWorld()) { - if(player.isLoggedinWorld()) { + if (Server.getInstance().removeWorld()) { + if (player.isLoggedinWorld()) { player.dropMessage(5, "Successfully removed a world. Current world count: " + Server.getInstance().getWorldsSize() + "."); } } else { - if(player.isLoggedinWorld()) { - if(rwid < 0) { + if (player.isLoggedinWorld()) { + if (rwid < 0) { player.dropMessage(5, "No registered worlds to remove."); } else { player.dropMessage(5, "Failed to remove world " + rwid + ". Check if there are people currently playing there."); diff --git a/src/main/java/client/command/commands/gm6/ShutdownCommand.java b/src/main/java/client/command/commands/gm6/ShutdownCommand.java index 948ebe0994..dcff626956 100644 --- a/src/main/java/client/command/commands/gm6/ShutdownCommand.java +++ b/src/main/java/client/command/commands/gm6/ShutdownCommand.java @@ -38,13 +38,13 @@ public class ShutdownCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - if (params.length < 1){ + if (params.length < 1) { player.yellowMessage("Syntax: !shutdown [