Reformat and clean up "net" package

src/main/java/net/PacketProcessor.java

@@ -60,11 +60,8 @@ public final class PacketProcessor {
             return null;
         }
         PacketHandler handler = handlers[packetId];
-        if (handler != null) {
         return handler;
     }
-        return null;
-    }
 
     public void registerHandler(RecvOpcode code, PacketHandler handler) {
         try {

src/main/java/net/opcodes/RecvOpcode.java

@@ -206,7 +206,7 @@ public enum RecvOpcode {
 
     private int code = -2;
 
-    private RecvOpcode(int code) {
+    RecvOpcode(int code) {
         this.code = code;
     }
 

src/main/java/net/opcodes/SendOpcode.java

@@ -356,7 +356,7 @@ public enum SendOpcode {
     VEGA_SCROLL(0x166);
     private int code = -2;
 
-    private SendOpcode(int code) {
+    SendOpcode(int code) {
         this.code = code;
     }
 

src/main/java/net/server/PlayerBuffStorage.java

@@ -33,15 +33,14 @@ import java.util.Map;
 import java.util.concurrent.locks.Lock;
 
 /**
- *
  * @author Danny//changed to map :3
  * @author Ronan//debuffs to storage as well
  */
 public class PlayerBuffStorage {
-    private int id = (int) (Math.random() * 100);
+    private final int id = (int) (Math.random() * 100);
     private final Lock lock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.BUFF_STORAGE, true);
-    private Map<Integer, List<PlayerBuffValueHolder>> buffs = new HashMap<>();
-    private Map<Integer, Map<Disease, Pair<Long, MobSkill>>> diseases = new HashMap<>();
+    private final Map<Integer, List<PlayerBuffValueHolder>> buffs = new HashMap<>();
+    private final Map<Integer, Map<Disease, Pair<Long, MobSkill>>> diseases = new HashMap<>();
 
     public void addBuffsToStorage(int chrid, List<PlayerBuffValueHolder> toStore) {
         lock.lock();
@@ -99,9 +98,6 @@ public class PlayerBuffStorage {
             return false;
         }
         final PlayerBuffStorage other = (PlayerBuffStorage) obj;
-        if (id != other.id) {
-            return false;
-        }
-        return true;
+        return id == other.id;
     }
 }

src/main/java/net/server/PlayerBuffValueHolder.java

@@ -24,7 +24,6 @@ package net.server;
 import server.StatEffect;
 
 /**
- *
  * @author Danny
  */
 public class PlayerBuffValueHolder {

src/main/java/net/server/PlayerCoolDownValueHolder.java

@@ -22,7 +22,6 @@
 package net.server;
 
 /**
- *
  * @author Danny
  */
 public class PlayerCoolDownValueHolder {

src/main/java/net/server/PlayerStorage.java

@@ -36,8 +36,8 @@ public class PlayerStorage {
     private final MonitoredReentrantReadWriteLock locks = new MonitoredReentrantReadWriteLock(MonitoredLockType.PLAYER_STORAGE, true);
     private final Map<Integer, Character> storage = new LinkedHashMap<>();
     private final Map<String, Character> nameStorage = new LinkedHashMap<>();
-    private MonitoredReadLock rlock = MonitoredReadLockFactory.createLock(locks);
-    private MonitoredWriteLock wlock = MonitoredWriteLockFactory.createLock(locks);
+    private final MonitoredReadLock rlock = MonitoredReadLockFactory.createLock(locks);
+    private final MonitoredWriteLock wlock = MonitoredWriteLockFactory.createLock(locks);
 
     public void addPlayer(Character chr) {
         wlock.lock();
@@ -53,7 +53,9 @@ public class PlayerStorage {
         wlock.lock();
         try {
             Character mc = storage.remove(chr);
-            if(mc != null) nameStorage.remove(mc.getName().toLowerCase());
+            if (mc != null) {
+                nameStorage.remove(mc.getName().toLowerCase());
+            }
 
             return mc;
         } finally {
@@ -97,9 +99,9 @@ public class PlayerStorage {
             rlock.unlock();
         }
 
-        for(Character mc : chrList) {
+        for (Character mc : chrList) {
             Client client = mc.getClient();
-            if(client != null) {
+            if (client != null) {
                 client.forceDisconnect();
             }
         }

src/main/java/net/server/Server.java

@@ -96,14 +96,14 @@ public class Server {
     private static final List<Integer> activeCoupons = new LinkedList<>();
 
     private LoginServer loginServer;
-    private List<Map<Integer, String>> channels = new LinkedList<>();
-    private List<World> worlds = new ArrayList<>();
+    private final List<Map<Integer, String>> channels = new LinkedList<>();
+    private final List<World> worlds = new ArrayList<>();
     private final Properties subnetInfo = new Properties();
     private final Map<Integer, Set<Integer>> accountChars = new HashMap<>();
     private final Map<Integer, Short> accountCharacterCount = new HashMap<>();
     private final Map<Integer, Integer> worldChars = new HashMap<>();
     private final Map<String, Integer> transitioningChars = new HashMap<>();
-    private List<Pair<Integer, String>> worldRecommendedList = new LinkedList<>();
+    private final List<Pair<Integer, String>> worldRecommendedList = new LinkedList<>();
     private final Map<Integer, Guild> guilds = new HashMap<>(100);
     private final Map<Client, Long> inLoginState = new HashMap<>(100);
 
@@ -1613,7 +1613,7 @@ public class Server {
                 String reason = Character.checkWorldTransferEligibility(con, characterId, oldWorld, newWorld); //check if character is still eligible
                 if (reason != null) {
                     removedTransfers.add(nameChangeId);
-                    FilePrinter.print(FilePrinter.WORLD_TRANSFER, "World transfer cancelled : Character ID " + characterId + " at " + Calendar.getInstance().getTime().toString() + ", Reason : " + reason);
+                    FilePrinter.print(FilePrinter.WORLD_TRANSFER, "World transfer cancelled : Character ID " + characterId + " at " + Calendar.getInstance().getTime() + ", Reason : " + reason);
                     try (PreparedStatement delPs = con.prepareStatement("DELETE FROM worldtransfers WHERE id = ?")) {
                         delPs.setInt(1, nameChangeId);
                         delPs.executeUpdate();

src/main/java/net/server/audit/LockCollector.java

@@ -20,15 +20,14 @@
 package net.server.audit;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
- *
  * @author Ronan
  */
 public class LockCollector {
@@ -39,7 +38,7 @@ public class LockCollector {
         return instance;
     }
 
-    private Map<Runnable, Integer> disposableLocks = new HashMap<>(200);
+    private final Map<Runnable, Integer> disposableLocks = new HashMap<>(200);
     private final Lock lock = new ReentrantLock(true);
 
     public void registerDisposeAction(Runnable r) {
@@ -56,9 +55,9 @@ public class LockCollector {
 
         lock.lock();
         try {
-            for(Entry<Runnable, Integer> e : disposableLocks.entrySet()) {
+            for (Entry<Runnable, Integer> e : disposableLocks.entrySet()) {
                 Integer eVal = e.getValue();
-                if(eVal > 5) {  // updates each 2min
+                if (eVal > 5) {  // updates each 2min
                     toDispose.add(e.getKey());
                 } else {
                     disposableLocks.put(e.getKey(), ++eVal);
@@ -68,7 +67,7 @@ public class LockCollector {
             lock.unlock();
         }
 
-        for(Runnable r : toDispose) {
+        for (Runnable r : toDispose) {
             r.run();
         }
     }

src/main/java/net/server/audit/ThreadTracker.java

@@ -33,9 +33,8 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
- *
  * @author RonanLana
- * 
+ * <p>
  * This tool has the main purpose of auditing deadlocks throughout the server and must be used only for debugging. The flag is USE_THREAD_TRACKER.
  */
 public class ThreadTracker {
@@ -67,14 +66,14 @@ public class ThreadTracker {
         Map<MonitoredLockType, List<Integer>> lockValues = new HashMap<>();
         Set<Long> executingThreads = new HashSet<>();
 
-        for(Map.Entry<Long, AtomicInteger> lc : lockCount.entrySet()) {
-            if(lc.getValue().get() != 0) {
+        for (Map.Entry<Long, AtomicInteger> lc : lockCount.entrySet()) {
+            if (lc.getValue().get() != 0) {
                 executingThreads.add(lockThreads.get(lc.getKey()));
 
                 MonitoredLockType lockId = lockIds.get(lc.getKey());
                 List<Integer> list = lockValues.get(lockId);
 
-                if(list == null) {
+                if (list == null) {
                     list = new ArrayList<>();
                     lockValues.put(lockId, list);
                 }
@@ -86,18 +85,18 @@ public class ThreadTracker {
 
         String s = "----------------------------\r\n" + dateFormat + "\r\n    ";
         s += "Lock-thread usage count:";
-        for(Map.Entry<MonitoredLockType, List<Integer>> lock : lockValues.entrySet()) {
+        for (Map.Entry<MonitoredLockType, List<Integer>> lock : lockValues.entrySet()) {
             s += ("\r\n  " + lock.getKey().name() + ": ");
 
-            for(Integer i : lock.getValue()) {
+            for (Integer i : lock.getValue()) {
                 s += (i + " ");
             }
         }
         s += "\r\n\r\nThread opened lock path:";
 
-        for(Long tid : executingThreads) {
+        for (Long tid : executingThreads) {
             s += "\r\n";
-            for(MonitoredLockType lockid : threadTracker.get(tid)) {
+            for (MonitoredLockType lockid : threadTracker.get(tid)) {
                 s += (lockid.name() + " ");
             }
             s += "|";
@@ -110,7 +109,7 @@ public class ThreadTracker {
 
     private static String printThreadLog(List<MonitoredLockType> stillLockedPath, String dateFormat) {
         String s = "----------------------------\r\n" + dateFormat + "\r\n    ";
-        for(MonitoredLockType lock : stillLockedPath) {
+        for (MonitoredLockType lock : stillLockedPath) {
             s += (lock.name() + " ");
         }
         s += "\r\n\r\n";
@@ -130,20 +129,20 @@ public class ThreadTracker {
     public void accessThreadTracker(boolean update, boolean lock, MonitoredLockType lockId, long lockOid) {
         ttLock.lock();
         try {
-            if(update) {
-                if(!lock) { // update tracker
+            if (update) {
+                if (!lock) { // update tracker
                     List<Long> toRemove = new ArrayList<>();
 
-                    for(Long l : threadUpdate.keySet()) {
+                    for (Long l : threadUpdate.keySet()) {
                         int next = threadUpdate.get(l) + 1;
-                        if(next == 4) {
+                        if (next == 4) {
                             List<MonitoredLockType> tt = threadTracker.get(l);
 
-                            if(tt.isEmpty()) {
+                            if (tt.isEmpty()) {
                                 toRemove.add(l);
                             } else {
                                 StackTraceElement[] ste = threads.get(l).getStackTrace();
-                                if(ste.length > 0) {
+                                if (ste.length > 0) {
                                     DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss");
                                     dateFormat.setTimeZone(TimeZone.getDefault());
                                     String df = dateFormat.format(new Date());
@@ -157,29 +156,29 @@ public class ThreadTracker {
                         threadUpdate.put(l, next);
                     }
 
-                    for(Long l : toRemove) {
+                    for (Long l : toRemove) {
                         threadTracker.remove(l);
                         threadUpdate.remove(l);
                         threads.remove(l);
 
-                        for(Map<Long, Integer> threadLock : locks.values()) {
+                        for (Map<Long, Integer> threadLock : locks.values()) {
                             threadLock.remove(l);
                         }
                     }
 
                     toRemove.clear();
 
-                    for(Entry<Long, Integer> it : lockUpdate.entrySet()) {
+                    for (Entry<Long, Integer> it : lockUpdate.entrySet()) {
                         int val = it.getValue() + 1;
 
-                        if(val < 60) {
+                        if (val < 60) {
                             lockUpdate.put(it.getKey(), val);
                         } else {
                             toRemove.add(it.getKey());  // free the structure after 60 silent updates
                         }
                     }
 
-                    for(Long l : toRemove) {
+                    for (Long l : toRemove) {
                         lockCount.remove(l);
                         lockIds.remove(l);
                         lockThreads.remove(l);
@@ -195,9 +194,9 @@ public class ThreadTracker {
             } else {
                 long tid = Thread.currentThread().getId();
 
-                if(lock) {
+                if (lock) {
                     AtomicInteger c = lockCount.get(lockOid);
-                    if(c == null) {
+                    if (c == null) {
                         c = new AtomicInteger(0);
                         lockCount.put(lockOid, c);
                         lockIds.put(lockOid, lockId);
@@ -207,30 +206,29 @@ public class ThreadTracker {
                     c.incrementAndGet();
 
                     List<MonitoredLockType> list = threadTracker.get(tid);
-                    if(list == null) {
+                    if (list == null) {
                         list = new ArrayList<>(5);
                         threadTracker.put(tid, list);
                         threadUpdate.put(tid, 0);
                         threads.put(tid, Thread.currentThread());
-                    } else if(list.isEmpty()) {
+                    } else if (list.isEmpty()) {
                         threadUpdate.put(tid, 0);
                     }
                     list.add(lockId);
 
                     Map<Long, Integer> threadLock = locks.get(lockId);
-                    if(threadLock == null) {
+                    if (threadLock == null) {
                         threadLock = new HashMap<>(5);
                         locks.put(lockId, threadLock);
                     }
 
                     Integer lc = threadLock.get(tid);
-                    if(lc != null) {
+                    if (lc != null) {
                         threadLock.put(tid, lc + 1);
                     } else {
                         threadLock.put(tid, 1);
                     }
-                }
-                else {
+                } else {
                     AtomicInteger c = lockCount.get(lockOid);
                     if (c != null) {    // thanks BHB for detecting an NPE here
                         c.decrementAndGet();
@@ -239,8 +237,8 @@ public class ThreadTracker {
                     lockUpdate.put(lockOid, 0);
 
                     List<MonitoredLockType> list = threadTracker.get(tid);
-                    for(int i = list.size() - 1; i >= 0; i--) {
-                        if(lockId.equals(list.get(i))) {
+                    for (int i = list.size() - 1; i >= 0; i--) {
+                        if (lockId.equals(list.get(i))) {
                             list.remove(i);
                             break;
                         }
@@ -258,8 +256,8 @@ public class ThreadTracker {
     private String printLockStatus(MonitoredLockType lockId) {
         String s = "";
 
-        for(Long threadid : locks.get(lockId).keySet()) {
-            for(MonitoredLockType lockid : threadTracker.get(threadid)) {
+        for (Long threadid : locks.get(lockId).keySet()) {
+            for (MonitoredLockType lockid : threadTracker.get(threadid)) {
                 s += ("  " + lockid.name());
             }
 

src/main/java/net/server/audit/locks/MonitoredLockType.java

@@ -20,7 +20,6 @@
 package net.server.audit.locks;
 
 /**
- *
  * @author RonanLana
  */
 

src/main/java/net/server/audit/locks/MonitoredReadLock.java

@@ -20,7 +20,6 @@
 package net.server.audit.locks;
 
 /**
- *
  * @author RonanLana
  */
 public interface MonitoredReadLock {

src/main/java/net/server/audit/locks/MonitoredReentrantLock.java

@@ -20,7 +20,6 @@
 package net.server.audit.locks;
 
 /**
- *
  * @author RonanLana
  */
 public interface MonitoredReentrantLock {

src/main/java/net/server/audit/locks/MonitoredReentrantReadWriteLock.java

@@ -22,7 +22,6 @@ package net.server.audit.locks;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
- *
  * @author RonanLana
  */
 public class MonitoredReentrantReadWriteLock extends ReentrantReadWriteLock {

src/main/java/net/server/audit/locks/MonitoredWriteLock.java

@@ -20,7 +20,6 @@
 package net.server.audit.locks;
 
 /**
- *
  * @author RonanLana
  */
 public interface MonitoredWriteLock {

src/main/java/net/server/audit/locks/active/TrackerReadLock.java

@@ -37,7 +37,6 @@ import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
- *
  * @author RonanLana
  */
 public class TrackerReadLock extends ReentrantReadWriteLock.ReadLock implements MonitoredReadLock {
@@ -56,8 +55,8 @@ public class TrackerReadLock extends ReentrantReadWriteLock.ReadLock implements
 
     @Override
     public void lock() {
-        if(YamlConfig.config.server.USE_THREAD_TRACKER) {
-            if(deadlockedState != null) {
+        if (YamlConfig.config.server.USE_THREAD_TRACKER) {
+            if (deadlockedState != null) {
                 DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss");
                 dateFormat.setTimeZone(TimeZone.getDefault());
 
@@ -74,7 +73,7 @@ public class TrackerReadLock extends ReentrantReadWriteLock.ReadLock implements
 
     @Override
     public void unlock() {
-        if(YamlConfig.config.server.USE_THREAD_TRACKER) {
+        if (YamlConfig.config.server.USE_THREAD_TRACKER) {
             unregisterLocking();
         }
 
@@ -83,9 +82,9 @@ public class TrackerReadLock extends ReentrantReadWriteLock.ReadLock implements
 
     @Override
     public boolean tryLock() {
-        if(super.tryLock()) {
-            if(YamlConfig.config.server.USE_THREAD_TRACKER) {
-                if(deadlockedState != null) {
+        if (super.tryLock()) {
+            if (YamlConfig.config.server.USE_THREAD_TRACKER) {
+                if (deadlockedState != null) {
                     //FilePrinter.printError(FilePrinter.DEADLOCK_ERROR, "Deadlock occurred when trying to use the '" + id.name() + "' lock resources:\r\n" + printStackTrace(deadlockedState));
                     ThreadTracker.getInstance().accessThreadTracker(true, true, id, hashcode);
                     deadlockedState = null;
@@ -104,7 +103,7 @@ public class TrackerReadLock extends ReentrantReadWriteLock.ReadLock implements
         try {
             ThreadTracker.getInstance().accessThreadTracker(false, true, id, hashcode);
 
-            if(reentrantCount.incrementAndGet() == 1) {
+            if (reentrantCount.incrementAndGet() == 1) {
                 final Thread t = Thread.currentThread();
                 timeoutSchedule = TimerManager.getInstance().schedule(() -> issueDeadlock(t), YamlConfig.config.server.LOCK_MONITOR_TIME);
             }
@@ -116,8 +115,8 @@ public class TrackerReadLock extends ReentrantReadWriteLock.ReadLock implements
     private void unregisterLocking() {
         state.lock();
         try {
-            if(reentrantCount.decrementAndGet() == 0) {
-                if(timeoutSchedule != null) {
+            if (reentrantCount.decrementAndGet() == 0) {
+                if (timeoutSchedule != null) {
                     timeoutSchedule.cancel(false);
                     timeoutSchedule = null;
                 }
@@ -147,7 +146,7 @@ public class TrackerReadLock extends ReentrantReadWriteLock.ReadLock implements
     public MonitoredReadLock dispose() {
         state.lock();
         try {
-            if(timeoutSchedule != null) {
+            if (timeoutSchedule != null) {
                 timeoutSchedule.cancel(false);
                 timeoutSchedule = null;
             }

src/main/java/net/server/audit/locks/active/TrackerReentrantLock.java

@@ -35,7 +35,6 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
- *
  * @author RonanLana
  */
 public class TrackerReentrantLock extends ReentrantLock implements MonitoredReentrantLock {
@@ -60,8 +59,8 @@ public class TrackerReentrantLock extends ReentrantLock implements MonitoredReen
 
     @Override
     public void lock() {
-        if(YamlConfig.config.server.USE_THREAD_TRACKER) {
-            if(deadlockedState != null) {
+        if (YamlConfig.config.server.USE_THREAD_TRACKER) {
+            if (deadlockedState != null) {
                 DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss");
                 dateFormat.setTimeZone(TimeZone.getDefault());
 
@@ -78,7 +77,7 @@ public class TrackerReentrantLock extends ReentrantLock implements MonitoredReen
 
     @Override
     public void unlock() {
-        if(YamlConfig.config.server.USE_THREAD_TRACKER) {
+        if (YamlConfig.config.server.USE_THREAD_TRACKER) {
             unregisterLocking();
         }
 
@@ -87,9 +86,9 @@ public class TrackerReentrantLock extends ReentrantLock implements MonitoredReen
 
     @Override
     public boolean tryLock() {
-        if(super.tryLock()) {
-            if(YamlConfig.config.server.USE_THREAD_TRACKER) {
-                if(deadlockedState != null) {
+        if (super.tryLock()) {
+            if (YamlConfig.config.server.USE_THREAD_TRACKER) {
+                if (deadlockedState != null) {
                     //FilePrinter.printError(FilePrinter.DEADLOCK_ERROR, "Deadlock occurred when trying to use the '" + id.name() + "' lock resources:\r\n" + printStackTrace(deadlockedState));
                     ThreadTracker.getInstance().accessThreadTracker(true, true, id, hashcode);
                     deadlockedState = null;
@@ -108,7 +107,7 @@ public class TrackerReentrantLock extends ReentrantLock implements MonitoredReen
         try {
             ThreadTracker.getInstance().accessThreadTracker(false, true, id, hashcode);
 
-            if(reentrantCount.incrementAndGet() == 1) {
+            if (reentrantCount.incrementAndGet() == 1) {
                 final Thread t = Thread.currentThread();
                 timeoutSchedule = TimerManager.getInstance().schedule(() -> issueDeadlock(t), YamlConfig.config.server.LOCK_MONITOR_TIME);
             }
@@ -120,8 +119,8 @@ public class TrackerReentrantLock extends ReentrantLock implements MonitoredReen
     private void unregisterLocking() {
         state.lock();
         try {
-            if(reentrantCount.decrementAndGet() == 0) {
-                if(timeoutSchedule != null) {
+            if (reentrantCount.decrementAndGet() == 0) {
+                if (timeoutSchedule != null) {
                     timeoutSchedule.cancel(false);
                     timeoutSchedule = null;
                 }
@@ -151,7 +150,7 @@ public class TrackerReentrantLock extends ReentrantLock implements MonitoredReen
     public MonitoredReentrantLock dispose() {
         state.lock();
         try {
-            if(timeoutSchedule != null) {
+            if (timeoutSchedule != null) {
                 timeoutSchedule.cancel(false);
                 timeoutSchedule = null;
             }

src/main/java/net/server/audit/locks/active/TrackerWriteLock.java

@@ -37,7 +37,6 @@ import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
- *
  * @author RonanLana
  */
 public class TrackerWriteLock extends ReentrantReadWriteLock.WriteLock implements MonitoredWriteLock {
@@ -56,8 +55,8 @@ public class TrackerWriteLock extends ReentrantReadWriteLock.WriteLock implement
 
     @Override
     public void lock() {
-        if(YamlConfig.config.server.USE_THREAD_TRACKER) {
-            if(deadlockedState != null) {
+        if (YamlConfig.config.server.USE_THREAD_TRACKER) {
+            if (deadlockedState != null) {
                 DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss");
                 dateFormat.setTimeZone(TimeZone.getDefault());
 
@@ -74,7 +73,7 @@ public class TrackerWriteLock extends ReentrantReadWriteLock.WriteLock implement
 
     @Override
     public void unlock() {
-        if(YamlConfig.config.server.USE_THREAD_TRACKER) {
+        if (YamlConfig.config.server.USE_THREAD_TRACKER) {
             unregisterLocking();
         }
 
@@ -83,9 +82,9 @@ public class TrackerWriteLock extends ReentrantReadWriteLock.WriteLock implement
 
     @Override
     public boolean tryLock() {
-        if(super.tryLock()) {
-            if(YamlConfig.config.server.USE_THREAD_TRACKER) {
-                if(deadlockedState != null) {
+        if (super.tryLock()) {
+            if (YamlConfig.config.server.USE_THREAD_TRACKER) {
+                if (deadlockedState != null) {
                     //FilePrinter.printError(FilePrinter.DEADLOCK_ERROR, "Deadlock occurred when trying to use the '" + id.name() + "' lock resources:\r\n" + printStackTrace(deadlockedState));
                     ThreadTracker.getInstance().accessThreadTracker(true, true, id, hashcode);
                     deadlockedState = null;
@@ -104,7 +103,7 @@ public class TrackerWriteLock extends ReentrantReadWriteLock.WriteLock implement
         try {
             ThreadTracker.getInstance().accessThreadTracker(false, true, id, hashcode);
 
-            if(reentrantCount.incrementAndGet() == 1) {
+            if (reentrantCount.incrementAndGet() == 1) {
                 final Thread t = Thread.currentThread();
                 timeoutSchedule = TimerManager.getInstance().schedule(() -> issueDeadlock(t), YamlConfig.config.server.LOCK_MONITOR_TIME);
             }
@@ -116,8 +115,8 @@ public class TrackerWriteLock extends ReentrantReadWriteLock.WriteLock implement
     private void unregisterLocking() {
         state.lock();
         try {
-            if(reentrantCount.decrementAndGet() == 0) {
-                if(timeoutSchedule != null) {
+            if (reentrantCount.decrementAndGet() == 0) {
+                if (timeoutSchedule != null) {
                     timeoutSchedule.cancel(false);
                     timeoutSchedule = null;
                 }
@@ -147,7 +146,7 @@ public class TrackerWriteLock extends ReentrantReadWriteLock.WriteLock implement
     public MonitoredWriteLock dispose() {
         state.lock();
         try {
-            if(timeoutSchedule != null) {
+            if (timeoutSchedule != null) {
                 timeoutSchedule.cancel(false);
                 timeoutSchedule = null;
             }

src/main/java/net/server/audit/locks/empty/EmptyReadLock.java

@@ -24,7 +24,6 @@ import net.server.audit.locks.MonitoredReadLock;
 import tools.FilePrinter;
 
 /**
- *
  * @author RonanLana
  */
 public class EmptyReadLock extends AbstractEmptyLock implements MonitoredReadLock {

src/main/java/net/server/audit/locks/empty/EmptyReentrantLock.java

@@ -24,7 +24,6 @@ import net.server.audit.locks.MonitoredReentrantLock;
 import tools.FilePrinter;
 
 /**
- *
  * @author RonanLana
  */
 public class EmptyReentrantLock extends AbstractEmptyLock implements MonitoredReentrantLock {

src/main/java/net/server/audit/locks/empty/EmptyWriteLock.java

@@ -24,7 +24,6 @@ import net.server.audit.locks.MonitoredWriteLock;
 import tools.FilePrinter;
 
 /**
- *
  * @author RonanLana
  */
 public class EmptyWriteLock extends AbstractEmptyLock implements MonitoredWriteLock {

src/main/java/net/server/audit/locks/factory/MonitoredReadLockFactory.java

@@ -23,7 +23,6 @@ import net.server.audit.locks.MonitoredReentrantReadWriteLock;
 import net.server.audit.locks.active.TrackerReadLock;
 
 /**
- *
  * @author RonanLana
  */
 public class MonitoredReadLockFactory {

src/main/java/net/server/audit/locks/factory/MonitoredReentrantLockFactory.java

@@ -23,7 +23,6 @@ import net.server.audit.locks.MonitoredLockType;
 import net.server.audit.locks.active.TrackerReentrantLock;
 
 /**
- *
  * @author RonanLana
  */
 public class MonitoredReentrantLockFactory {

src/main/java/net/server/audit/locks/factory/MonitoredWriteLockFactory.java

@@ -23,7 +23,6 @@ import net.server.audit.locks.MonitoredReentrantReadWriteLock;
 import net.server.audit.locks.active.TrackerWriteLock;
 
 /**
- *
  * @author RonanLana
  */
 public class MonitoredWriteLockFactory {

src/main/java/net/server/channel/Channel.java

@@ -70,25 +70,25 @@ public final class Channel {
     private MapManager mapManager;
     private EventScriptManager eventSM;
     private ServicesManager services;
-    private Map<Integer, HiredMerchant> hiredMerchants = new HashMap<>();
+    private final Map<Integer, HiredMerchant> hiredMerchants = new HashMap<>();
     private final Map<Integer, Integer> storedVars = new HashMap<>();
-    private Set<Integer> playersAway = new HashSet<>();
-    private Map<ExpeditionType, Expedition> expeditions = new HashMap<>();
-    private Map<Integer, MiniDungeon> dungeons = new HashMap<>();
-    private List<ExpeditionType> expedType = new ArrayList<>();
-    private Set<MapleMap> ownedMaps = Collections.synchronizedSet(Collections.newSetFromMap(new WeakHashMap<>()));
+    private final Set<Integer> playersAway = new HashSet<>();
+    private final Map<ExpeditionType, Expedition> expeditions = new HashMap<>();
+    private final Map<Integer, MiniDungeon> dungeons = new HashMap<>();
+    private final List<ExpeditionType> expedType = new ArrayList<>();
+    private final Set<MapleMap> ownedMaps = Collections.synchronizedSet(Collections.newSetFromMap(new WeakHashMap<>()));
     private Event event;
     private boolean finishedShutdown = false;
-    private Set<Integer> usedMC = new HashSet<>();
+    private final Set<Integer> usedMC = new HashSet<>();
 
     private int usedDojo = 0;
     private int[] dojoStage;
     private long[] dojoFinishTime;
     private ScheduledFuture<?>[] dojoTask;
-    private Map<Integer, Integer> dojoParty = new HashMap<>();
+    private final Map<Integer, Integer> dojoParty = new HashMap<>();
 
-    private List<Integer> chapelReservationQueue = new LinkedList<>();
-    private List<Integer> cathedralReservationQueue = new LinkedList<>();
+    private final List<Integer> chapelReservationQueue = new LinkedList<>();
+    private final List<Integer> cathedralReservationQueue = new LinkedList<>();
     private ScheduledFuture<?> chapelReservationTask;
     private ScheduledFuture<?> cathedralReservationTask;
 
@@ -100,11 +100,11 @@ public final class Channel {
     private Set<Integer> ongoingCathedralGuests = null;
     private long ongoingStartTime;
 
-    private MonitoredReentrantReadWriteLock merchantLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.MERCHANT, true);
-    private MonitoredReadLock merchRlock = MonitoredReadLockFactory.createLock(merchantLock);
-    private MonitoredWriteLock merchWlock = MonitoredWriteLockFactory.createLock(merchantLock);
+    private final MonitoredReentrantReadWriteLock merchantLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.MERCHANT, true);
+    private final MonitoredReadLock merchRlock = MonitoredReadLockFactory.createLock(merchantLock);
+    private final MonitoredWriteLock merchWlock = MonitoredWriteLockFactory.createLock(merchantLock);
 
-    private MonitoredReentrantLock[] faceLock = new MonitoredReentrantLock[YamlConfig.config.server.CHANNEL_LOCKS];
+    private final MonitoredReentrantLock[] faceLock = new MonitoredReentrantLock[YamlConfig.config.server.CHANNEL_LOCKS];
 
     private MonitoredReentrantLock lock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHANNEL, true);
 
@@ -132,7 +132,7 @@ public final class Channel {
             dojoStage = new int[20];
             dojoFinishTime = new long[20];
             dojoTask = new ScheduledFuture<?>[20];
-            for(int i = 0; i < 20; i++) {
+            for (int i = 0; i < 20; i++) {
                 dojoStage[i] = 0;
                 dojoFinishTime[i] = 0;
                 dojoTask[i] = null;
@@ -152,7 +152,7 @@ public final class Channel {
         return channelServer;
     }
 
-    public synchronized void reloadEventScriptManager(){
+    public synchronized void reloadEventScriptManager() {
         if (finishedShutdown) {
             return;
         }
@@ -200,8 +200,8 @@ public final class Channel {
     private void closeChannelSchedules() {
         lock.lock();
         try {
-            for(int i = 0; i < dojoTask.length; i++) {
-                if(dojoTask[i] != null) {
+            for (int i = 0; i < dojoTask.length; i++) {
+                if (dojoTask[i] != null) {
                     dojoTask[i].cancel(false);
                     dojoTask[i] = null;
                 }
@@ -219,7 +219,7 @@ public final class Channel {
     }
 
     private void emptyLocks() {
-        for(int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {
+        for (int i = 0; i < YamlConfig.config.server.CHANNEL_LOCKS; i++) {
             faceLock[i] = faceLock[i].dispose();
         }
 
@@ -280,7 +280,7 @@ public final class Channel {
     }
 
     public int getChannelCapacity() {
-        return (int)(Math.ceil(((float) players.getAllCharacters().size() / YamlConfig.config.server.CHANNEL_LOAD) * 800));
+        return (int) (Math.ceil(((float) players.getAllCharacters().size() / YamlConfig.config.server.CHANNEL_LOAD) * 800));
     }
 
     public void broadcastPacket(Packet packet) {
@@ -445,16 +445,16 @@ public final class Channel {
         getWorldServer().resetDisabledServerMessages();
     }
 
-    private static String [] getEvents(){
+    private static String[] getEvents() {
         List<String> events = new ArrayList<>();
-    	for (File file : new File("scripts/event").listFiles()){
+        for (File file : new File("scripts/event").listFiles()) {
             events.add(file.getName().substring(0, file.getName().length() - 3));
         }
         return events.toArray(new String[0]);
     }
 
     public int getStoredVar(int key) {
-        if(storedVars.containsKey(key)) {
+        if (storedVars.containsKey(key)) {
             return storedVars.get(key);
         }
 
@@ -466,7 +466,9 @@ public final class Channel {
     }
 
     public int lookupPartyDojo(Party party) {
-        if(party == null) return -1;
+        if (party == null) {
+            return -1;
+        }
 
         Integer i = dojoParty.get(party.hashCode());
         return (i != null) ? i : -1;
@@ -482,24 +484,26 @@ public final class Channel {
             int dojoList = this.usedDojo;
             int range, slot = 0;
 
-            if(!isPartyDojo) {
+            if (!isPartyDojo) {
                 dojoList = dojoList >> 5;
                 range = 15;
             } else {
                 range = 5;
             }
 
-            while((dojoList & 1) != 0) {
+            while ((dojoList & 1) != 0) {
                 dojoList = (dojoList >> 1);
                 slot++;
             }
 
-            if(slot < range) {
+            if (slot < range) {
                 int slotMapid = (isPartyDojo ? 925030000 : 925020000) + (100 * (fromStage + 1)) + slot;
                 int dojoSlot = getDojoSlot(slotMapid);
 
-                if(party != null) {
-                    if(dojoParty.containsKey(party.hashCode())) return -2;
+                if (party != null) {
+                    if (dojoParty.containsKey(party.hashCode())) {
+                        return -2;
+                    }
                     dojoParty.put(party.hashCode(), dojoSlot);
                 }
 
@@ -527,15 +531,17 @@ public final class Channel {
             lock.unlock();
         }
 
-        if(party != null) {
-            if(dojoParty.remove(party.hashCode()) != null) return;
+        if (party != null) {
+            if (dojoParty.remove(party.hashCode()) != null) {
+                return;
+            }
         }
 
-        if(dojoParty.containsValue(slot)) {    // strange case, no party there!
+        if (dojoParty.containsValue(slot)) {    // strange case, no party there!
             Set<Entry<Integer, Integer>> es = new HashSet<>(dojoParty.entrySet());
 
-            for(Entry<Integer, Integer> e: es) {
-                if(e.getValue() == slot) {
+            for (Entry<Integer, Integer> e : es) {
+                if (e.getValue() == slot) {
                     dojoParty.remove(e.getKey());
                     break;
                 }
@@ -548,7 +554,7 @@ public final class Channel {
     }
 
     public void resetDojoMap(int fromMapId) {
-        for(int i = 0; i < (((fromMapId / 100) % 100 <= 36) ? 5 : 2); i++) {
+        for (int i = 0; i < (((fromMapId / 100) % 100 <= 36) ? 5 : 2); i++) {
             this.getMapFactory().getMap(fromMapId + (100 * i)).resetMapObjects();
         }
     }
@@ -573,7 +579,9 @@ public final class Channel {
                 break;
             }
             MapleMap dojoMap = getMapFactory().getMap(dojoBaseMap + (100 * (stage + i)) + delta);
-                if(!dojoMap.getAllPlayers().isEmpty()) return;
+            if (!dojoMap.getAllPlayers().isEmpty()) {
+                return;
+            }
         }
 
         freeDojoSlot(slot, null);
@@ -582,7 +590,9 @@ public final class Channel {
     private void startDojoSchedule(final int dojoMapId) {
         final int slot = getDojoSlot(dojoMapId);
         final int stage = (dojoMapId / 100) % 100;
-        if(stage <= dojoStage[slot]) return;
+        if (stage <= dojoStage[slot]) {
+            return;
+        }
 
         long clockTime = (stage > 36 ? 15 : (stage / 6) + 5) * 60000;
 
@@ -602,8 +612,8 @@ public final class Channel {
                     }
 
                     MapleMap dojoExit = getMapFactory().getMap(925020002);
-                    for(Character chr: getMapFactory().getMap(dojoBaseMap + (100 * (stage + i)) + delta).getAllPlayers()) {
-                        if(GameConstants.isDojo(chr.getMap().getId())) {
+                    for (Character chr : getMapFactory().getMap(dojoBaseMap + (100 * (stage + i)) + delta).getAllPlayers()) {
+                        if (GameConstants.isDojo(chr.getMap().getId())) {
                             chr.changeMap(dojoExit);
                         }
                         party = chr.getParty();
@@ -622,11 +632,13 @@ public final class Channel {
     public void dismissDojoSchedule(int dojoMapId, Party party) {
         int slot = getDojoSlot(dojoMapId);
         int stage = (dojoMapId / 100) % 100;
-        if(stage <= dojoStage[slot]) return;
+        if (stage <= dojoStage[slot]) {
+            return;
+        }
 
         lock.lock();
         try {
-            if(this.dojoTask[slot] != null) {
+            if (this.dojoTask[slot] != null) {
                 this.dojoTask[slot].cancel(false);
                 this.dojoTask[slot] = null;
             }
@@ -641,7 +653,7 @@ public final class Channel {
         int slot = getDojoSlot(dojoMapId);
         int dojoStg = (dojoMapId / 100) % 100;
 
-        if(this.dojoStage[slot] < dojoStg) {
+        if (this.dojoStage[slot] < dojoStg) {
             this.dojoStage[slot] = dojoStg;
             return true;
         } else {
@@ -656,7 +668,9 @@ public final class Channel {
     public boolean addMiniDungeon(int dungeonid) {
         lock.lock();
         try {
-            if(dungeons.containsKey(dungeonid)) return false;
+            if (dungeons.containsKey(dungeonid)) {
+                return false;
+            }
 
             MiniDungeonInfo mmdi = MiniDungeonInfo.getDungeon(dungeonid);
             MiniDungeon mmd = new MiniDungeon(mmdi.getBase(), this.getMapFactory().getMap(mmdi.getDungeonId()).getTimeLimit());   // thanks Conrad for noticing hardcoded time limit for minidungeons
@@ -692,10 +706,14 @@ public final class Channel {
         lock.lock();
         try {
             List<Integer> weddingReservationQueue = (cathedral ? cathedralReservationQueue : chapelReservationQueue);
-            if(weddingReservationQueue.isEmpty()) return null;
+            if (weddingReservationQueue.isEmpty()) {
+                return null;
+            }
 
             ret = weddingReservationQueue.remove(0);
-            if(ret == null) return null;
+            if (ret == null) {
+                return null;
+            }
         } finally {
             lock.unlock();
         }
@@ -723,23 +741,29 @@ public final class Channel {
     }
 
     public int getWeddingReservationStatus(Integer weddingId, boolean cathedral) {
-        if(weddingId == null) return -1;
+        if (weddingId == null) {
+            return -1;
+        }
 
         lock.lock();
         try {
-            if(cathedral) {
-                if(weddingId.equals(ongoingCathedral)) return 0;
+            if (cathedral) {
+                if (weddingId.equals(ongoingCathedral)) {
+                    return 0;
+                }
 
-                for(int i  = 0; i < cathedralReservationQueue.size(); i++) {
-                    if(weddingId.equals(cathedralReservationQueue.get(i))) {
+                for (int i = 0; i < cathedralReservationQueue.size(); i++) {
+                    if (weddingId.equals(cathedralReservationQueue.get(i))) {
                         return i + 1;
                     }
                 }
             } else {
-                if(weddingId.equals(ongoingChapel)) return 0;
+                if (weddingId.equals(ongoingChapel)) {
+                    return 0;
+                }
 
-                for(int i  = 0; i < chapelReservationQueue.size(); i++) {
-                    if(weddingId.equals(chapelReservationQueue.get(i))) {
+                for (int i = 0; i < chapelReservationQueue.size(); i++) {
+                    if (weddingId.equals(chapelReservationQueue.get(i))) {
                         return i + 1;
                     }
                 }
@@ -752,7 +776,9 @@ public final class Channel {
     }
 
     public int pushWeddingReservation(Integer weddingId, boolean cathedral, boolean premium, Integer groomId, Integer brideId) {
-        if(weddingId == null || isWeddingReserved(weddingId)) return -1;
+        if (weddingId == null || isWeddingReserved(weddingId)) {
+            return -1;
+        }
 
         World wserv = getWorldServer();
         wserv.putMarriageQueued(weddingId, cathedral, premium, groomId, brideId);
@@ -762,7 +788,7 @@ public final class Channel {
             List<Integer> weddingReservationQueue = (cathedral ? cathedralReservationQueue : chapelReservationQueue);
 
             int delay = YamlConfig.config.server.WEDDING_RESERVATION_DELAY - 1 - weddingReservationQueue.size();
-            for(int i = 0; i < delay; i++) {
+            for (int i = 0; i < delay; i++) {
                 weddingReservationQueue.add(null);  // push empty slots to fill the waiting time
             }
 
@@ -776,7 +802,7 @@ public final class Channel {
     public boolean isOngoingWeddingGuest(boolean cathedral, int playerId) {
         lock.lock();
         try {
-            if(cathedral) {
+            if (cathedral) {
                 return ongoingCathedralGuests != null && ongoingCathedralGuests.contains(playerId);
             } else {
                 return ongoingChapelGuests != null && ongoingChapelGuests.contains(playerId);
@@ -807,7 +833,7 @@ public final class Channel {
     public void closeOngoingWedding(boolean cathedral) {
         lock.lock();
         try {
-            if(cathedral) {
+            if (cathedral) {
                 ongoingCathedral = null;
                 ongoingCathedralType = null;
                 ongoingCathedralGuests = null;
@@ -824,7 +850,7 @@ public final class Channel {
     public void setOngoingWedding(final boolean cathedral, Boolean premium, Integer weddingId, Set<Integer> guests) {
         lock.lock();
         try {
-            if(cathedral) {
+            if (cathedral) {
                 ongoingCathedral = weddingId;
                 ongoingCathedralType = premium;
                 ongoingCathedralGuests = guests;
@@ -838,10 +864,10 @@ public final class Channel {
         }
 
         ongoingStartTime = System.currentTimeMillis();
-        if(weddingId != null) {
+        if (weddingId != null) {
             ScheduledFuture<?> weddingTask = TimerManager.getInstance().schedule(() -> closeOngoingWedding(cathedral), YamlConfig.config.server.WEDDING_RESERVATION_TIMEOUT * 60 * 1000);
 
-            if(cathedral) {
+            if (cathedral) {
                 cathedralReservationTask = weddingTask;
             } else {
                 chapelReservationTask = weddingTask;
@@ -850,13 +876,17 @@ public final class Channel {
     }
 
     public synchronized boolean acceptOngoingWedding(final boolean cathedral) {     // couple succeeded to show up and started the ceremony
-        if(cathedral) {
-            if(cathedralReservationTask == null) return false;
+        if (cathedral) {
+            if (cathedralReservationTask == null) {
+                return false;
+            }
 
             cathedralReservationTask.cancel(false);
             cathedralReservationTask = null;
         } else {
-            if(chapelReservationTask == null) return false;
+            if (chapelReservationTask == null) {
+                return false;
+            }
 
             chapelReservationTask.cancel(false);
             chapelReservationTask = null;
@@ -869,29 +899,30 @@ public final class Channel {
         StringBuilder str = new StringBuilder();
         long leftTime = futureTime - System.currentTimeMillis();
 
-        if(leftTime < 0) {
+        if (leftTime < 0) {
             return null;
         }
 
         byte mode = 0;
-        if(leftTime / (60*1000) > 0) {
+        if (leftTime / (60 * 1000) > 0) {
             mode++;     //counts minutes
 
-            if(leftTime / (60*60*1000) > 0)
+            if (leftTime / (60 * 60 * 1000) > 0) {
                 mode++;     //counts hours
             }
+        }
 
-        switch(mode) {
+        switch (mode) {
             case 2:
-                int hours   = (int) ((leftTime / (1000*60*60)));
+                int hours = (int) ((leftTime / (1000 * 60 * 60)));
                 str.append(hours + " hours, ");
 
             case 1:
-                int minutes = (int) ((leftTime / (1000*60)) % 60);
+                int minutes = (int) ((leftTime / (1000 * 60)) % 60);
                 str.append(minutes + " minutes, ");
 
             default:
-                int seconds = (int) (leftTime / 1000) % 60 ;
+                int seconds = (int) (leftTime / 1000) % 60;
                 str.append(seconds + " seconds");
         }
 
@@ -907,7 +938,9 @@ public final class Channel {
     }
 
     public String getWeddingReservationTimeLeft(Integer weddingId) {
-        if(weddingId == null) return null;
+        if (weddingId == null) {
+            return null;
+        }
 
         lock.lock();
         try {
@@ -915,17 +948,17 @@ public final class Channel {
 
             int resStatus;
             resStatus = getWeddingReservationStatus(weddingId, true);
-            if(resStatus < 0) {
+            if (resStatus < 0) {
                 cathedral = false;
                 resStatus = getWeddingReservationStatus(weddingId, false);
 
-                if(resStatus < 0) {
+                if (resStatus < 0) {
                     return null;
                 }
             }
 
             String venue = (cathedral ? "Cathedral" : "Chapel");
-            if(resStatus == 0) {
+            if (resStatus == 0) {
                 return venue + " - RIGHT NOW";
             }
 

src/main/java/net/server/channel/CharacterIdChannelPair.java

@@ -22,7 +22,6 @@
 package net.server.channel;
 
 /**
- *
  * @author Frz
  */
 public class CharacterIdChannelPair {

src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java

@@ -65,7 +65,9 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
             }
 
             int skillLevel = chr.getSkillLevel(mySkill);
-            if(skillLevel == 0 && GameConstants.isPqSkillMap(chr.getMapId()) && GameConstants.isPqSkill(mySkill.getId())) skillLevel = 1;
+            if (skillLevel == 0 && GameConstants.isPqSkillMap(chr.getMapId()) && GameConstants.isPqSkill(mySkill.getId())) {
+                skillLevel = 1;
+            }
 
             if (skillLevel == 0) {
                 return null;
@@ -108,12 +110,12 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
                 int mobCount = attackEffect.getMobCount();
                 if (attack.skill != Cleric.HEAL) {
                     if (player.isAlive()) {
-                        if(attack.skill == Aran.BODY_PRESSURE || attack.skill == Marauder.ENERGY_CHARGE || attack.skill == ThunderBreaker.ENERGY_CHARGE) {  // thanks IxianMace for noticing Energy Charge skills refreshing on touch
+                        if (attack.skill == Aran.BODY_PRESSURE || attack.skill == Marauder.ENERGY_CHARGE || attack.skill == ThunderBreaker.ENERGY_CHARGE) {  // thanks IxianMace for noticing Energy Charge skills refreshing on touch
                             // prevent touch dmg skills refreshing
-                        } else if(attack.skill == DawnWarrior.FINAL_ATTACK || attack.skill == WindArcher.FINAL_ATTACK) {
+                        } else if (attack.skill == DawnWarrior.FINAL_ATTACK || attack.skill == WindArcher.FINAL_ATTACK) {
                             // prevent cygnus FA refreshing
                             mobCount = 15;
-                        } else if(attack.skill == NightWalker.POISON_BOMB) {// Poison Bomb
+                        } else if (attack.skill == NightWalker.POISON_BOMB) {// Poison Bomb
                             attackEffect.applyTo(player, new Point(attack.position.x, attack.position.y));
                         } else {
                             attackEffect.applyTo(player);
@@ -189,29 +191,29 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
                     double distance = player.getPosition().distanceSq(monster.getPosition());
                     double distanceToDetect = 200000.0;
 
-                    if(attack.ranged)
+                    if (attack.ranged) {
                         distanceToDetect += 400000;
+                    }
 
-                    if(attack.magic)
+                    if (attack.magic) {
                         distanceToDetect += 200000;
+                    }
 
-                    if(player.getJob().isA(Job.ARAN1))
+                    if (player.getJob().isA(Job.ARAN1)) {
                         distanceToDetect += 200000; // Arans have extra range over normal warriors.
+                    }
 
-                    if(attack.skill == Aran.COMBO_SMASH || attack.skill == Aran.BODY_PRESSURE)
+                    if (attack.skill == Aran.COMBO_SMASH || attack.skill == Aran.BODY_PRESSURE) {
                         distanceToDetect += 40000;
-                    
-                    else if(attack.skill == Bishop.GENESIS || attack.skill == ILArchMage.BLIZZARD || attack.skill == FPArchMage.METEOR_SHOWER)
+                    } else if (attack.skill == Bishop.GENESIS || attack.skill == ILArchMage.BLIZZARD || attack.skill == FPArchMage.METEOR_SHOWER) {
                         distanceToDetect += 275000;
-                    
-                    else if(attack.skill == Hero.BRANDISH || attack.skill == DragonKnight.SPEAR_CRUSHER || attack.skill == DragonKnight.POLE_ARM_CRUSHER)
+                    } else if (attack.skill == Hero.BRANDISH || attack.skill == DragonKnight.SPEAR_CRUSHER || attack.skill == DragonKnight.POLE_ARM_CRUSHER) {
                         distanceToDetect += 40000;
-                    
-                    else if(attack.skill == DragonKnight.DRAGON_ROAR || attack.skill == SuperGM.SUPER_DRAGON_ROAR)
+                    } else if (attack.skill == DragonKnight.DRAGON_ROAR || attack.skill == SuperGM.SUPER_DRAGON_ROAR) {
                         distanceToDetect += 250000;
-                    
-                    else if(attack.skill == Shadower.BOOMERANG_STEP)
+                    } else if (attack.skill == Shadower.BOOMERANG_STEP) {
                         distanceToDetect += 60000;
+                    }
 
                     if (distance > distanceToDetect) {
                         AutobanFactory.DISTANCE_HACK.alert(player, "Distance Sq to monster: " + distance + " SID: " + attack.skill + " MID: " + monster.getId());
@@ -244,7 +246,9 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
                     }
 
                     for (Integer eachd : onedList) {
-                        if(eachd < 0) eachd += Integer.MAX_VALUE;
+                        if (eachd < 0) {
+                            eachd += Integer.MAX_VALUE;
+                        }
                         totDamageToOneMonster += eachd;
                     }
                     totDamage += totDamageToOneMonster;
@@ -252,7 +256,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
                     if (player.getBuffedValue(BuffStat.PICKPOCKET) != null && (attack.skill == 0 || attack.skill == Rogue.DOUBLE_STAB || attack.skill == Bandit.SAVAGE_BLOW || attack.skill == ChiefBandit.ASSAULTER || attack.skill == ChiefBandit.BAND_OF_THIEVES || attack.skill == Shadower.ASSASSINATE || attack.skill == Shadower.TAUNT || attack.skill == Shadower.BOOMERANG_STEP)) {
                         Skill pickpocket = SkillFactory.getSkill(ChiefBandit.PICKPOCKET);
                         int picklv = (player.isGM()) ? pickpocket.getMaxLevel() : player.getSkillLevel(pickpocket);
-                        if(picklv > 0) {
+                        if (picklv > 0) {
                             int delay = 0;
                             final int maxmeso = player.getBuffedValue(BuffStat.PICKPOCKET);
                             for (Integer eachd : onedList) {
@@ -260,10 +264,11 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
 
                                 if (pickpocket.getEffect(picklv).makeChanceResult()) {
                                     final int eachdf;
-                                    if(eachd < 0)
+                                    if (eachd < 0) {
                                         eachdf = eachd + Integer.MAX_VALUE;
-                                    else
+                                    } else {
                                         eachdf = eachd;
+                                    }
 
                                     TimerManager.getInstance().schedule(() -> map.spawnMesoDrop(Math.min((int) Math.max(((double) eachdf / (double) 20000) * (double) maxmeso, 1), maxmeso), new Point((int) (monster.getPosition().getX() + Randomizer.nextInt(100) - 50), (int) (monster.getPosition().getY())), monster, player, true, (byte) 2), delay);
                                     delay += 100;
@@ -280,11 +285,13 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
 
                                 MonsterInformationProvider mi = MonsterInformationProvider.getInstance();
                                 List<Integer> dropPool = mi.retrieveDropPool(monster.getId());
-                                if(!dropPool.isEmpty()) {
+                                if (!dropPool.isEmpty()) {
                                     int rndPool = (int) Math.floor(Math.random() * dropPool.get(dropPool.size() - 1));
 
                                     int i = 0;
-                                    while(rndPool >= dropPool.get(i)) i++;
+                                    while (rndPool >= dropPool.get(i)) {
+                                        i++;
+                                    }
 
                                     List<MonsterDropEntry> toSteal = new ArrayList<>();
                                     toSteal.add(mi.retrieveDrop(monster.getId()).get(i));
@@ -416,15 +423,15 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
                             }
 
                             int threeSnailsId = player.getJobType() * 10000000 + 1000;
-                            if(attack.skill == threeSnailsId) {
-                                if(YamlConfig.config.server.USE_ULTRA_THREE_SNAILS) {
+                            if (attack.skill == threeSnailsId) {
+                                if (YamlConfig.config.server.USE_ULTRA_THREE_SNAILS) {
                                     int skillLv = player.getSkillLevel(threeSnailsId);
 
-                                    if(skillLv > 0) {
+                                    if (skillLv > 0) {
                                         AbstractPlayerInteraction api = player.getAbstractPlayerInteraction();
 
                                         int shellId;
-                                        switch(skillLv) {
+                                        switch (skillLv) {
                                             case 1:
                                                 shellId = 4000019;
                                                 break;
@@ -437,7 +444,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
                                                 shellId = 4000016;
                                         }
 
-                                        if(api.haveItem(shellId, 1)) {
+                                        if (api.haveItem(shellId, 1)) {
                                             api.gainItem(shellId, (short) -1, false);
                                             totDamageToOneMonster *= player.getLevel();
                                         } else {
@@ -452,28 +459,28 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
                     }
                     if (totDamageToOneMonster > 0 && attackEffect != null) {
                         Map<MonsterStatus, Integer> attackEffectStati = attackEffect.getMonsterStati();
-                        if(!attackEffectStati.isEmpty()) {
+                        if (!attackEffectStati.isEmpty()) {
                             if (attackEffect.makeChanceResult()) {
                                 monster.applyStatus(player, new MonsterStatusEffect(attackEffectStati, theSkill, null, false), attackEffect.isPoison(), attackEffect.getDuration());
                             }
                         }
                     }
                     if (attack.skill == Paladin.HEAVENS_HAMMER) {
-                        if(!monster.isBoss()) {
+                        if (!monster.isBoss()) {
                             damageMonsterWithSkill(player, map, monster, monster.getHp() - 1, attack.skill, 1777);
                         } else {
                             int HHDmg = (player.calculateMaxBaseDamage(player.getTotalWatk()) * (SkillFactory.getSkill(Paladin.HEAVENS_HAMMER).getEffect(player.getSkillLevel(SkillFactory.getSkill(Paladin.HEAVENS_HAMMER))).getDamage() / 100));
                             damageMonsterWithSkill(player, map, monster, (int) (Math.floor(Math.random() * (HHDmg / 5) + HHDmg * .8)), attack.skill, 1777);
                         }
                     } else if (attack.skill == Aran.COMBO_TEMPEST) {
-                        if(!monster.isBoss()) {
+                        if (!monster.isBoss()) {
                             damageMonsterWithSkill(player, map, monster, monster.getHp(), attack.skill, 0);
                         } else {
                             int TmpDmg = (player.calculateMaxBaseDamage(player.getTotalWatk()) * (SkillFactory.getSkill(Aran.COMBO_TEMPEST).getEffect(player.getSkillLevel(SkillFactory.getSkill(Aran.COMBO_TEMPEST))).getDamage() / 100));
                             damageMonsterWithSkill(player, map, monster, (int) (Math.floor(Math.random() * (TmpDmg / 5) + TmpDmg * .8)), attack.skill, 0);
                         }
                     } else {
-                        if(attack.skill == Aran.BODY_PRESSURE) {
+                        if (attack.skill == Aran.BODY_PRESSURE) {
                             map.broadcastMessage(PacketCreator.damageMonster(monster.getObjectId(), totDamageToOneMonster));
                         }
 
@@ -511,10 +518,13 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
     private static void damageMonsterWithSkill(final Character attacker, final MapleMap map, final Monster monster, final int damage, int skillid, int fixedTime) {
         int animationTime;
 
-        if(fixedTime == 0) animationTime = SkillFactory.getSkill(skillid).getAnimationTime();
-        else animationTime = fixedTime;
+        if (fixedTime == 0) {
+            animationTime = SkillFactory.getSkill(skillid).getAnimationTime();
+        } else {
+            animationTime = fixedTime;
+        }
 
-        if(animationTime > 0) { // be sure to only use LIMITED ATTACKS with animation time here
+        if (animationTime > 0) { // be sure to only use LIMITED ATTACKS with animation time here
             TimerManager.getInstance().schedule(() -> {
                 map.broadcastMessage(PacketCreator.damageMonster(monster.getObjectId(), damage), monster.getPosition());
                 map.damageMonster(attacker, monster, damage);
@@ -539,7 +549,9 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
 
         if (ret.skill > 0) {
             ret.skilllevel = chr.getSkillLevel(ret.skill);
-            if(ret.skilllevel == 0 && GameConstants.isPqSkillMap(chr.getMapId()) && GameConstants.isPqSkill(ret.skill)) ret.skilllevel = 1;
+            if (ret.skilllevel == 0 && GameConstants.isPqSkillMap(chr.getMapId()) && GameConstants.isPqSkill(ret.skill)) {
+                ret.skilllevel = 1;
+            }
         }
 
         if (ret.skill == Evan.ICE_BREATH || ret.skill == Evan.FIRE_BREATH || ret.skill == FPArchMage.BIG_BANG || ret.skill == ILArchMage.BIG_BANG || ret.skill == Bishop.BIG_BANG || ret.skill == Gunslinger.GRENADE || ret.skill == Brawler.CORKSCREW_BLOW || ret.skill == ThunderBreaker.CORKSCREW_BLOW || ret.skill == NightWalker.POISON_BOMB) {
@@ -607,51 +619,55 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
         // Several skills have their own formula in this section.
         long calcDmgMax;
 
-        if(magic && ret.skill != 0) {   // thanks onechord for noticing a few false positives stemming from maxdmg as 0
+        if (magic && ret.skill != 0) {   // thanks onechord for noticing a few false positives stemming from maxdmg as 0
             calcDmgMax = (long) (Math.ceil((chr.getTotalMagic() * Math.ceil(chr.getTotalMagic() / 1000.0) + chr.getTotalMagic()) / 30.0) + Math.ceil(chr.getTotalInt() / 200.0));
-        } else if(ret.skill == 4001344 || ret.skill == NightWalker.LUCKY_SEVEN || ret.skill == NightLord.TRIPLE_THROW) {
+        } else if (ret.skill == 4001344 || ret.skill == NightWalker.LUCKY_SEVEN || ret.skill == NightLord.TRIPLE_THROW) {
             calcDmgMax = (long) ((chr.getTotalLuk() * 5) * Math.ceil(chr.getTotalWatk() / 100.0));
-        } else if(ret.skill == DragonKnight.DRAGON_ROAR) {
+        } else if (ret.skill == DragonKnight.DRAGON_ROAR) {
             calcDmgMax = (long) ((chr.getTotalStr() * 4 + chr.getTotalDex()) * Math.ceil(chr.getTotalWatk() / 100.0));
-        } else if(ret.skill == NightLord.VENOMOUS_STAR || ret.skill == Shadower.VENOMOUS_STAB) {
+        } else if (ret.skill == NightLord.VENOMOUS_STAR || ret.skill == Shadower.VENOMOUS_STAB) {
             calcDmgMax = (long) (Math.ceil((18.5 * (chr.getTotalStr() + chr.getTotalLuk()) + chr.getTotalDex() * 2) / 100.0) * chr.calculateMaxBaseDamage(chr.getTotalWatk()));
         } else {
             calcDmgMax = chr.calculateMaxBaseDamage(chr.getTotalWatk());
         }
 
-        if(ret.skill != 0) {
+        if (ret.skill != 0) {
             Skill skill = SkillFactory.getSkill(ret.skill);
             StatEffect effect = skill.getEffect(ret.skilllevel);
 
             if (magic) {
                 // Since the skill is magic based, use the magic formula
-                if(chr.getJob() == Job.IL_ARCHMAGE || chr.getJob() == Job.IL_MAGE) {
+                if (chr.getJob() == Job.IL_ARCHMAGE || chr.getJob() == Job.IL_MAGE) {
                     int skillLvl = chr.getSkillLevel(ILMage.ELEMENT_AMPLIFICATION);
-                    if(skillLvl > 0)
+                    if (skillLvl > 0) {
                         calcDmgMax = calcDmgMax * SkillFactory.getSkill(ILMage.ELEMENT_AMPLIFICATION).getEffect(skillLvl).getY() / 100;
-                } else if(chr.getJob() == Job.FP_ARCHMAGE || chr.getJob() == Job.FP_MAGE) {
+                    }
+                } else if (chr.getJob() == Job.FP_ARCHMAGE || chr.getJob() == Job.FP_MAGE) {
                     int skillLvl = chr.getSkillLevel(FPMage.ELEMENT_AMPLIFICATION);
-                    if(skillLvl > 0)
+                    if (skillLvl > 0) {
                         calcDmgMax = calcDmgMax * SkillFactory.getSkill(FPMage.ELEMENT_AMPLIFICATION).getEffect(skillLvl).getY() / 100;
-                } else if(chr.getJob() == Job.BLAZEWIZARD3 || chr.getJob() == Job.BLAZEWIZARD4) {
+                    }
+                } else if (chr.getJob() == Job.BLAZEWIZARD3 || chr.getJob() == Job.BLAZEWIZARD4) {
                     int skillLvl = chr.getSkillLevel(BlazeWizard.ELEMENT_AMPLIFICATION);
-                    if(skillLvl > 0)
+                    if (skillLvl > 0) {
                         calcDmgMax = calcDmgMax * SkillFactory.getSkill(BlazeWizard.ELEMENT_AMPLIFICATION).getEffect(skillLvl).getY() / 100;
-                } else if(chr.getJob() == Job.EVAN7 || chr.getJob() == Job.EVAN8 || chr.getJob() == Job.EVAN9 || chr.getJob() == Job.EVAN10) {
+                    }
+                } else if (chr.getJob() == Job.EVAN7 || chr.getJob() == Job.EVAN8 || chr.getJob() == Job.EVAN9 || chr.getJob() == Job.EVAN10) {
                     int skillLvl = chr.getSkillLevel(Evan.MAGIC_AMPLIFICATION);
-                    if(skillLvl > 0)
+                    if (skillLvl > 0) {
                         calcDmgMax = calcDmgMax * SkillFactory.getSkill(Evan.MAGIC_AMPLIFICATION).getEffect(skillLvl).getY() / 100;
                     }
+                }
 
                 calcDmgMax *= effect.getMatk();
-                if(ret.skill == Cleric.HEAL) {
+                if (ret.skill == Cleric.HEAL) {
                     // This formula is still a bit wonky, but it is fairly accurate.
                     calcDmgMax = (int) Math.round((chr.getTotalInt() * 4.8 + chr.getTotalLuk() * 4) * chr.getTotalMagic() / 1000);
                     calcDmgMax = calcDmgMax * effect.getHp() / 100;
 
                     ret.speed = 7;
                 }
-            } else if(ret.skill == Hermit.SHADOW_MESO) {
+            } else if (ret.skill == Hermit.SHADOW_MESO) {
                 // Shadow Meso also has its own formula
                 calcDmgMax = effect.getMoneyCon() * 10;
                 calcDmgMax = (int) Math.floor(calcDmgMax * 1.5);
@@ -662,40 +678,43 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
         }
 
         Integer comboBuff = chr.getBuffedValue(BuffStat.COMBO);
-        if(comboBuff != null && comboBuff > 0) {
+        if (comboBuff != null && comboBuff > 0) {
             int oid = chr.isCygnus() ? DawnWarrior.COMBO : Crusader.COMBO;
             int advcomboid = chr.isCygnus() ? DawnWarrior.ADVANCED_COMBO : Hero.ADVANCED_COMBO;
 
-            if(comboBuff > 6) {
+            if (comboBuff > 6) {
                 // Advanced Combo
                 StatEffect ceffect = SkillFactory.getSkill(advcomboid).getEffect(chr.getSkillLevel(advcomboid));
                 calcDmgMax = (long) Math.floor(calcDmgMax * (ceffect.getDamage() + 50) / 100 + 0.20 + (comboBuff - 5) * 0.04);
             } else {
                 // Normal Combo
                 int skillLv = chr.getSkillLevel(oid);
-                if(skillLv <= 0 || chr.isGM()) skillLv = SkillFactory.getSkill(oid).getMaxLevel();
+                if (skillLv <= 0 || chr.isGM()) {
+                    skillLv = SkillFactory.getSkill(oid).getMaxLevel();
+                }
 
-                if(skillLv > 0) {
+                if (skillLv > 0) {
                     StatEffect ceffect = SkillFactory.getSkill(oid).getEffect(skillLv);
                     calcDmgMax = (long) Math.floor(calcDmgMax * (ceffect.getDamage() + 50) / 100 + Math.floor((comboBuff - 1) * (skillLv / 6)) / 100);
                 }
             }
 
-            if(GameConstants.isFinisherSkill(ret.skill)) {
+            if (GameConstants.isFinisherSkill(ret.skill)) {
                 // Finisher skills do more damage based on how many orbs the player has.
                 int orbs = comboBuff - 1;
-                if(orbs == 2) 
+                if (orbs == 2) {
                     calcDmgMax *= 1.2;
-                else if(orbs == 3)
+                } else if (orbs == 3) {
                     calcDmgMax *= 1.54;
-                else if(orbs == 4)
+                } else if (orbs == 4) {
                     calcDmgMax *= 2;
-                else if(orbs >= 5)
+                } else if (orbs >= 5) {
                     calcDmgMax *= 2.5;
                 }
             }
+        }
 
-        if(chr.getEnergyBar() == 15000) {
+        if (chr.getEnergyBar() == 15000) {
             int energycharge = chr.isCygnus() ? ThunderBreaker.ENERGY_CHARGE : Marauder.ENERGY_CHARGE;
             StatEffect ceffect = SkillFactory.getSkill(energycharge).getEffect(chr.getSkillLevel(energycharge));
             calcDmgMax *= (100 + ceffect.getDamage()) / 100;
@@ -712,16 +731,13 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
             calcDmgMax = (long) Math.ceil(calcDmgMax * dmgBuff);
         }
 
-        if(chr.getMapId() >= 914000000 && chr.getMapId() <= 914000500) {
+        if (chr.getMapId() >= 914000000 && chr.getMapId() <= 914000500) {
             calcDmgMax += 80000; // Aran Tutorial.
         }
 
-        boolean canCrit = false;
-        if(chr.getJob().isA((Job.BOWMAN)) || chr.getJob().isA(Job.THIEF) || chr.getJob().isA(Job.NIGHTWALKER1) || chr.getJob().isA(Job.WINDARCHER1) || chr.getJob() == Job.ARAN3 || chr.getJob() == Job.ARAN4 || chr.getJob() == Job.MARAUDER || chr.getJob() == Job.BUCCANEER) {
-            canCrit = true;
-        }
+        boolean canCrit = chr.getJob().isA((Job.BOWMAN)) || chr.getJob().isA(Job.THIEF) || chr.getJob().isA(Job.NIGHTWALKER1) || chr.getJob().isA(Job.WINDARCHER1) || chr.getJob() == Job.ARAN3 || chr.getJob() == Job.ARAN4 || chr.getJob() == Job.MARAUDER || chr.getJob() == Job.BUCCANEER;
 
-        if(chr.getBuffEffect(BuffStat.SHARP_EYES) != null) {
+        if (chr.getBuffEffect(BuffStat.SHARP_EYES) != null) {
             // Any class that has sharp eyes can crit. Also, since it stacks with normal crit go ahead
             // and calc it in.
 
@@ -729,41 +745,39 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
             calcDmgMax *= 1.4;
         }
 
-        boolean shadowPartner = false;
-        if(chr.getBuffEffect(BuffStat.SHADOWPARTNER) != null) {
-            shadowPartner = true;
-        }	
+        boolean shadowPartner = chr.getBuffEffect(BuffStat.SHADOWPARTNER) != null;
 
-        if(ret.skill != 0) {
+        if (ret.skill != 0) {
             int fixed = ret.getAttackEffect(chr, SkillFactory.getSkill(ret.skill)).getFixDamage();
-            if(fixed > 0)
+            if (fixed > 0) {
                 calcDmgMax = fixed;
             }
+        }
         for (int i = 0; i < ret.numAttacked; i++) {
             int oid = p.readInt();
             p.skip(14);
             List<Integer> allDamageNumbers = new ArrayList<>();
             Monster monster = chr.getMap().getMonsterByOid(oid);
 
-            if(chr.getBuffEffect(BuffStat.WK_CHARGE) != null) {
+            if (chr.getBuffEffect(BuffStat.WK_CHARGE) != null) {
                 // Charge, so now we need to check elemental effectiveness
                 int sourceID = chr.getBuffSource(BuffStat.WK_CHARGE);
                 int level = chr.getBuffedValue(BuffStat.WK_CHARGE);
-                if(monster != null) {
-                    if(sourceID == WhiteKnight.BW_FIRE_CHARGE || sourceID == WhiteKnight.SWORD_FIRE_CHARGE) {
-                        if(monster.getStats().getEffectiveness(Element.FIRE) == ElementalEffectiveness.WEAK) {
+                if (monster != null) {
+                    if (sourceID == WhiteKnight.BW_FIRE_CHARGE || sourceID == WhiteKnight.SWORD_FIRE_CHARGE) {
+                        if (monster.getStats().getEffectiveness(Element.FIRE) == ElementalEffectiveness.WEAK) {
                             calcDmgMax *= 1.05 + level * 0.015;
                         }
-                    } else if(sourceID == WhiteKnight.BW_ICE_CHARGE || sourceID == WhiteKnight.SWORD_ICE_CHARGE) {
-                        if(monster.getStats().getEffectiveness(Element.ICE) == ElementalEffectiveness.WEAK) {
+                    } else if (sourceID == WhiteKnight.BW_ICE_CHARGE || sourceID == WhiteKnight.SWORD_ICE_CHARGE) {
+                        if (monster.getStats().getEffectiveness(Element.ICE) == ElementalEffectiveness.WEAK) {
                             calcDmgMax *= 1.05 + level * 0.015;
                         }
-                    } else if(sourceID == WhiteKnight.BW_LIT_CHARGE || sourceID == WhiteKnight.SWORD_LIT_CHARGE) {
-                        if(monster.getStats().getEffectiveness(Element.LIGHTING) == ElementalEffectiveness.WEAK) {
+                    } else if (sourceID == WhiteKnight.BW_LIT_CHARGE || sourceID == WhiteKnight.SWORD_LIT_CHARGE) {
+                        if (monster.getStats().getEffectiveness(Element.LIGHTING) == ElementalEffectiveness.WEAK) {
                             calcDmgMax *= 1.05 + level * 0.015;
                         }
-                    } else if(sourceID == Paladin.BW_HOLY_CHARGE || sourceID == Paladin.SWORD_HOLY_CHARGE) {
-                        if(monster.getStats().getEffectiveness(Element.HOLY) == ElementalEffectiveness.WEAK) {
+                    } else if (sourceID == Paladin.BW_HOLY_CHARGE || sourceID == Paladin.SWORD_HOLY_CHARGE) {
+                        if (monster.getStats().getEffectiveness(Element.HOLY) == ElementalEffectiveness.WEAK) {
                             calcDmgMax *= 1.2 + level * 0.015;
                         }
                     }
@@ -774,15 +788,15 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
                 }
             }
 
-            if(ret.skill != 0) {
+            if (ret.skill != 0) {
                 Skill skill = SkillFactory.getSkill(ret.skill);
-                    if(skill.getElement() != Element.NEUTRAL && chr.getBuffedValue(BuffStat.ELEMENTAL_RESET) == null) {
+                if (skill.getElement() != Element.NEUTRAL && chr.getBuffedValue(BuffStat.ELEMENTAL_RESET) == null) {
                     // The skill has an element effect, so we need to factor that in.
-                        if(monster != null) {
+                    if (monster != null) {
                         ElementalEffectiveness eff = monster.getElementalEffectiveness(skill.getElement());
-                            if(eff == ElementalEffectiveness.WEAK) {
+                        if (eff == ElementalEffectiveness.WEAK) {
                             calcDmgMax *= 1.5;
-                            } else if(eff == ElementalEffectiveness.STRONG) {
+                        } else if (eff == ElementalEffectiveness.STRONG) {
                             //calcDmgMax *= 0.5;
                         }
                     } else {
@@ -791,17 +805,17 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
                         calcDmgMax *= 1.5;
                     }
                 }
-                    if(ret.skill == FPWizard.POISON_BREATH || ret.skill == FPMage.POISON_MIST || ret.skill == FPArchMage.FIRE_DEMON || ret.skill == ILArchMage.ICE_DEMON) {
-                            if(monster != null) {
+                if (ret.skill == FPWizard.POISON_BREATH || ret.skill == FPMage.POISON_MIST || ret.skill == FPArchMage.FIRE_DEMON || ret.skill == ILArchMage.ICE_DEMON) {
+                    if (monster != null) {
                         // Turns out poison is completely server side, so I don't know why I added this. >.<
                         //calcDmgMax = monster.getHp() / (70 - chr.getSkillLevel(skill));
                     }
-                    } else if(ret.skill == Hermit.SHADOW_WEB) {
-                            if(monster != null) {
+                } else if (ret.skill == Hermit.SHADOW_WEB) {
+                    if (monster != null) {
                         calcDmgMax = monster.getHp() / (50 - chr.getSkillLevel(skill));
                     }
-                    } else if(ret.skill == Hermit.SHADOW_MESO) {
-                            if(monster != null) {
+                } else if (ret.skill == Hermit.SHADOW_MESO) {
+                    if (monster != null) {
                         monster.debuffMob(Hermit.SHADOW_MESO);
                     }
                 } else if (ret.skill == Aran.BODY_PRESSURE) {
@@ -817,19 +831,20 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
             for (int j = 0; j < ret.numDamage; j++) {
                 int damage = p.readInt();
                 long hitDmgMax = calcDmgMax;
-                    if(ret.skill == Buccaneer.BARRAGE || ret.skill == ThunderBreaker.BARRAGE) {
-                        if(j > 3)
+                if (ret.skill == Buccaneer.BARRAGE || ret.skill == ThunderBreaker.BARRAGE) {
+                    if (j > 3) {
                         hitDmgMax *= Math.pow(2, (j - 3));
                     }
-                    if(shadowPartner) {
+                }
+                if (shadowPartner) {
                     // For shadow partner, the second half of the hits only do 50% damage. So calc that
                     // in for the crit effects.
-                            if(j >= ret.numDamage / 2) {
+                    if (j >= ret.numDamage / 2) {
                         hitDmgMax *= 0.5;
                     }
                 }
 
-                    if(ret.skill == Marksman.SNIPE) {
+                if (ret.skill == Marksman.SNIPE) {
                     damage = 195000 + Randomizer.nextInt(5000);
                     hitDmgMax = 200000;
                 } else if (ret.skill == Beginner.BAMBOO_RAIN || ret.skill == Noblesse.BAMBOO_RAIN || ret.skill == Evan.BAMBOO_THRUST || ret.skill == Legend.BAMBOO_THRUST) {
@@ -837,16 +852,18 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
                 }
 
                 long maxWithCrit = hitDmgMax;
-                    if(canCrit) // They can crit, so up the max.
+                if (canCrit) // They can crit, so up the max.
+                {
                     maxWithCrit *= 2;
+                }
 
                 // Warn if the damage is over 1.5x what we calculated above.
-                    if(damage > maxWithCrit * 1.5) {
+                if (damage > maxWithCrit * 1.5) {
                     AutobanFactory.DAMAGE_HACK.alert(chr, "DMG: " + damage + " MaxDMG: " + maxWithCrit + " SID: " + ret.skill + " MobID: " + (monster != null ? monster.getId() : "null") + " Map: " + chr.getMap().getMapName() + " (" + chr.getMapId() + ")");
                 }
 
                 // Add a ab point if its over 5x what we calculated.
-                    if(damage > maxWithCrit  * 5) {
+                if (damage > maxWithCrit * 5) {
                     AutobanFactory.DAMAGE_HACK.addPoint(chr.getAutobanManager(), "DMG: " + damage + " MaxDMG: " + maxWithCrit + " SID: " + ret.skill + " MobID: " + (monster != null ? monster.getId() : "null") + " Map: " + chr.getMap().getMapName() + " (" + chr.getMapId() + ")");
                 }
 

src/main/java/net/server/channel/handlers/AbstractMovementPacketHandler.java

@@ -36,7 +36,9 @@ public abstract class AbstractMovementPacketHandler extends AbstractPacketHandle
     protected List<LifeMovementFragment> parseMovement(InPacket p) throws EmptyMovementException {
         List<LifeMovementFragment> res = new ArrayList<>();
         byte numCommands = p.readByte();
-        if (numCommands < 1) throw new EmptyMovementException(p);
+        if (numCommands < 1) {
+            throw new EmptyMovementException(p);
+        }
         for (byte i = 0; i < numCommands; i++) {
             byte command = p.readByte();
             switch (command) {
@@ -148,7 +150,9 @@ public abstract class AbstractMovementPacketHandler extends AbstractPacketHandle
     protected void updatePosition(InPacket p, AnimatedMapObject target, int yOffset) throws EmptyMovementException {
 
         byte numCommands = p.readByte();
-        if (numCommands < 1) throw new EmptyMovementException(p);
+        if (numCommands < 1) {
+            throw new EmptyMovementException(p);
+        }
         for (byte i = 0; i < numCommands; i++) {
             byte command = p.readByte();
             switch (command) {

src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java

@@ -41,7 +41,6 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
 /**
- *
  * @author Jay Estrella
  * @author Ubaware
  */
@@ -49,7 +48,7 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, Client c) {
-        if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
+        if (!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
             return;
         }
         Character chr = c.getPlayer();
@@ -58,15 +57,17 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
         boolean accept = p.readByte() != 0;
         // String inviterName = slea.readMapleAsciiString();
         Character inviter = c.getWorldServer().getPlayerStorage().getCharacterById(inviterId);
-        if(inviter != null) {
+        if (inviter != null) {
             InviteResult inviteResult = InviteCoordinator.answerInvite(InviteType.FAMILY, c.getPlayer().getId(), c.getPlayer(), accept);
-            if(inviteResult.result == InviteResultType.NOT_FOUND) return; //was never invited. (or expired on server only somehow?)
-            if(accept) {
-                if(inviter.getFamily() != null) {
-                    if(chr.getFamily() == null) {
+            if (inviteResult.result == InviteResultType.NOT_FOUND) {
+                return; //was never invited. (or expired on server only somehow?)
+            }
+            if (accept) {
+                if (inviter.getFamily() != null) {
+                    if (chr.getFamily() == null) {
                         FamilyEntry newEntry = new FamilyEntry(inviter.getFamily(), chr.getId(), chr.getName(), chr.getLevel(), chr.getJob());
                         newEntry.setCharacter(chr);
-                        if(!newEntry.setSenior(inviter.getFamilyEntry(), true)) {
+                        if (!newEntry.setSenior(inviter.getFamilyEntry(), true)) {
                             inviter.sendPacket(PacketCreator.sendFamilyMessage(1, 0));
                             return;
                         } else {
@@ -77,8 +78,10 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
                     } else { //absorb target family
                         FamilyEntry targetEntry = chr.getFamilyEntry();
                         Family targetFamily = targetEntry.getFamily();
-                        if(targetFamily.getLeader() != targetEntry) return;
-                        if(inviter.getFamily().getTotalGenerations() + targetFamily.getTotalGenerations() <= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
+                        if (targetFamily.getLeader() != targetEntry) {
+                            return;
+                        }
+                        if (inviter.getFamily().getTotalGenerations() + targetFamily.getTotalGenerations() <= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
                             targetEntry.join(inviter.getFamilyEntry());
                         } else {
                             inviter.sendPacket(PacketCreator.sendFamilyMessage(76, 0));
@@ -87,7 +90,7 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
                         }
                     }
                 } else { // create new family
-                    if(chr.getFamily() != null && inviter.getFamily() != null && chr.getFamily().getTotalGenerations() + inviter.getFamily().getTotalGenerations() >= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
+                    if (chr.getFamily() != null && inviter.getFamily() != null && chr.getFamily().getTotalGenerations() + inviter.getFamily().getTotalGenerations() >= YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
                         inviter.sendPacket(PacketCreator.sendFamilyMessage(76, 0));
                         chr.sendPacket(PacketCreator.sendFamilyMessage(76, 0));
                         return;
@@ -98,7 +101,7 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
                     inviterEntry.setCharacter(inviter);
                     newFamily.setLeader(inviter.getFamilyEntry());
                     newFamily.addEntry(inviterEntry);
-                    if(chr.getFamily() == null) { //completely new family
+                    if (chr.getFamily() == null) { //completely new family
                         FamilyEntry newEntry = new FamilyEntry(newFamily, chr.getId(), chr.getName(), chr.getLevel(), chr.getJob());
                         newEntry.setCharacter(chr);
                         newEntry.setSenior(inviterEntry, true);
@@ -107,7 +110,7 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
                         insertNewFamilyRecord(chr.getId(), newFamily.getID(), inviter.getId(), false); // char was already saved from setSenior() above
                         newFamily.setMessage("", true);
                     } else { //new family for inviter, absorb invitee family
-                        insertNewFamilyRecord(inviter.getId(), newFamily.getID(), 0 , true);
+                        insertNewFamilyRecord(inviter.getId(), newFamily.getID(), 0, true);
                         newFamily.setMessage("", true);
                         chr.getFamilyEntry().join(inviterEntry);
                     }
@@ -124,27 +127,27 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
     }
 
     private static void insertNewFamilyRecord(int characterID, int familyID, int seniorID, boolean updateChar) {
-        try(Connection con = DatabaseConnection.getConnection()) {
-            try(PreparedStatement ps = con.prepareStatement("INSERT INTO family_character (cid, familyid, seniorid) VALUES (?, ?, ?)")) {
+        try (Connection con = DatabaseConnection.getConnection()) {
+            try (PreparedStatement ps = con.prepareStatement("INSERT INTO family_character (cid, familyid, seniorid) VALUES (?, ?, ?)")) {
                 ps.setInt(1, characterID);
                 ps.setInt(2, familyID);
                 ps.setInt(3, seniorID);
                 ps.executeUpdate();
-            } catch(SQLException e) {
+            } catch (SQLException e) {
                 FilePrinter.printError(FilePrinter.FAMILY_ERROR, e, "Could not save new family record for char id " + characterID + ".");
                 e.printStackTrace();
             }
-            if(updateChar) {
-                try(PreparedStatement ps = con.prepareStatement("UPDATE characters SET familyid = ? WHERE id = ?")) {
+            if (updateChar) {
+                try (PreparedStatement ps = con.prepareStatement("UPDATE characters SET familyid = ? WHERE id = ?")) {
                     ps.setInt(1, familyID);
                     ps.setInt(2, characterID);
                     ps.executeUpdate();
-                } catch(SQLException e) {
+                } catch (SQLException e) {
                     FilePrinter.printError(FilePrinter.FAMILY_ERROR, e, "Could not update 'characters' 'familyid' record for char id " + characterID + ".");
                     e.printStackTrace();
                 }
             }
-        } catch(SQLException e) {
+        } catch (SQLException e) {
             FilePrinter.printError(FilePrinter.FAMILY_ERROR, e, "Could not get connection to DB.");
             e.printStackTrace();
         }

src/main/java/net/server/channel/handlers/AdminChatHandler.java

@@ -9,7 +9,6 @@ import tools.LogHelper;
 import tools.PacketCreator;
 
 /**
- *
  * @author kevintjuh93
  */
 public class AdminChatHandler extends AbstractPacketHandler {

src/main/java/net/server/channel/handlers/AdminCommandHandler.java

@@ -176,7 +176,7 @@ public final class AdminCommandHandler extends AbstractPacketHandler {
                 }
                 break;
             default:
-                System.out.println("New GM packet encountered (MODE : " + mode + ": " + p.toString());
+                System.out.println("New GM packet encountered (MODE : " + mode + ": " + p);
                 break;
         }
     }

src/main/java/net/server/channel/handlers/AllianceOperationHandler.java

@@ -33,7 +33,6 @@ import net.server.guild.GuildPackets;
 import tools.PacketCreator;
 
 /**
- *
  * @author XoticStory, Ronan
  */
 public final class AllianceOperationHandler extends AbstractPacketHandler {
@@ -215,7 +214,9 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
 
     private void changePlayerAllianceRank(Alliance alliance, Character chr, boolean raise) {
         int newRank = chr.getAllianceRank() + (raise ? -1 : 1);
-        if(newRank < 3 || newRank > 5) return;
+        if (newRank < 3 || newRank > 5) {
+            return;
+        }
 
         chr.getMGC().setAllianceRank(newRank);
         chr.saveGuildStatus();

src/main/java/net/server/channel/handlers/AranComboHandler.java

@@ -53,7 +53,9 @@ public class AranComboHandler extends AbstractPacketHandler {
                 case 80:
                 case 90:
                 case 100:
-                    if (player.getJob().getId() != 2000 && (combo / 10) > skillLevel) break;
+                    if (player.getJob().getId() != 2000 && (combo / 10) > skillLevel) {
+                        break;
+                    }
                     SkillFactory.getSkill(Aran.COMBO_ABILITY).getEffect(combo / 10).applyComboBuff(player, combo);
                     break;
             }

src/main/java/net/server/channel/handlers/AutoAggroHandler.java

@@ -33,7 +33,9 @@ public final class AutoAggroHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, Client c) {
         Character player = c.getPlayer();
-        if (player.isHidden()) return; // Don't auto aggro GM's in hide...
+        if (player.isHidden()) {
+            return; // Don't auto aggro GM's in hide...
+        }
 
         MapleMap map = player.getMap();
         int oid = p.readInt();

src/main/java/net/server/channel/handlers/AutoAssignHandler.java

@@ -27,7 +27,6 @@ import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 /**
- *
  * @author Generic, Ronan
  */
 public class AutoAssignHandler extends AbstractPacketHandler {

src/main/java/net/server/channel/handlers/BeholderHandler.java

@@ -30,7 +30,6 @@ import server.maps.Summon;
 import java.util.Collection;
 
 /**
- *
  * @author BubblesDev
  */
 public final class BeholderHandler extends AbstractPacketHandler {//Summon Skills noobs

src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java

@@ -40,7 +40,7 @@ import static client.BuddyList.BuddyOperation.ADDED;
 
 public class BuddylistModifyHandler extends AbstractPacketHandler {
     private static class CharacterIdNameBuddyCapacity extends CharacterNameAndId {
-        private int buddyCapacity;
+        private final int buddyCapacity;
 
         public CharacterIdNameBuddyCapacity(int id, String name, int buddyCapacity) {
             super(id, name);

src/main/java/net/server/channel/handlers/CashOperationHandler.java

@@ -129,7 +129,9 @@ public final class CashOperationHandler extends AbstractPacketHandler {
                         ex.printStackTrace();
                     }
                     Character receiver = c.getChannelServer().getPlayerStorage().getCharacterByName(recipient.get("name"));
-                    if (receiver != null) receiver.showNote();
+                    if (receiver != null) {
+                        receiver.showNote();
+                    }
                 } else if (action == 0x05) { // Modify wish list
                     cs.clearWishList();
                     for (byte i = 0; i < 10; i++) {
@@ -262,9 +264,9 @@ public final class CashOperationHandler extends AbstractPacketHandler {
                         cs.removeFromInventory(item);
                         c.sendPacket(PacketCreator.takeFromCashInventory(item));
 
-                        if(item instanceof Equip) {
+                        if (item instanceof Equip) {
                             Equip equip = (Equip) item;
-                            if(equip.getRingId() >= 0) {
+                            if (equip.getRingId() >= 0) {
                                 Ring ring = Ring.loadFromDb(equip.getRingId());
                                 chr.addPlayerRing(ring);
                             }
@@ -316,7 +318,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
                                 return;
                             }*/ //Gotta let them faggots marry too, hence why this is commented out <3 
 
-                            if(itemRing.toItem() instanceof Equip) {
+                            if (itemRing.toItem() instanceof Equip) {
                                 Equip eqp = (Equip) itemRing.toItem();
                                 Pair<Integer, Integer> rings = Ring.createRing(itemRing.getItemId(), chr, partner);
                                 eqp.setRingId(rings.getLeft());
@@ -377,10 +379,10 @@ public final class CashOperationHandler extends AbstractPacketHandler {
                         String text = p.readString();
                         Character partner = c.getChannelServer().getPlayerStorage().getCharacterByName(sentTo);
                         if (partner == null) {
-                            c.sendPacket(PacketCreator.showCashShopMessage((byte)0xBE));
+                            c.sendPacket(PacketCreator.showCashShopMessage((byte) 0xBE));
                         } else {
                             // Need to check to make sure its actually an equip and the right SN...
-                            if(itemRing.toItem() instanceof Equip) {
+                            if (itemRing.toItem() instanceof Equip) {
                                 Equip eqp = (Equip) itemRing.toItem();
                                 Pair<Integer, Integer> rings = Ring.createRing(itemRing.getItemId(), chr, partner);
                                 eqp.setRingId(rings.getLeft());
@@ -405,59 +407,59 @@ public final class CashOperationHandler extends AbstractPacketHandler {
                 } else if (action == 0x2E) { //name change
                     CashItem cItem = CashItemFactory.getItem(p.readInt());
                     if (cItem == null || !canBuy(chr, cItem, cs.getCash(4))) {
-                        c.sendPacket(PacketCreator.showCashShopMessage((byte)0));
+                        c.sendPacket(PacketCreator.showCashShopMessage((byte) 0));
                         c.enableCSActions();
                         return;
                     }
-                    if(cItem.getSN() == 50600000 && YamlConfig.config.server.ALLOW_CASHSHOP_NAME_CHANGE) {
+                    if (cItem.getSN() == 50600000 && YamlConfig.config.server.ALLOW_CASHSHOP_NAME_CHANGE) {
                         p.readString(); //old name
                         String newName = p.readString();
-                        if(!Character.canCreateChar(newName) || chr.getLevel() < 10) { //(longest ban duration isn't tracked currently)
-                            c.sendPacket(PacketCreator.showCashShopMessage((byte)0));
+                        if (!Character.canCreateChar(newName) || chr.getLevel() < 10) { //(longest ban duration isn't tracked currently)
+                            c.sendPacket(PacketCreator.showCashShopMessage((byte) 0));
                             c.enableCSActions();
                             return;
-                        } else if(c.getTempBanCalendar() != null && c.getTempBanCalendar().getTimeInMillis() + (30*24*60*60*1000) > Calendar.getInstance().getTimeInMillis()) {
-                            c.sendPacket(PacketCreator.showCashShopMessage((byte)0));
+                        } else if (c.getTempBanCalendar() != null && c.getTempBanCalendar().getTimeInMillis() + (30 * 24 * 60 * 60 * 1000) > Calendar.getInstance().getTimeInMillis()) {
+                            c.sendPacket(PacketCreator.showCashShopMessage((byte) 0));
                             c.enableCSActions();
                             return;
                         }
-                        if(chr.registerNameChange(newName)) { //success
+                        if (chr.registerNameChange(newName)) { //success
                             Item item = cItem.toItem();
                             c.sendPacket(PacketCreator.showNameChangeSuccess(item, c.getAccID()));
                             cs.gainCash(4, cItem, chr.getWorld());
                             cs.addToInventory(item);
                         } else {
-                            c.sendPacket(PacketCreator.showCashShopMessage((byte)0));
+                            c.sendPacket(PacketCreator.showCashShopMessage((byte) 0));
                         }
                     }
                     c.enableCSActions();
-                } else if(action == 0x31) { //world transfer
+                } else if (action == 0x31) { //world transfer
                     CashItem cItem = CashItemFactory.getItem(p.readInt());
                     if (cItem == null || !canBuy(chr, cItem, cs.getCash(4))) {
-                        c.sendPacket(PacketCreator.showCashShopMessage((byte)0));
+                        c.sendPacket(PacketCreator.showCashShopMessage((byte) 0));
                         c.enableCSActions();
                         return;
                     }
-                    if(cItem.getSN() == 50600001 && YamlConfig.config.server.ALLOW_CASHSHOP_WORLD_TRANSFER) {
+                    if (cItem.getSN() == 50600001 && YamlConfig.config.server.ALLOW_CASHSHOP_WORLD_TRANSFER) {
                         int newWorldSelection = p.readInt();
 
                         int worldTransferError = chr.checkWorldTransferEligibility();
-                        if(worldTransferError != 0 || newWorldSelection >= Server.getInstance().getWorldsSize() || Server.getInstance().getWorldsSize() <= 1) {
-                            c.sendPacket(PacketCreator.showCashShopMessage((byte)0));
+                        if (worldTransferError != 0 || newWorldSelection >= Server.getInstance().getWorldsSize() || Server.getInstance().getWorldsSize() <= 1) {
+                            c.sendPacket(PacketCreator.showCashShopMessage((byte) 0));
                             return;
-                        } else if(newWorldSelection == c.getWorld()) {
-                            c.sendPacket(PacketCreator.showCashShopMessage((byte)0xDC));
+                        } else if (newWorldSelection == c.getWorld()) {
+                            c.sendPacket(PacketCreator.showCashShopMessage((byte) 0xDC));
                             return;
-                        } else if(c.getAvailableCharacterWorldSlots(newWorldSelection) < 1 || Server.getInstance().getAccountWorldCharacterCount(c.getAccID(), newWorldSelection) >= 3) {
-                            c.sendPacket(PacketCreator.showCashShopMessage((byte)0xDF));
+                        } else if (c.getAvailableCharacterWorldSlots(newWorldSelection) < 1 || Server.getInstance().getAccountWorldCharacterCount(c.getAccID(), newWorldSelection) >= 3) {
+                            c.sendPacket(PacketCreator.showCashShopMessage((byte) 0xDF));
                             return;
-                        } else if(chr.registerWorldTransfer(newWorldSelection)) {
+                        } else if (chr.registerWorldTransfer(newWorldSelection)) {
                             Item item = cItem.toItem();
                             c.sendPacket(PacketCreator.showWorldTransferSuccess(item, c.getAccID()));
                             cs.gainCash(4, cItem, chr.getWorld());
                             cs.addToInventory(item);
                         } else {
-                            c.sendPacket(PacketCreator.showCashShopMessage((byte)0));
+                            c.sendPacket(PacketCreator.showCashShopMessage((byte) 0));
                         }
                     }
                     c.enableCSActions();

src/main/java/net/server/channel/handlers/CashShopSurpriseHandler.java

@@ -28,7 +28,6 @@ import tools.PacketCreator;
 import tools.Pair;
 
 /**
- *
  * @author RonanLana
  */
 public class CashShopSurpriseHandler extends AbstractPacketHandler {
@@ -36,10 +35,10 @@ public class CashShopSurpriseHandler extends AbstractPacketHandler {
     public final void handlePacket(InPacket p, Client c) {
         CashShop cs = c.getPlayer().getCashShop();
 
-        if(cs.isOpened()) {
+        if (cs.isOpened()) {
             Pair<Item, Item> cssResult = cs.openCashShopSurprise();
 
-            if(cssResult != null) {
+            if (cssResult != null) {
                 Item cssItem = cssResult.getLeft(), cssBox = cssResult.getRight();
                 c.sendPacket(PacketCreator.onCashGachaponOpenSuccess(c.getAccID(), cssBox.getSN(), cssBox.getQuantity(), cssItem, cssItem.getItemId(), cssItem.getQuantity(), true));
             } else {

src/main/java/net/server/channel/handlers/ChangeChannelHandler.java

@@ -28,7 +28,6 @@ import net.packet.InPacket;
 import net.server.Server;
 
 /**
- *
  * @author Matze
  */
 public final class ChangeChannelHandler extends AbstractPacketHandler {
@@ -38,7 +37,7 @@ public final class ChangeChannelHandler extends AbstractPacketHandler {
         int channel = p.readByte() + 1;
         p.readInt();
         c.getPlayer().getAutobanManager().setTimestamp(6, Server.getInstance().getCurrentTimestamp(), 3);
-        if(c.getChannel() == channel) {
+        if (c.getChannel() == channel) {
             AutobanFactory.GENERAL.alert(c.getPlayer(), "CCing to same channel.");
             c.disconnect(false, false);
             return;

src/main/java/net/server/channel/handlers/ChangeMapHandler.java

@@ -46,7 +46,7 @@ public final class ChangeMapHandler extends AbstractPacketHandler {
 
         if (chr.isChangingMaps() || chr.isBanned()) {
             if (chr.isChangingMaps()) {
-                FilePrinter.printError(FilePrinter.PORTAL_STUCK + chr.getName() + ".txt", "Player " + chr.getName() + " got stuck when changing maps. Timestamp: " + Calendar.getInstance().getTime().toString() + " Last visited mapids: " + chr.getLastVisitedMapids());
+                FilePrinter.printError(FilePrinter.PORTAL_STUCK + chr.getName() + ".txt", "Player " + chr.getName() + " got stuck when changing maps. Timestamp: " + Calendar.getInstance().getTime() + " Last visited mapids: " + chr.getLastVisitedMapids());
             }
 
             c.sendPacket(PacketCreator.enableActions());

src/main/java/net/server/channel/handlers/CharInfoRequestHandler.java

@@ -39,7 +39,7 @@ public final class CharInfoRequestHandler extends AbstractPacketHandler {
             if (target instanceof Character) {
                 Character player = (Character) target;
 
-                if(c.getPlayer().getId() != player.getId()) {
+                if (c.getPlayer().getId() != player.getId()) {
                     player.exportExcludedItems(c);
                 }
                 c.sendPacket(PacketCreator.charInfo(player));

src/main/java/net/server/channel/handlers/ClickGuideHandler.java

@@ -29,7 +29,6 @@ import net.packet.InPacket;
 import scripting.npc.NPCScriptManager;
 
 /**
- *
  * @author kevintjuh93
  */
 public class ClickGuideHandler extends AbstractPacketHandler {

src/main/java/net/server/channel/handlers/CloseChalkboardHandler.java

@@ -27,7 +27,6 @@ import net.packet.InPacket;
 import tools.PacketCreator;
 
 /**
- *
  * @author Xterminator
  */
 public final class CloseChalkboardHandler extends AbstractPacketHandler {

src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java

@@ -49,7 +49,7 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
 
         AttackInfo attack = parseDamage(p, chr, false, false);
         if (chr.getBuffEffect(BuffStat.MORPH) != null) {
-            if(chr.getBuffEffect(BuffStat.MORPH).isMorphWithoutAttack()) {
+            if (chr.getBuffEffect(BuffStat.MORPH).isMorphWithoutAttack()) {
                 // How are they attacking when the client won't let them?
                 chr.getClient().disconnect(false, false);
                 return;
@@ -57,7 +57,9 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
         }
 
         if (chr.getDojoEnergy() < 10000 && (attack.skill == 1009 || attack.skill == 10001009 || attack.skill == 20001009)) // PE hacking or maybe just lagging
+        {
             return;
+        }
         if (GameConstants.isDojo(chr.getMap().getId()) && attack.numAttacked > 0) {
             chr.setDojoEnergy(chr.getDojoEnergy() + YamlConfig.config.server.DOJO_ENERGY_ATK);
             c.sendPacket(PacketCreator.getEnergy("energy", chr.getDojoEnergy()));
@@ -84,12 +86,17 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
                     ceffect = advcombo.getEffect(advComboSkillLevel);
                 } else {
                     int comboLv = chr.getSkillLevel(combo);
-                    if(comboLv <= 0 || chr.isGM()) comboLv = SkillFactory.getSkill(oid).getMaxLevel();
-                    
-                    if(comboLv > 0) ceffect = combo.getEffect(comboLv);
-                    else ceffect = null;
+                    if (comboLv <= 0 || chr.isGM()) {
+                        comboLv = SkillFactory.getSkill(oid).getMaxLevel();
                     }
-                if(ceffect != null) {
+
+                    if (comboLv > 0) {
+                        ceffect = combo.getEffect(comboLv);
+                    } else {
+                        ceffect = null;
+                    }
+                }
+                if (ceffect != null) {
                     if (orbcount < ceffect.getX() + 1) {
                         int neworbcount = orbcount + 1;
                         if (advComboSkillLevel > 0 && ceffect.makeChanceResult()) {
@@ -99,7 +106,9 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
                         }
 
                         int olv = chr.getSkillLevel(oid);
-                        if(olv <= 0) olv = SkillFactory.getSkill(oid).getMaxLevel();
+                        if (olv <= 0) {
+                            olv = SkillFactory.getSkill(oid).getMaxLevel();
+                        }
 
                         int duration = combo.getEffect(olv).getDuration();
                         List<Pair<BuffStat, Integer>> stat = Collections.singletonList(new Pair<>(BuffStat.COMBO, neworbcount));
@@ -164,7 +173,7 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
         if ((chr.getSkillLevel(SkillFactory.getSkill(NightWalker.VANISH)) > 0 || chr.getSkillLevel(SkillFactory.getSkill(Rogue.DARK_SIGHT)) > 0) && chr.getBuffedValue(BuffStat.DARKSIGHT) != null) {// && chr.getBuffSource(BuffStat.DARKSIGHT) != 9101004
             chr.cancelEffectFromBuffStat(BuffStat.DARKSIGHT);
             chr.cancelBuffStats(BuffStat.DARKSIGHT);
-        } else if(chr.getSkillLevel(SkillFactory.getSkill(WindArcher.WIND_WALK)) > 0 && chr.getBuffedValue(BuffStat.WIND_WALK) != null) {
+        } else if (chr.getSkillLevel(SkillFactory.getSkill(WindArcher.WIND_WALK)) > 0 && chr.getBuffedValue(BuffStat.WIND_WALK) != null) {
             chr.cancelEffectFromBuffStat(BuffStat.WIND_WALK);
             chr.cancelBuffStats(BuffStat.WIND_WALK);
         }

src/main/java/net/server/channel/handlers/CoconutHandler.java

@@ -31,7 +31,6 @@ import server.maps.MapleMap;
 import tools.PacketCreator;
 
 /**
- *
  * @author kevintjuh93
  */
 public final class CoconutHandler extends AbstractPacketHandler {
@@ -44,13 +43,13 @@ public final class CoconutHandler extends AbstractPacketHandler {
         MapleMap map = c.getPlayer().getMap();
         Coconut event = map.getCoconut();
         Coconuts nut = event.getCoconut(id);
-		if (!nut.isHittable()){
+        if (!nut.isHittable()) {
             return;
         }
-		if (event == null){
+        if (event == null) {
             return;
         }
-		if (currentServerTime() < nut.getHitTime()){
+        if (currentServerTime() < nut.getHitTime()) {
             return;
         }
         if (nut.getHits() > 2 && Math.random() < 0.4) {

src/main/java/net/server/channel/handlers/CouponCodeHandler.java

@@ -45,7 +45,6 @@ import java.util.*;
 import java.util.Map.Entry;
 
 /**
- *
  * @author Penguins (Acrylic)
  * @author Ronan (HeavenMS)
  */
@@ -250,11 +249,11 @@ public final class CouponCodeHandler extends AbstractPacketHandler {
                                 break;
                         }
                     }
-                    if(cashItems.size() > 255) {
+                    if (cashItems.size() > 255) {
                         List<Item> oldList = cashItems;
                         cashItems = Arrays.asList(new Item[255]);
                         int index = 0;
-                        for(Item item : oldList) {
+                        for (Item item : oldList) {
                             cashItems.set(index, item);
                             index++;
                         }

src/main/java/net/server/channel/handlers/DamageSummonHandler.java

@@ -41,7 +41,7 @@ public final class DamageSummonHandler extends AbstractPacketHandler {
         Character player = c.getPlayer();
         MapObject mmo = player.getMap().getMapObject(oid);
 
-        if(mmo != null && mmo instanceof Summon) {
+        if (mmo != null && mmo instanceof Summon) {
             Summon summon = (Summon) mmo;
 
             summon.addHP(-damage);

src/main/java/net/server/channel/handlers/DenyGuildRequestHandler.java

@@ -28,7 +28,6 @@ import net.packet.InPacket;
 import net.server.guild.Guild;
 
 /**
- *
  * @author Xterminator
  */
 public final class DenyGuildRequestHandler extends AbstractPacketHandler {

src/main/java/net/server/channel/handlers/DoorHandler.java

@@ -30,7 +30,6 @@ import server.maps.MapObject;
 import tools.PacketCreator;
 
 /**
- *
  * @author Matze
  */
 public final class DoorHandler extends AbstractPacketHandler {

src/main/java/net/server/channel/handlers/DueyHandler.java

@@ -32,7 +32,7 @@ public final class DueyHandler extends AbstractPacketHandler {
 
     @Override
     public final void handlePacket(InPacket p, Client c) {
-    	if (!YamlConfig.config.server.USE_DUEY){
+        if (!YamlConfig.config.server.USE_DUEY) {
             c.sendPacket(PacketCreator.enableActions());
             return;
         }

src/main/java/net/server/channel/handlers/EnterCashShopHandler.java

@@ -30,7 +30,6 @@ import server.maps.MiniDungeonInfo;
 import tools.PacketCreator;
 
 /**
- *
  * @author Flav
  */
 public class EnterCashShopHandler extends AbstractPacketHandler {
@@ -44,13 +43,13 @@ public class EnterCashShopHandler extends AbstractPacketHandler {
                 return;
             }
 
-            if(mc.getEventInstance() != null) {
+            if (mc.getEventInstance() != null) {
                 c.sendPacket(PacketCreator.serverNotice(5, "Entering Cash Shop or MTS are disabled when registered on an event."));
                 c.sendPacket(PacketCreator.enableActions());
                 return;
             }
 
-            if(MiniDungeonInfo.isDungeonMap(mc.getMapId())) {
+            if (MiniDungeonInfo.isDungeonMap(mc.getMapId())) {
                 c.sendPacket(PacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon."));
                 c.sendPacket(PacketCreator.enableActions());
                 return;

src/main/java/net/server/channel/handlers/EnterMTSHandler.java

@@ -49,7 +49,7 @@ public final class EnterMTSHandler extends AbstractPacketHandler {
     public final void handlePacket(InPacket p, Client c) {
         Character chr = c.getPlayer();
 
-        if(!chr.isAlive() && YamlConfig.config.server.USE_BUYBACK_SYSTEM) {
+        if (!chr.isAlive() && YamlConfig.config.server.USE_BUYBACK_SYSTEM) {
             BuybackProcessor.processBuyback(c);
             c.sendPacket(PacketCreator.enableActions());
         } else {
@@ -58,13 +58,13 @@ public final class EnterMTSHandler extends AbstractPacketHandler {
                 return;
             }
 
-            if(chr.getEventInstance() != null) {
+            if (chr.getEventInstance() != null) {
                 c.sendPacket(PacketCreator.serverNotice(5, "Entering Cash Shop or MTS are disabled when registered on an event."));
                 c.sendPacket(PacketCreator.enableActions());
                 return;
             }
 
-            if(MiniDungeonInfo.isDungeonMap(chr.getMapId())) {
+            if (MiniDungeonInfo.isDungeonMap(chr.getMapId())) {
                 c.sendPacket(PacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon."));
                 c.sendPacket(PacketCreator.enableActions());
                 return;

src/main/java/net/server/channel/handlers/FaceExpressionHandler.java

@@ -42,7 +42,7 @@ public final class FaceExpressionHandler extends AbstractPacketHandler {
             return;
         }
 
-        if(c.tryacquireClient()) {
+        if (c.tryacquireClient()) {
             try {   // expecting players never intends to wear the emote 0 (default face, that changes back after 5sec timeout)
                 if (chr.isLoggedinWorld()) {
                     chr.changeFaceExpression(emote);

src/main/java/net/server/channel/handlers/FamilyAddHandler.java

@@ -31,34 +31,33 @@ import net.server.coordinator.world.InviteCoordinator.InviteType;
 import tools.PacketCreator;
 
 /**
- *
  * @author Jay Estrella
  * @author Ubaware
  */
 public final class FamilyAddHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, Client c) {
-        if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
+        if (!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
             return;
         }
         String toAdd = p.readString();
         Character addChr = c.getChannelServer().getPlayerStorage().getCharacterByName(toAdd);
         Character chr = c.getPlayer();
-        if(addChr == null) {
+        if (addChr == null) {
             c.sendPacket(PacketCreator.sendFamilyMessage(65, 0));
-        } else if(addChr == chr) { //only possible through packet editing/client editing i think?
+        } else if (addChr == chr) { //only possible through packet editing/client editing i think?
             c.sendPacket(PacketCreator.enableActions());
-        } else if(addChr.getMap() != chr.getMap() || (addChr.isHidden()) && chr.gmLevel() < addChr.gmLevel()) {
+        } else if (addChr.getMap() != chr.getMap() || (addChr.isHidden()) && chr.gmLevel() < addChr.gmLevel()) {
             c.sendPacket(PacketCreator.sendFamilyMessage(69, 0));
-        } else if(addChr.getLevel() <= 10) {
+        } else if (addChr.getLevel() <= 10) {
             c.sendPacket(PacketCreator.sendFamilyMessage(77, 0));
-        } else if(Math.abs(addChr.getLevel() - chr.getLevel()) > 20) {
+        } else if (Math.abs(addChr.getLevel() - chr.getLevel()) > 20) {
             c.sendPacket(PacketCreator.sendFamilyMessage(72, 0));
-        } else if(addChr.getFamily() != null && addChr.getFamily() == chr.getFamily()) { //same family
+        } else if (addChr.getFamily() != null && addChr.getFamily() == chr.getFamily()) { //same family
             c.sendPacket(PacketCreator.enableActions());
-        } else if(InviteCoordinator.hasInvite(InviteType.FAMILY, addChr.getId())) {
+        } else if (InviteCoordinator.hasInvite(InviteType.FAMILY, addChr.getId())) {
             c.sendPacket(PacketCreator.sendFamilyMessage(73, 0));
-        } else if(chr.getFamily() != null && addChr.getFamily() != null && addChr.getFamily().getTotalGenerations() + chr.getFamily().getTotalGenerations() > YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
+        } else if (chr.getFamily() != null && addChr.getFamily() != null && addChr.getFamily().getTotalGenerations() + chr.getFamily().getTotalGenerations() > YamlConfig.config.server.FAMILY_MAX_GENERATIONS) {
             c.sendPacket(PacketCreator.sendFamilyMessage(76, 0));
         } else {
             InviteCoordinator.createInvite(InviteType.FAMILY, chr, addChr, addChr.getId());

src/main/java/net/server/channel/handlers/FamilyPreceptsHandler.java

@@ -11,10 +11,16 @@ public class FamilyPreceptsHandler extends AbstractPacketHandler {
     @Override
     public void handlePacket(InPacket p, Client c) {
         Family family = c.getPlayer().getFamily();
-        if(family == null) return;
-        if(family.getLeader().getChr() != c.getPlayer()) return; //only the leader can set the precepts
+        if (family == null) {
+            return;
+        }
+        if (family.getLeader().getChr() != c.getPlayer()) {
+            return; //only the leader can set the precepts
+        }
         String newPrecepts = p.readString();
-        if(newPrecepts.length() > 200) return;
+        if (newPrecepts.length() > 200) {
+            return;
+        }
         family.setMessage(newPrecepts, true);
         //family.broadcastFamilyInfoUpdate(); //probably don't need to broadcast for this?
         c.sendPacket(PacketCreator.getFamilyInfo(c.getPlayer().getFamilyEntry()));

src/main/java/net/server/channel/handlers/FamilySeparateHandler.java

@@ -31,34 +31,46 @@ public class FamilySeparateHandler extends AbstractPacketHandler {
 
     @Override
     public void handlePacket(InPacket p, Client c) {
-        if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return;
+        if (!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
+            return;
+        }
         Family oldFamily = c.getPlayer().getFamily();
-        if(oldFamily == null) return;
+        if (oldFamily == null) {
+            return;
+        }
         FamilyEntry forkOn = null;
         boolean isSenior;
-        if(p.available() > 0) { //packet 0x95 doesn't send id, since there is only one senior
+        if (p.available() > 0) { //packet 0x95 doesn't send id, since there is only one senior
             forkOn = c.getPlayer().getFamily().getEntryByID(p.readInt());
-            if(!c.getPlayer().getFamilyEntry().isJunior(forkOn)) return; //packet editing?
+            if (!c.getPlayer().getFamilyEntry().isJunior(forkOn)) {
+                return; //packet editing?
+            }
             isSenior = true;
         } else {
             forkOn = c.getPlayer().getFamilyEntry();
             isSenior = false;
         }
-        if(forkOn == null) return;
+        if (forkOn == null) {
+            return;
+        }
 
         FamilyEntry senior = forkOn.getSenior();
-        if(senior == null) return;
+        if (senior == null) {
+            return;
+        }
         int levelDiff = Math.abs(c.getPlayer().getLevel() - senior.getLevel());
         int cost = 2500 * levelDiff;
         cost += levelDiff * levelDiff;
-        if(c.getPlayer().getMeso() < cost) {
+        if (c.getPlayer().getMeso() < cost) {
             c.sendPacket(PacketCreator.sendFamilyMessage(isSenior ? 81 : 80, cost));
             return;
         }
         c.getPlayer().gainMeso(-cost);
         int repCost = separateRepCost(forkOn);
         senior.gainReputation(-repCost, false);
-        if(senior.getSenior() != null) senior.getSenior().gainReputation(-(repCost/2), false);
+        if (senior.getSenior() != null) {
+            senior.getSenior().gainReputation(-(repCost / 2), false);
+        }
         forkOn.announceToSenior(PacketCreator.serverNotice(5, forkOn.getName() + " has left the family."), true);
         forkOn.fork();
         c.sendPacket(PacketCreator.getFamilyInfo(forkOn)); //pedigree info will be requested from the client if the window is open

src/main/java/net/server/channel/handlers/FamilySummonResponseHandler.java

@@ -18,16 +18,22 @@ public class FamilySummonResponseHandler extends AbstractPacketHandler {
 
     @Override
     public void handlePacket(InPacket p, Client c) {
-        if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return;
+        if (!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
+            return;
+        }
         p.readString(); //family name
         boolean accept = p.readByte() != 0;
         InviteResult inviteResult = InviteCoordinator.answerInvite(InviteType.FAMILY_SUMMON, c.getPlayer().getId(), c.getPlayer(), accept);
-        if(inviteResult.result == InviteResultType.NOT_FOUND) return;
+        if (inviteResult.result == InviteResultType.NOT_FOUND) {
+            return;
+        }
         Character inviter = inviteResult.from;
         FamilyEntry inviterEntry = inviter.getFamilyEntry();
-        if(inviterEntry == null) return;
+        if (inviterEntry == null) {
+            return;
+        }
         MapleMap map = (MapleMap) inviteResult.params[0];
-        if(accept && inviter.getMap() == map) { //cancel if inviter has changed maps
+        if (accept && inviter.getMap() == map) { //cancel if inviter has changed maps
             c.getPlayer().changeMap(map, map.getPortal(0));
         } else {
             inviterEntry.refundEntitlement(FamilyEntitlement.SUMMON_FAMILY);

src/main/java/net/server/channel/handlers/FamilyUseHandler.java

@@ -35,33 +35,32 @@ import server.maps.MapleMap;
 import tools.PacketCreator;
 
 /**
- *
  * @author Moogra
  * @author Ubaware
  */
 public final class FamilyUseHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, Client c) {
-        if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
+        if (!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
             return;
         }
         FamilyEntitlement type = FamilyEntitlement.values()[p.readInt()];
         int cost = type.getRepCost();
         FamilyEntry entry = c.getPlayer().getFamilyEntry();
-        if(entry.getReputation() < cost || entry.isEntitlementUsed(type)) {
+        if (entry.getReputation() < cost || entry.isEntitlementUsed(type)) {
             return; // shouldn't even be able to request it
         }
         c.sendPacket(PacketCreator.getFamilyInfo(entry));
         Character victim;
-        if(type == FamilyEntitlement.FAMILY_REUINION || type == FamilyEntitlement.SUMMON_FAMILY) {
+        if (type == FamilyEntitlement.FAMILY_REUINION || type == FamilyEntitlement.SUMMON_FAMILY) {
             victim = c.getChannelServer().getPlayerStorage().getCharacterByName(p.readString());
-            if(victim != null && victim != c.getPlayer()) {
-                if(victim.getFamily() == c.getPlayer().getFamily()) {
+            if (victim != null && victim != c.getPlayer()) {
+                if (victim.getFamily() == c.getPlayer().getFamily()) {
                     MapleMap targetMap = victim.getMap();
                     MapleMap ownMap = c.getPlayer().getMap();
-                    if(targetMap != null) {
-                        if(type == FamilyEntitlement.FAMILY_REUINION) {
-                            if(!FieldLimit.CANNOTMIGRATE.check(ownMap.getFieldLimit()) && !FieldLimit.CANNOTVIPROCK.check(targetMap.getFieldLimit())
+                    if (targetMap != null) {
+                        if (type == FamilyEntitlement.FAMILY_REUINION) {
+                            if (!FieldLimit.CANNOTMIGRATE.check(ownMap.getFieldLimit()) && !FieldLimit.CANNOTVIPROCK.check(targetMap.getFieldLimit())
                                     && (targetMap.getForcedReturnId() == 999999999 || targetMap.getId() < 100000000) && targetMap.getEventInstance() == null) {
 
                                 c.getPlayer().changeMap(victim.getMap(), victim.getMap().getPortal(0));
@@ -71,10 +70,10 @@ public final class FamilyUseHandler extends AbstractPacketHandler {
                                 return;
                             }
                         } else {
-                            if(!FieldLimit.CANNOTMIGRATE.check(targetMap.getFieldLimit()) && !FieldLimit.CANNOTVIPROCK.check(ownMap.getFieldLimit()) 
+                            if (!FieldLimit.CANNOTMIGRATE.check(targetMap.getFieldLimit()) && !FieldLimit.CANNOTVIPROCK.check(ownMap.getFieldLimit())
                                     && (ownMap.getForcedReturnId() == 999999999 || ownMap.getId() < 100000000) && ownMap.getEventInstance() == null) {
 
-                                if(InviteCoordinator.hasInvite(InviteType.FAMILY_SUMMON, victim.getId())) {
+                                if (InviteCoordinator.hasInvite(InviteType.FAMILY_SUMMON, victim.getId())) {
                                     c.sendPacket(PacketCreator.sendFamilyMessage(74, 0));
                                     return;
                                 }
@@ -91,7 +90,7 @@ public final class FamilyUseHandler extends AbstractPacketHandler {
                     c.sendPacket(PacketCreator.sendFamilyMessage(67, 0));
                 }
             }
-        } else if(type == FamilyEntitlement.FAMILY_BONDING) {
+        } else if (type == FamilyEntitlement.FAMILY_BONDING) {
             //not implemented
         } else {
             boolean party = false;
@@ -99,7 +98,7 @@ public final class FamilyUseHandler extends AbstractPacketHandler {
             float rate = 1.5f;
             int duration = 15;
             do {
-                switch(type) {
+                switch (type) {
                     case PARTY_EXP_2_30MIN:
                         party = true;
                         isExp = true;
@@ -125,13 +124,13 @@ public final class FamilyUseHandler extends AbstractPacketHandler {
                         break;
                 }
                 break;
-            } while(true);
+            } while (true);
             //not implemented
         }
     }
 
     private boolean useEntitlement(FamilyEntry entry, FamilyEntitlement entitlement) {
-        if(entry.useEntitlement(entitlement)) {
+        if (entry.useEntitlement(entitlement)) {
             entry.gainReputation(-entitlement.getRepCost(), false);
             entry.getChr().sendPacket(PacketCreator.getFamilyInfo(entry));
             return true;

src/main/java/net/server/channel/handlers/FredrickHandler.java

@@ -28,7 +28,6 @@ import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 /**
- *
  * @author kevintjuh93
  */
 public class FredrickHandler extends AbstractPacketHandler {

src/main/java/net/server/channel/handlers/GeneralChatHandler.java

@@ -37,7 +37,7 @@ public final class GeneralChatHandler extends AbstractPacketHandler {
     public final void handlePacket(InPacket p, Client c) {
         String s = p.readString();
         Character chr = c.getPlayer();
-                if(chr.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
+        if (chr.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
             c.sendPacket(PacketCreator.enableActions());
             return;
         }
@@ -52,7 +52,7 @@ public final class GeneralChatHandler extends AbstractPacketHandler {
             CommandsExecutor.getInstance().handle(c, s);
         } else if (heading != '/') {
             int show = p.readByte();
-                        if(chr.getMap().isMuted() && !chr.isGM()) {
+            if (chr.getMap().isMuted() && !chr.isGM()) {
                 chr.dropMessage(5, "The map you are in is currently muted. Please try again later.");
                 return;
             }

src/main/java/net/server/channel/handlers/GuildOperationHandler.java

@@ -111,7 +111,8 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
                 GuildResponse mgr = Guild.sendInvitation(c, targetName);
                 if (mgr != null) {
                     c.sendPacket(mgr.getPacket(targetName));
-                } else {} // already sent invitation, do nothing
+                } else {
+                } // already sent invitation, do nothing
 
                 break;
             case 0x06:
@@ -144,7 +145,9 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
                 c.sendPacket(GuildPackets.showGuildInfo(mc));
 
                 allianceId = mc.getGuild().getAllianceId();
-                if(allianceId > 0) Server.getInstance().getAlliance(allianceId).updateAlliancePackets(mc);
+                if (allianceId > 0) {
+                    Server.getInstance().getAlliance(allianceId).updateAlliancePackets(mc);
+                }
 
                 mc.saveGuildStatus(); // update database
                 mc.getMap().broadcastPacket(mc, GuildPackets.guildNameChanged(mc.getId(), mc.getGuild().getName())); // thanks Vcoc for pointing out an issue with updating guild tooltip to players in the map
@@ -164,7 +167,9 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
                 Server.getInstance().leaveGuild(mc.getMGC());
 
                 c.sendPacket(GuildPackets.showGuildInfo(null));
-                if(allianceId > 0) Server.getInstance().getAlliance(allianceId).updateAlliancePackets(mc);
+                if (allianceId > 0) {
+                    Server.getInstance().getAlliance(allianceId).updateAlliancePackets(mc);
+                }
 
                 mc.getMGC().setGuildId(0);
                 mc.getMGC().setGuildRank(5);
@@ -182,7 +187,9 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
                 }
 
                 Server.getInstance().expelMember(mc.getMGC(), name, cid);
-                if(allianceId > 0) Server.getInstance().getAlliance(allianceId).updateAlliancePackets(mc);
+                if (allianceId > 0) {
+                    Server.getInstance().getAlliance(allianceId).updateAlliancePackets(mc);
+                }
                 break;
             case 0x0d:
                 if (mc.getGuildId() <= 0 || mc.getGuildRank() != 1) {
@@ -234,7 +241,9 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
                 break;
             case 0x10:
                 if (mc.getGuildId() <= 0 || mc.getGuildRank() > 2) {
-                    if(mc.getGuildId() <= 0) System.out.println("[Hack] " + mc.getName() + " tried to change guild notice while not in a guild.");
+                    if (mc.getGuildId() <= 0) {
+                        System.out.println("[Hack] " + mc.getName() + " tried to change guild notice while not in a guild.");
+                    }
                     return;
                 }
                 String notice = p.readString();
@@ -270,7 +279,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
 
                 break;
             default:
-                System.out.println("Unhandled GUILD_OPERATION packet: \n" + p.toString());
+                System.out.println("Unhandled GUILD_OPERATION packet: \n" + p);
         }
     }
 }

src/main/java/net/server/channel/handlers/HealOvertimeHandler.java

@@ -35,7 +35,9 @@ public final class HealOvertimeHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, Client c) {
         Character chr = c.getPlayer();
-        if(!chr.isLoggedinWorld()) return;
+        if (!chr.isLoggedinWorld()) {
+            return;
+        }
 
         AutobanManager abm = chr.getAutobanManager();
         int timestamp = Server.getInstance().getCurrentTimestamp();
@@ -44,10 +46,12 @@ public final class HealOvertimeHandler extends AbstractPacketHandler {
         short healHP = p.readShort();
         if (healHP != 0) {
             abm.setTimestamp(8, timestamp, 28);  // thanks Vcoc & Thora for pointing out d/c happening here
-            if ((abm.getLastSpam(0) + 1500) > timestamp) AutobanFactory.FAST_HP_HEALING.addPoint(abm, "Fast hp healing");
+            if ((abm.getLastSpam(0) + 1500) > timestamp) {
+                AutobanFactory.FAST_HP_HEALING.addPoint(abm, "Fast hp healing");
+            }
 
             MapleMap map = chr.getMap();
-            int abHeal = (int)(77 * map.getRecovery() * 1.5); // thanks Ari for noticing players not getting healed in sauna in certain cases
+            int abHeal = (int) (77 * map.getRecovery() * 1.5); // thanks Ari for noticing players not getting healed in sauna in certain cases
             if (healHP > abHeal) {
                 AutobanFactory.HIGH_HP_HEALING.autoban(chr, "Healing: " + healHP + "; Max is " + abHeal + ".");
                 return;

src/main/java/net/server/channel/handlers/HiredMerchantRequest.java

@@ -38,7 +38,6 @@ import java.sql.SQLException;
 import java.util.Arrays;
 
 /**
- *
  * @author XoticStory
  */
 public final class HiredMerchantRequest extends AbstractPacketHandler {

src/main/java/net/server/channel/handlers/InnerPortalHandler.java

@@ -26,7 +26,6 @@ import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 /**
- *
  * @author BubblesDev
  */
 public final class InnerPortalHandler extends AbstractPacketHandler {

src/main/java/net/server/channel/handlers/InventoryMergeHandler.java

@@ -42,7 +42,7 @@ public final class InventoryMergeHandler extends AbstractPacketHandler {
         p.readInt();
         chr.getAutobanManager().setTimestamp(2, Server.getInstance().getCurrentTimestamp(), 4);
 
-        if(!YamlConfig.config.server.USE_ITEM_SORT) {
+        if (!YamlConfig.config.server.USE_ITEM_SORT) {
             c.sendPacket(PacketCreator.enableActions());
             return;
         }
@@ -62,16 +62,24 @@ public final class InventoryMergeHandler extends AbstractPacketHandler {
             ItemInformationProvider ii = ItemInformationProvider.getInstance();
             Item srcItem, dstItem;
 
-            for(short dst = 1; dst <= inventory.getSlotLimit(); dst++) {
+            for (short dst = 1; dst <= inventory.getSlotLimit(); dst++) {
                 dstItem = inventory.getItem(dst);
-                if(dstItem == null) continue;
+                if (dstItem == null) {
+                    continue;
+                }
 
-                for(short src = (short)(dst + 1); src <= inventory.getSlotLimit(); src++) {
+                for (short src = (short) (dst + 1); src <= inventory.getSlotLimit(); src++) {
                     srcItem = inventory.getItem(src);
-                    if(srcItem == null) continue;
+                    if (srcItem == null) {
+                        continue;
+                    }
 
-                    if(dstItem.getItemId() != srcItem.getItemId()) continue;
-                    if(dstItem.getQuantity() == ii.getSlotMax(c, inventory.getItem(dst).getItemId())) break;
+                    if (dstItem.getItemId() != srcItem.getItemId()) {
+                        continue;
+                    }
+                    if (dstItem.getQuantity() == ii.getSlotMax(c, inventory.getItem(dst).getItemId())) {
+                        break;
+                    }
 
                     InventoryManipulator.move(c, inventoryType, src, dst);
                 }

src/main/java/net/server/channel/handlers/InventorySortHandler.java

@@ -35,7 +35,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- *
  * @author BubblesDev
  * @author Ronan
  */
@@ -54,8 +53,12 @@ class PairedQuicksort {
 
         x = A.get((i + j) / 2);
         do {
-            while (x.getItemId() > A.get(i).getItemId()) i++;
-            while (x.getItemId() < A.get(j).getItemId()) j--;
+            while (x.getItemId() > A.get(i).getItemId()) {
+                i++;
+            }
+            while (x.getItemId() < A.get(j).getItemId()) {
+                j--;
+            }
 
             if (i <= j) {
                 w = A.get(i);
@@ -81,8 +84,12 @@ class PairedQuicksort {
         x = A.get((i + j) / 2);
         do {
             int watk = getWatkForProjectile(x);
-            while (watk < getWatkForProjectile(A.get(i))) i++;
-            while (watk > getWatkForProjectile(A.get(j))) j--;
+            while (watk < getWatkForProjectile(A.get(i))) {
+                i++;
+            }
+            while (watk > getWatkForProjectile(A.get(j))) {
+                j--;
+            }
 
             if (i <= j) {
                 w = A.get(i);
@@ -103,8 +110,12 @@ class PairedQuicksort {
 
         x = A.get((i + j) / 2);
         do {
-            while (ii.getName(x.getItemId()).compareTo(ii.getName(A.get(i).getItemId())) > 0) i++;
-            while (ii.getName(x.getItemId()).compareTo(ii.getName(A.get(j).getItemId())) < 0) j--;
+            while (ii.getName(x.getItemId()).compareTo(ii.getName(A.get(i).getItemId())) > 0) {
+                i++;
+            }
+            while (ii.getName(x.getItemId()).compareTo(ii.getName(A.get(j).getItemId())) < 0) {
+                j--;
+            }
 
             if (i <= j) {
                 w = A.get(i);
@@ -125,8 +136,12 @@ class PairedQuicksort {
 
         x = A.get((i + j) / 2);
         do {
-            while (x.getQuantity() > A.get(i).getQuantity()) i++;
-            while (x.getQuantity() < A.get(j).getQuantity()) j--;
+            while (x.getQuantity() > A.get(i).getQuantity()) {
+                i++;
+            }
+            while (x.getQuantity() < A.get(j).getQuantity()) {
+                j--;
+            }
 
             if (i <= j) {
                 w = A.get(i);
@@ -145,15 +160,19 @@ class PairedQuicksort {
         i = Esq;
         j = Dir;
 
-        x = (Equip)(A.get((i + j) / 2));
+        x = (Equip) (A.get((i + j) / 2));
 
         do {
 
-            while (x.getLevel() > ((Equip)A.get(i)).getLevel()) i++;
-            while (x.getLevel() < ((Equip)A.get(j)).getLevel()) j--;
+            while (x.getLevel() > ((Equip) A.get(i)).getLevel()) {
+                i++;
+            }
+            while (x.getLevel() < ((Equip) A.get(j)).getLevel()) {
+                j--;
+            }
 
             if (i <= j) {
-                w = (Equip)A.get(i);
+                w = (Equip) A.get(i);
                 A.set(i, A.get(j));
                 A.set(j, w);
 
@@ -164,7 +183,7 @@ class PairedQuicksort {
     }
 
     void MapleQuicksort(int Esq, int Dir, ArrayList<Item> A, int sort) {
-        switch(sort) {
+        switch (sort) {
             case 3:
                 PartitionByLevel(Esq, Dir, A);
                 break;
@@ -182,8 +201,12 @@ class PairedQuicksort {
         }
 
 
-        if (Esq < j) MapleQuicksort(Esq, j, A, sort);
-        if (i < Dir) MapleQuicksort(i, Dir, A, sort);
+        if (Esq < j) {
+            MapleQuicksort(Esq, j, A, sort);
+        }
+        if (i < Dir) {
+            MapleQuicksort(i, Dir, A, sort);
+        }
     }
 
     private static int getItemSubtype(Item it) {
@@ -235,7 +258,7 @@ class PairedQuicksort {
     public PairedQuicksort(ArrayList<Item> A, int primarySort, int secondarySort) {
         intersect = new ArrayList<>();
 
-        if(A.size() > 0) {
+        if (A.size() > 0) {
             MapleQuicksort(0, A.size() - 1, A, primarySort);
 
             if (A.get(0).getInventoryType().equals(InventoryType.USE)) {   // thanks KDA & Vcoc for suggesting stronger projectiles coming before weaker ones
@@ -246,15 +269,17 @@ class PairedQuicksort {
         }
 
         intersect.add(0);
-        for(int ind = 1; ind < A.size(); ind++) {
-            if(A.get(ind - 1).getItemId() != A.get(ind).getItemId()) {
+        for (int ind = 1; ind < A.size(); ind++) {
+            if (A.get(ind - 1).getItemId() != A.get(ind).getItemId()) {
                 intersect.add(ind);
             }
         }
         intersect.add(A.size());
 
-        for(int ind = 0; ind < intersect.size() - 1; ind++) {
-            if(intersect.get(ind + 1) > intersect.get(ind)) MapleQuicksort(intersect.get(ind), intersect.get(ind + 1) - 1, A, secondarySort);
+        for (int ind = 0; ind < intersect.size() - 1; ind++) {
+            if (intersect.get(ind + 1) > intersect.get(ind)) {
+                MapleQuicksort(intersect.get(ind), intersect.get(ind + 1) - 1, A, secondarySort);
+            }
         }
     }
 }
@@ -266,7 +291,7 @@ public final class InventorySortHandler extends AbstractPacketHandler {
         p.readInt();
         chr.getAutobanManager().setTimestamp(3, Server.getInstance().getCurrentTimestamp(), 4);
 
-        if(!YamlConfig.config.server.USE_ITEM_SORT) {
+        if (!YamlConfig.config.server.USE_ITEM_SORT) {
             c.sendPacket(PacketCreator.enableActions());
             return;
         }

src/main/java/net/server/channel/handlers/ItemMoveHandler.java

@@ -29,14 +29,13 @@ import net.packet.InPacket;
 import tools.PacketCreator;
 
 /**
- *
  * @author Matze
  */
 public final class ItemMoveHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, Client c) {
         p.skip(4);
-        if(c.getPlayer().getAutobanManager().getLastSpam(6) + 300 > currentServerTime()) {
+        if (c.getPlayer().getAutobanManager().getLastSpam(6) + 300 > currentServerTime()) {
             c.sendPacket(PacketCreator.enableActions());
             return;
         }
@@ -56,7 +55,9 @@ public final class ItemMoveHandler extends AbstractPacketHandler {
             InventoryManipulator.move(c, type, src, action);
         }
 
-        if (c.getPlayer().getMap().getHPDec() > 0) c.getPlayer().resetHpDecreaseTask();
+        if (c.getPlayer().getMap().getHPDec() > 0) {
+            c.getPlayer().resetHpDecreaseTask();
+        }
         c.getPlayer().getAutobanManager().spam(6);
     }
 }

src/main/java/net/server/channel/handlers/ItemPickupHandler.java

@@ -31,7 +31,6 @@ import tools.FilePrinter;
 import java.awt.*;
 
 /**
- *
  * @author Matze
  * @author Ronan
  */
@@ -45,7 +44,9 @@ public final class ItemPickupHandler extends AbstractPacketHandler {
         int oid = p.readInt();
         Character chr = c.getPlayer();
         MapObject ob = chr.getMap().getMapObject(oid);
-        if(ob == null) return;
+        if (ob == null) {
+            return;
+        }
 
         Point charPos = chr.getPosition();
         Point obPos = ob.getPosition();

src/main/java/net/server/channel/handlers/ItemRewardHandler.java

@@ -48,7 +48,9 @@ public final class ItemRewardHandler extends AbstractPacketHandler {
         int itemId = p.readInt(); // will load from xml I don't care.
 
         Item it = c.getPlayer().getInventory(InventoryType.USE).getItem(slot);   // null check here thanks to Thora
-        if (it == null || it.getItemId() != itemId || c.getPlayer().getInventory(InventoryType.USE).countById(itemId) < 1) return;
+        if (it == null || it.getItemId() != itemId || c.getPlayer().getInventory(InventoryType.USE).countById(itemId) < 1) {
+            return;
+        }
 
         ItemInformationProvider ii = ItemInformationProvider.getInstance();
         Pair<Integer, List<RewardItem>> rewards = ii.getItemReward(itemId);

src/main/java/net/server/channel/handlers/KeymapChangeHandler.java

@@ -35,14 +35,14 @@ public final class KeymapChangeHandler extends AbstractPacketHandler {
     public final void handlePacket(InPacket p, Client c) {
         if (p.available() >= 8) {
             int mode = p.readInt();
-			if(mode == 0) {
+            if (mode == 0) {
                 int numChanges = p.readInt();
                 for (int i = 0; i < numChanges; i++) {
                     int key = p.readInt();
                     int type = p.readByte();
                     int action = p.readInt();
 
-                                        if(type == 1) {
+                    if (type == 1) {
                         Skill skill = SkillFactory.getSkill(action);
                         boolean isBanndedSkill;
                         if (skill != null) {
@@ -63,16 +63,16 @@ public final class KeymapChangeHandler extends AbstractPacketHandler {
 
                     c.getPlayer().changeKeybinding(key, new KeyBinding(type, action));
                 }
-			} else if(mode == 1) { // Auto HP Potion
+            } else if (mode == 1) { // Auto HP Potion
                 int itemID = p.readInt();
-				if(itemID != 0 && c.getPlayer().getInventory(InventoryType.USE).findById(itemID) == null) {
+                if (itemID != 0 && c.getPlayer().getInventory(InventoryType.USE).findById(itemID) == null) {
                     c.disconnect(false, false); // Don't let them send a packet with a use item they dont have.
                     return;
                 }
                 c.getPlayer().changeKeybinding(91, new KeyBinding(7, itemID));
-			} else if(mode == 2) { // Auto MP Potion
+            } else if (mode == 2) { // Auto MP Potion
                 int itemID = p.readInt();
-				if(itemID != 0 && c.getPlayer().getInventory(InventoryType.USE).findById(itemID) == null) {
+                if (itemID != 0 && c.getPlayer().getInventory(InventoryType.USE).findById(itemID) == null) {
                     c.disconnect(false, false); // Don't let them send a packet with a use item they dont have.
                     return;
                 }

src/main/java/net/server/channel/handlers/LeftKnockbackHandler.java

@@ -28,7 +28,6 @@ import net.packet.InPacket;
 import tools.PacketCreator;
 
 /**
- *
  * @author kevintjuh93
  */
 public class LeftKnockbackHandler extends AbstractPacketHandler {

src/main/java/net/server/channel/handlers/MTSHandler.java

@@ -537,7 +537,7 @@ public final class MTSHandler extends AbstractPacketHandler {
                     c.sendPacket(PacketCreator.MTSFailBuy());
                 }
             } else {
-                System.out.println("Unhandled OP(MTS): " + op + " Packet: " + p.toString());
+                System.out.println("Unhandled OP(MTS): " + op + " Packet: " + p);
             }
         } else {
             c.sendPacket(PacketCreator.showMTSCash(c.getPlayer()));

src/main/java/net/server/channel/handlers/MagicDamageHandler.java

@@ -48,7 +48,7 @@ public final class MagicDamageHandler extends AbstractDealDamageHandler {
         AttackInfo attack = parseDamage(p, chr, false, true);
 
         if (chr.getBuffEffect(BuffStat.MORPH) != null) {
-			if(chr.getBuffEffect(BuffStat.MORPH).isMorphWithoutAttack()) {
+            if (chr.getBuffEffect(BuffStat.MORPH).isMorphWithoutAttack()) {
                 // How are they attacking when the client won't let them?
                 chr.getClient().disconnect(false, false);
                 return;
@@ -56,7 +56,7 @@ public final class MagicDamageHandler extends AbstractDealDamageHandler {
         }
 
         if (GameConstants.isDojo(chr.getMap().getId()) && attack.numAttacked > 0) {
-                        chr.setDojoEnergy(chr.getDojoEnergy() +  + YamlConfig.config.server.DOJO_ENERGY_ATK);
+            chr.setDojoEnergy(chr.getDojoEnergy() + +YamlConfig.config.server.DOJO_ENERGY_ATK);
             c.sendPacket(PacketCreator.getEnergy("energy", chr.getDojoEnergy()));
         }
 

src/main/java/net/server/channel/handlers/MakerSkillHandler.java

@@ -27,7 +27,6 @@ import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 /**
- *
  * @author Jay Estrella, Ronan
  */
 public final class MakerSkillHandler extends AbstractPacketHandler {

src/main/java/net/server/channel/handlers/MesoDropHandler.java

@@ -28,7 +28,6 @@ import net.packet.InPacket;
 import tools.PacketCreator;
 
 /**
- *
  * @author Matze
  * @author Ronan - concurrency protection
  */

src/main/java/net/server/channel/handlers/MobDamageMobFriendlyHandler.java

@@ -31,7 +31,6 @@ import tools.PacketCreator;
 import tools.Randomizer;
 
 /**
- *
  * @author Xotic (XoticStory) & BubblesDev
  */
 
@@ -52,19 +51,19 @@ public final class MobDamageMobFriendlyHandler extends AbstractPacketHandler {
         int damage = Randomizer.nextInt(((monster.getMaxHp() / 13 + monster.getPADamage() * 10)) * 2 + 500) / 10; // Formula planned by Beng.
 
         if (monster.getHp() - damage < 1) {     // friendly dies
-                        if(monster.getId() == 9300102) {
+            if (monster.getId() == 9300102) {
                 map.broadcastMessage(PacketCreator.serverNotice(6, "The Watch Hog has been injured by the aliens. Better luck next time..."));
             } else if (monster.getId() == 9300061) {  //moon bunny
                 map.broadcastMessage(PacketCreator.serverNotice(6, "The Moon Bunny went home because he was sick."));
-                        } else if(monster.getId() == 9300093) {   //tylus
+            } else if (monster.getId() == 9300093) {   //tylus
                 map.broadcastMessage(PacketCreator.serverNotice(6, "Tylus has fallen by the overwhelming forces of the ambush."));
-                        } else if(monster.getId() == 9300137) {   //juliet
+            } else if (monster.getId() == 9300137) {   //juliet
                 map.broadcastMessage(PacketCreator.serverNotice(6, "Juliet has fainted in the middle of the combat."));
-                        } else if(monster.getId() == 9300138) {   //romeo
+            } else if (monster.getId() == 9300138) {   //romeo
                 map.broadcastMessage(PacketCreator.serverNotice(6, "Romeo has fainted in the middle of the combat."));
-                        } else if(monster.getId() == 9400322 || monster.getId() == 9400327 || monster.getId() == 9400332) { //snowman
+            } else if (monster.getId() == 9400322 || monster.getId() == 9400327 || monster.getId() == 9400332) { //snowman
                 map.broadcastMessage(PacketCreator.serverNotice(6, "The Snowman has melted on the heat of the battle."));
-                        } else if(monster.getId() == 9300162) {   //delli
+            } else if (monster.getId() == 9300162) {   //delli
                 map.broadcastMessage(PacketCreator.serverNotice(6, "Delli vanished after the ambush, sheets still laying on the ground..."));
             }
 
@@ -78,7 +77,7 @@ public final class MobDamageMobFriendlyHandler extends AbstractPacketHandler {
 
         monster.applyAndGetHpDamage(damage, false);
         int remainingHp = monster.getHp();
-                if(remainingHp <= 0) {
+        if (remainingHp <= 0) {
             remainingHp = 0;
             map.removeMapObject(monster);
         }

src/main/java/net/server/channel/handlers/MobDamageMobHandler.java

@@ -37,7 +37,6 @@ import tools.PacketCreator;
 import java.util.Map;
 
 /**
- *
  * @author Jay Estrella
  * @author Ronan
  */

src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java

@@ -41,8 +41,8 @@ import java.util.List;
 
 
 /**
-    *@author Drago (Dragohe4rt)
-*/
+ * @author Drago (Dragohe4rt)
+ */
 
 public final class MonsterCarnivalHandler extends AbstractPacketHandler {
 
@@ -171,7 +171,7 @@ public final class MonsterCarnivalHandler extends AbstractPacketHandler {
                     }
                     c.getPlayer().gainCP(-neededCP);
                     c.getPlayer().getMap().broadcastMessage(PacketCreator.playerSummoned(c.getPlayer().getName(), tab, num));
-                }catch (Exception e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
             } finally {

src/main/java/net/server/channel/handlers/MoveDragonHandler.java

@@ -49,7 +49,8 @@ public class MoveDragonHandler extends AbstractMovementPacketHandler {
                 } else {
                     chr.getMap().broadcastMessage(chr, PacketCreator.moveDragon(dragon, startPos, p, movementDataLength), dragon.getPosition());
                 }
-            } catch (EmptyMovementException e) {}
+            } catch (EmptyMovementException e) {
+            }
         }
     }
 }

src/main/java/net/server/channel/handlers/MoveLifeHandler.java

@@ -100,7 +100,7 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
 
                 if (monster.canUseSkill(toUse, true)) {
                     int animationTime = MonsterInformationProvider.getInstance().getMobSkillAnimationTime(toUse);
-                                        if(animationTime > 0 && toUse.getSkillId() != 129) {
+                    if (animationTime > 0 && toUse.getSkillId() != 129) {
                         toUse.applyDelayedEffect(player, monster, true, animationTime);
                     } else {
                         banishPlayers = new LinkedList<>();
@@ -147,7 +147,9 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
         Point serverStartPos = new Point(monster.getPosition());
 
         Boolean aggro = monster.aggroMoveLifeUpdate(player);
-                if (aggro == null) return;
+        if (aggro == null) {
+            return;
+        }
 
         if (nextUse != null) {
             c.sendPacket(PacketCreator.moveMonsterResponse(objectid, moveid, mobMp, aggro, nextSkillId, nextSkillLevel));
@@ -169,7 +171,8 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
             map.broadcastMessage(player, PacketCreator.moveMonster(objectid, nextMovementCouldBeSkill, rawActivity, useSkillId, useSkillLevel, pOption, startPos, p, movementDataLength), serverStartPos);
             //updatePosition(res, monster, -2); //does this need to be done after the packet is broadcast?
             map.moveMonster(monster, monster.getPosition());
-                } catch (EmptyMovementException e) {}
+        } catch (EmptyMovementException e) {
+        }
 
         if (banishPlayers != null) {
             for (Character chr : banishPlayers) {

src/main/java/net/server/channel/handlers/MovePlayerHandler.java

@@ -42,6 +42,7 @@ public final class MovePlayerHandler extends AbstractMovementPacketHandler {
             } else {
                 c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.movePlayer(c.getPlayer().getId(), p, movementDataLength), false);
             }
-        } catch (EmptyMovementException e) {}
+        } catch (EmptyMovementException e) {
+        }
     }
 }

src/main/java/net/server/channel/handlers/MoveSummonHandler.java

@@ -53,7 +53,8 @@ public final class MoveSummonHandler extends AbstractMovementPacketHandler {
                 p.seek(movementDataStart);
 
                 player.getMap().broadcastMessage(player, PacketCreator.moveSummon(player.getId(), oid, startPos, p, movementDataLength), summon.getPosition());
-            } catch (EmptyMovementException e) {}
+            } catch (EmptyMovementException e) {
+            }
         }
     }
 }

src/main/java/net/server/channel/handlers/MultiChatHandler.java

@@ -37,7 +37,7 @@ public final class MultiChatHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, Client c) {
         Character player = c.getPlayer();
-        if(player.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
+        if (player.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
             return;
         }
 

src/main/java/net/server/channel/handlers/NPCMoreTalkHandler.java

@@ -28,7 +28,6 @@ import scripting.npc.NPCScriptManager;
 import scripting.quest.QuestScriptManager;
 
 /**
- *
  * @author Matze
  */
 public final class NPCMoreTalkHandler extends AbstractPacketHandler {

src/main/java/net/server/channel/handlers/NPCShopHandler.java

@@ -29,7 +29,6 @@ import net.packet.InPacket;
 import tools.FilePrinter;
 
 /**
- * 
  * @author Matze
  */
 public final class NPCShopHandler extends AbstractPacketHandler {

src/main/java/net/server/channel/handlers/NPCTalkHandler.java

@@ -41,7 +41,7 @@ public final class NPCTalkHandler extends AbstractPacketHandler {
             return;
         }
 
-        if(currentServerTime() - c.getPlayer().getNpcCooldown() < YamlConfig.config.server.BLOCK_NPC_RACE_CONDT) {
+        if (currentServerTime() - c.getPlayer().getNpcCooldown() < YamlConfig.config.server.BLOCK_NPC_RACE_CONDT) {
             c.sendPacket(PacketCreator.enableActions());
             return;
         }
@@ -50,7 +50,9 @@ public final class NPCTalkHandler extends AbstractPacketHandler {
         MapObject obj = c.getPlayer().getMap().getMapObject(oid);
         if (obj instanceof NPC) {
             NPC npc = (NPC) obj;
-            if(YamlConfig.config.server.USE_DEBUG == true) c.getPlayer().dropMessage(5, "Talking to NPC " + npc.getId());
+            if (YamlConfig.config.server.USE_DEBUG == true) {
+                c.getPlayer().dropMessage(5, "Talking to NPC " + npc.getId());
+            }
 
             if (npc.getId() == 9010009) {   //is duey
                 DueyProcessor.dueySendTalk(c, false);

src/main/java/net/server/channel/handlers/NewYearCardHandler.java

@@ -36,9 +36,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 /**
- *
  * @author Ronan
- * 
+ * <p>
  * Header layout thanks to Eric
  */
 public final class NewYearCardHandler extends AbstractPacketHandler {
@@ -48,26 +47,26 @@ public final class NewYearCardHandler extends AbstractPacketHandler {
         final Character player = c.getPlayer();
         byte reqMode = p.readByte();                 //[00] -> NewYearReq (0 = Send)
 
-        if(reqMode == 0) {  // card has been sent
-            if(player.haveItem(2160101)) {  // new year's card
+        if (reqMode == 0) {  // card has been sent
+            if (player.haveItem(2160101)) {  // new year's card
                 short slot = p.readShort();                      //[00 2C] -> nPOS (Item Slot Pos)
                 int itemid = p.readInt();                        //[00 20 F5 E5] -> nItemID (item id)
 
                 int status = getValidNewYearCardStatus(itemid, player, slot);
-                if(status == 0) {
-                    if(player.canHold(4300000, 1)) {
+                if (status == 0) {
+                    if (player.canHold(4300000, 1)) {
                         String receiver = p.readString();  //[04 00 54 65 73 74] -> sReceiverName (person to send to)
 
                         int receiverid = getReceiverId(receiver, c.getWorld());
-                        if(receiverid != -1) {
-                            if(receiverid != c.getPlayer().getId()) {
+                        if (receiverid != -1) {
+                            if (receiverid != c.getPlayer().getId()) {
                                 String message = p.readString();   //[06 00 4C 65 74 74 65 72] -> sContent (message)
 
                                 NewYearCardRecord newyear = new NewYearCardRecord(player.getId(), player.getName(), receiverid, receiver, message);
                                 NewYearCardRecord.saveNewYearCard(newyear);
                                 player.addNewYearRecord(newyear);
 
-                                player.getAbstractPlayerInteraction().gainItem(2160101, (short)-1);
+                                player.getAbstractPlayerInteraction().gainItem(2160101, (short) -1);
                                 player.getAbstractPlayerInteraction().gainItem(4300000, (short) 1);
 
                                 Server.getInstance().setNewYearCard(newyear);
@@ -93,14 +92,16 @@ public final class NewYearCardHandler extends AbstractPacketHandler {
 
             NewYearCardRecord newyear = NewYearCardRecord.loadNewYearCard(cardid);
 
-            if(newyear != null && newyear.getReceiverId() == player.getId() && !newyear.isReceiverCardReceived()) {
-                if(!newyear.isSenderCardDiscarded()) {
-                    if(player.canHold(4301000, 1)) {
+            if (newyear != null && newyear.getReceiverId() == player.getId() && !newyear.isReceiverCardReceived()) {
+                if (!newyear.isSenderCardDiscarded()) {
+                    if (player.canHold(4301000, 1)) {
                         newyear.stopNewYearCardTask();
                         NewYearCardRecord.updateNewYearCard(newyear);
 
-                        player.getAbstractPlayerInteraction().gainItem(4301000, (short)1);
-                        if(!newyear.getMessage().isEmpty()) player.dropMessage(6, "[New Year] " + newyear.getSenderName() + ": " + newyear.getMessage());
+                        player.getAbstractPlayerInteraction().gainItem(4301000, (short) 1);
+                        if (!newyear.getMessage().isEmpty()) {
+                            player.dropMessage(6, "[New Year] " + newyear.getSenderName() + ": " + newyear.getMessage());
+                        }
 
                         player.addNewYearRecord(newyear);
                         player.sendPacket(PacketCreator.onNewYearCardRes(player, newyear, 6, 0));    // successfully rcvd
@@ -108,7 +109,7 @@ public final class NewYearCardHandler extends AbstractPacketHandler {
                         player.getMap().broadcastMessage(PacketCreator.onNewYearCardRes(player, newyear, 0xD, 0));
 
                         Character sender = c.getWorldServer().getPlayerStorage().getCharacterById(newyear.getSenderId());
-                        if(sender != null && sender.isLoggedinWorld()) {
+                        if (sender != null && sender.isLoggedinWorld()) {
                             sender.getMap().broadcastMessage(PacketCreator.onNewYearCardRes(sender, newyear, 0xD, 0));
                             sender.dropMessage(6, "[New Year] Your addressee successfully received the New Year card.");
                         }
@@ -119,7 +120,7 @@ public final class NewYearCardHandler extends AbstractPacketHandler {
                     player.dropMessage(6, "[New Year] The sender of the New Year card already dropped it. Nothing to receive.");
                 }
             } else {
-                if(newyear == null) {
+                if (newyear == null) {
                     player.dropMessage(6, "[New Year] The sender of the New Year card already dropped it. Nothing to receive.");
                 }
             }
@@ -132,13 +133,13 @@ public final class NewYearCardHandler extends AbstractPacketHandler {
                 ps.setString(1, receiver);
                 try (ResultSet rs = ps.executeQuery()) {
                     if (rs.next()) {
-                        if(rs.getInt("world") == world) {
+                        if (rs.getInt("world") == world) {
                             return rs.getInt("id");
                         }
                     }
                 }
             }
-        } catch(SQLException sqle) {
+        } catch (SQLException sqle) {
             sqle.printStackTrace();
         }
 
@@ -146,7 +147,9 @@ public final class NewYearCardHandler extends AbstractPacketHandler {
     }
 
     private static int getValidNewYearCardStatus(int itemid, Character player, short slot) {
-        if(!ItemConstants.isNewYearCardUse(itemid)) return 0x14;
+        if (!ItemConstants.isNewYearCardUse(itemid)) {
+            return 0x14;
+        }
 
         Item it = player.getInventory(ItemConstants.getInventoryType(itemid)).getItem(slot);
         return (it != null && it.getItemId() == itemid) ? 0 : 0x12;

src/main/java/net/server/channel/handlers/OpenFamilyHandler.java

@@ -27,13 +27,14 @@ import net.packet.InPacket;
 import tools.PacketCreator;
 
 /**
- *
  * @author Ubaware
  */
 public final class OpenFamilyHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, Client c) {
-        if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return;
+        if (!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
+            return;
+        }
         Character chr = c.getPlayer();
         c.sendPacket(PacketCreator.getFamilyInfo(chr.getFamilyEntry()));
     }

src/main/java/net/server/channel/handlers/OpenFamilyPedigreeHandler.java

@@ -27,15 +27,16 @@ import net.packet.InPacket;
 import tools.PacketCreator;
 
 /**
- *
  * @author Ubaware
  */
 public final class OpenFamilyPedigreeHandler extends AbstractPacketHandler {
     @Override
     public final void handlePacket(InPacket p, Client c) {
-        if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return;
+        if (!YamlConfig.config.server.USE_FAMILY_SYSTEM) {
+            return;
+        }
         Character target = c.getChannelServer().getPlayerStorage().getCharacterByName(p.readString());
-        if(target != null && target.getFamily() != null) {
+        if (target != null && target.getFamily() != null) {
             c.sendPacket(PacketCreator.showPedigree(target.getFamilyEntry()));
         }
     }

src/main/java/net/server/channel/handlers/OwlWarpHandler.java

@@ -37,30 +37,36 @@ public final class OwlWarpHandler extends AbstractPacketHandler {
         int ownerid = p.readInt();
         int mapid = p.readInt();
 
-        if(ownerid == c.getPlayer().getId()) {
+        if (ownerid == c.getPlayer().getId()) {
             c.sendPacket(PacketCreator.serverNotice(1, "You cannot visit your own shop."));
             return;
         }
 
         HiredMerchant hm = c.getWorldServer().getHiredMerchant(ownerid);   // if both hired merchant and player shop is on the same map
         PlayerShop ps;
-        if(hm == null || hm.getMapId() != mapid || !hm.hasItem(c.getPlayer().getOwlSearch())) {
+        if (hm == null || hm.getMapId() != mapid || !hm.hasItem(c.getPlayer().getOwlSearch())) {
             ps = c.getWorldServer().getPlayerShop(ownerid);
-            if(ps == null || ps.getMapId() != mapid || !ps.hasItem(c.getPlayer().getOwlSearch())) {
-                if(hm == null && ps == null) c.sendPacket(PacketCreator.getOwlMessage(1));
-                else c.sendPacket(PacketCreator.getOwlMessage(3));
+            if (ps == null || ps.getMapId() != mapid || !ps.hasItem(c.getPlayer().getOwlSearch())) {
+                if (hm == null && ps == null) {
+                    c.sendPacket(PacketCreator.getOwlMessage(1));
+                } else {
+                    c.sendPacket(PacketCreator.getOwlMessage(3));
+                }
                 return;
             }
 
-            if(ps.isOpen()) {
-                if(GameConstants.isFreeMarketRoom(mapid)) {
-                    if(ps.getChannel() == c.getChannel()) {
+            if (ps.isOpen()) {
+                if (GameConstants.isFreeMarketRoom(mapid)) {
+                    if (ps.getChannel() == c.getChannel()) {
                         c.getPlayer().changeMap(mapid);
 
-                        if(ps.isOpen()) {   //change map has a delay, must double check
-                            if(!ps.visitShop(c.getPlayer())) {
-                                if(!ps.isBanned(c.getPlayer().getName())) c.sendPacket(PacketCreator.getOwlMessage(2));
-                                else c.sendPacket(PacketCreator.getOwlMessage(17));
+                        if (ps.isOpen()) {   //change map has a delay, must double check
+                            if (!ps.visitShop(c.getPlayer())) {
+                                if (!ps.isBanned(c.getPlayer().getName())) {
+                                    c.sendPacket(PacketCreator.getOwlMessage(2));
+                                } else {
+                                    c.sendPacket(PacketCreator.getOwlMessage(17));
+                                }
                             }
                         } else {
                             //c.sendPacket(PacketCreator.serverNotice(1, "That merchant has either been closed or is under maintenance."));
@@ -77,13 +83,13 @@ public final class OwlWarpHandler extends AbstractPacketHandler {
                 c.sendPacket(PacketCreator.getOwlMessage(18));
             }
         } else {
-            if(hm.isOpen()) {
-                if(GameConstants.isFreeMarketRoom(mapid)) {
-                    if(hm.getChannel() == c.getChannel()) {
+            if (hm.isOpen()) {
+                if (GameConstants.isFreeMarketRoom(mapid)) {
+                    if (hm.getChannel() == c.getChannel()) {
                         c.getPlayer().changeMap(mapid);
 
-                        if(hm.isOpen()) {   //change map has a delay, must double check
-                            if(hm.addVisitor(c.getPlayer())) {
+                        if (hm.isOpen()) {   //change map has a delay, must double check
+                            if (hm.addVisitor(c.getPlayer())) {
                                 c.sendPacket(PacketCreator.getHiredMerchant(c.getPlayer(), hm, false));
                                 c.getPlayer().setHiredMerchant(hm);
                             } else {

src/main/java/net/server/channel/handlers/PartyOperationHandler.java

@@ -77,11 +77,11 @@ public final class PartyOperationHandler extends AbstractPacketHandler {
                 String name = p.readString();
                 Character invited = world.getPlayerStorage().getCharacterByName(name);
                 if (invited != null) {
-                    if(invited.getLevel() < 10 && (!YamlConfig.config.server.USE_PARTY_FOR_STARTERS || player.getLevel() >= 10)) { //min requirement is level 10
+                    if (invited.getLevel() < 10 && (!YamlConfig.config.server.USE_PARTY_FOR_STARTERS || player.getLevel() >= 10)) { //min requirement is level 10
                         c.sendPacket(PacketCreator.serverNotice(5, "The player you have invited does not meet the requirements."));
                         return;
                     }
-                    if(YamlConfig.config.server.USE_PARTY_FOR_STARTERS && invited.getLevel() >= 10 && player.getLevel() < 10) {    //trying to invite high level
+                    if (YamlConfig.config.server.USE_PARTY_FOR_STARTERS && invited.getLevel() >= 10 && player.getLevel() < 10) {    //trying to invite high level
                         c.sendPacket(PacketCreator.serverNotice(5, "The player you have invited does not meet the requirements."));
                         return;
                     }

src/main/java/net/server/channel/handlers/PartySearchRegisterHandler.java

@@ -26,7 +26,6 @@ import net.AbstractPacketHandler;
 import net.packet.InPacket;
 
 /**
- *
  * @author Quasar
  */
 public class PartySearchRegisterHandler extends AbstractPacketHandler {

src/main/java/net/server/channel/handlers/PartySearchStartHandler.java

@@ -30,7 +30,6 @@ import net.server.world.World;
 import tools.PacketCreator;
 
 /**
- *
  * @author XoticStory
  * @author BubblesDev
  * @author Ronan
@@ -64,7 +63,9 @@ public class PartySearchStartHandler extends AbstractPacketHandler {
         int jobs = p.readInt();
 
         Party party = c.getPlayer().getParty();
-            if (party == null || !c.getPlayer().isPartyLeader()) return;
+        if (party == null || !c.getPlayer().isPartyLeader()) {
+            return;
+        }
 
         World world = c.getWorldServer();
         world.getPartySearchCoordinator().registerPartyLeader(chr, min, max, jobs);

src/main/java/net/server/channel/handlers/PetExcludeItemsHandler.java

@@ -41,7 +41,9 @@ public final class PetExcludeItemsHandler extends AbstractPacketHandler {
 
         Character chr = c.getPlayer();
         byte petIndex = chr.getPetIndex(petId);
-        if (petIndex < 0) return;
+        if (petIndex < 0) {
+            return;
+        }
 
         final Pet pet = chr.getPet(petIndex);
         if (pet == null) {

src/main/java/net/server/channel/handlers/PetFoodHandler.java

@@ -64,7 +64,9 @@ public final class PetFoodHandler extends AbstractPacketHandler {
         }
 
         Pet pet = chr.getPet(slot);
-        if(pet == null) return;
+        if (pet == null) {
+            return;
+        }
 
         short pos = p.readShort();
         int itemId = p.readInt();

src/main/java/net/server/channel/handlers/PetLootHandler.java

@@ -61,7 +61,7 @@ public final class PetLootHandler extends AbstractPacketHandler {
 
                 if (chr.isEquippedPetItemIgnore()) {
                     final Set<Integer> petIgnore = chr.getExcludedItems();
-                    if(!petIgnore.isEmpty() && petIgnore.contains(Integer.MAX_VALUE)) {
+                    if (!petIgnore.isEmpty() && petIgnore.contains(Integer.MAX_VALUE)) {
                         c.sendPacket(PacketCreator.enableActions());
                         return;
                     }
@@ -74,7 +74,7 @@ public final class PetLootHandler extends AbstractPacketHandler {
 
                 if (chr.isEquippedPetItemIgnore()) {
                     final Set<Integer> petIgnore = chr.getExcludedItems();
-                    if(!petIgnore.isEmpty() && petIgnore.contains(mapitem.getItem().getItemId())) {
+                    if (!petIgnore.isEmpty() && petIgnore.contains(mapitem.getItem().getItemId())) {
                         c.sendPacket(PacketCreator.enableActions());
                         return;
                     }

src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java

@@ -46,7 +46,6 @@ import java.sql.SQLException;
 import java.util.Arrays;
 
 /**
- *
  * @author Matze
  * @author Ronan - concurrency safety and reviewed minigames
  */
@@ -100,7 +99,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
         SELECT_CARD(0x44);
         final byte code;
 
-        private Action(int code) {
+        Action(int code) {
             this.code = (byte) code;
         }
 
@@ -118,7 +117,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
             return 13;
         }
 
-        if(chr.getEventInstance() != null) {
+        if (chr.getEventInstance() != null) {
             return 5;
         }
 
@@ -137,7 +136,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
             final Character chr = c.getPlayer();
 
             if (mode == Action.CREATE.getCode()) {
-                if(!chr.isAlive()) {    // thanks GabrielSin for pointing this
+                if (!chr.isAlive()) {    // thanks GabrielSin for pointing this
                     chr.sendPacket(PacketCreator.getMiniRoomError(4));
                     return;
                 }
@@ -221,7 +220,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
                     chr.getMap().broadcastMessage(PacketCreator.addMatchCardBox(chr, 1, 0));
                     game.sendMatchCard(c, type);
                 } else if (createType == 4 || createType == 5) { // shop
-                    if(!GameConstants.isFreeMarketRoom(chr.getMapId())) {
+                    if (!GameConstants.isFreeMarketRoom(chr.getMapId())) {
                         chr.sendPacket(PacketCreator.getMiniRoomError(15));
                         return;
                     }
@@ -278,7 +277,9 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
                         return;
                     }
                 } else {
-                    if (isTradeOpen(chr)) return;
+                    if (isTradeOpen(chr)) {
+                        return;
+                    }
 
                     int oid = p.readInt();
                     MapObject ob = chr.getMap().getMapObject(oid);
@@ -290,7 +291,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
                         String pw = p.available() > 1 ? p.readString() : "";
 
                         MiniGame game = (MiniGame) ob;
-                        if(game.checkPassword(pw)) {
+                        if (game.checkPassword(pw)) {
                             if (game.hasFreeSlot() && !game.isVisitor(chr)) {
                                 game.addVisitor(chr);
                                 chr.setMiniGame(game);
@@ -339,7 +340,9 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
                     chr.closeHiredMerchant(true);
                 }
             } else if (mode == Action.OPEN_STORE.getCode() || mode == Action.OPEN_CASH.getCode()) {
-                if (isTradeOpen(chr)) return;
+                if (isTradeOpen(chr)) {
+                    return;
+                }
 
                 if (mode == Action.OPEN_STORE.getCode()) {
                     p.readByte();    //01
@@ -361,10 +364,11 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
                 PlayerShop shop = chr.getPlayerShop();
                 HiredMerchant merchant = chr.getHiredMerchant();
                 if (shop != null && shop.isOwner(chr)) {
-                    if(YamlConfig.config.server.USE_ERASE_PERMIT_ON_OPENSHOP) {
+                    if (YamlConfig.config.server.USE_ERASE_PERMIT_ON_OPENSHOP) {
                         try {
                             InventoryManipulator.removeById(c, InventoryType.CASH, shop.getItemId(), 1, true, false);
-                        } catch(RuntimeException re) {} // fella does not have a player shop permit...
+                        } catch (RuntimeException re) {
+                        } // fella does not have a player shop permit...
                     }
 
                     chr.getMap().broadcastMessage(PacketCreator.updatePlayerShopBox(shop));
@@ -554,7 +558,9 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
             } else if (mode == Action.CONFIRM.getCode()) {
                 Trade.completeTrade(chr);
             } else if (mode == Action.ADD_ITEM.getCode() || mode == Action.PUT_ITEM.getCode()) {
-                if (isTradeOpen(chr)) return;
+                if (isTradeOpen(chr)) {
+                    return;
+                }
 
                 InventoryType ivType = InventoryType.getByType(p.readByte());
                 short slot = p.readShort();
@@ -595,7 +601,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
                 }
 
                 Item sellItem = ivItem.copy();
-                if(!ItemConstants.isRechargeable(ivItem.getItemId())) {
+                if (!ItemConstants.isRechargeable(ivItem.getItemId())) {
                     sellItem.setQuantity(perBundle);
                 }
 
@@ -647,7 +653,9 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
                     c.sendPacket(PacketCreator.serverNotice(1, "You can't sell without owning a shop."));
                 }
             } else if (mode == Action.REMOVE_ITEM.getCode()) {
-                if (isTradeOpen(chr)) return;
+                if (isTradeOpen(chr)) {
+                    return;
+                }
 
                 PlayerShop shop = chr.getPlayerShop();
                 if (shop != null && shop.isOwner(chr)) {
@@ -668,12 +676,16 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
                 }
             } else if (mode == Action.MERCHANT_MESO.getCode()) {
                 HiredMerchant merchant = chr.getHiredMerchant();
-                if (merchant == null) return;
+                if (merchant == null) {
+                    return;
+                }
 
                 merchant.withdrawMesos(chr);
             } else if (mode == Action.MERCHANT_ORGANIZE.getCode()) {
                 HiredMerchant merchant = chr.getHiredMerchant();
-                if (merchant == null || !merchant.isOwner(chr)) return;
+                if (merchant == null || !merchant.isOwner(chr)) {
+                    return;
+                }
 
                 merchant.withdrawMesos(chr);
                 merchant.clearInexistentItems();
@@ -685,7 +697,9 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
                 c.sendPacket(PacketCreator.updateHiredMerchant(merchant, chr));
 
             } else if (mode == Action.BUY.getCode() || mode == Action.MERCHANT_BUY.getCode()) {
-                if (isTradeOpen(chr)) return;
+                if (isTradeOpen(chr)) {
+                    return;
+                }
 
                 int itemid = p.readByte();
                 short quantity = p.readShort();
@@ -706,7 +720,9 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
                     merchant.broadcastToVisitorsThreadsafe(PacketCreator.updateHiredMerchant(merchant, chr));
                 }
             } else if (mode == Action.TAKE_ITEM_BACK.getCode()) {
-                if (isTradeOpen(chr)) return;
+                if (isTradeOpen(chr)) {
+                    return;
+                }
 
                 HiredMerchant merchant = chr.getHiredMerchant();
                 if (merchant != null && merchant.isOwner(chr)) {
@@ -726,17 +742,21 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
                     merchant.takeItemBack(slot, chr);
                 }
             } else if (mode == Action.CLOSE_MERCHANT.getCode()) {
-                if (isTradeOpen(chr)) return;
+                if (isTradeOpen(chr)) {
+                    return;
+                }
 
                 HiredMerchant merchant = chr.getHiredMerchant();
                 if (merchant != null) {
                     merchant.closeOwnerMerchant(chr);
                 }
             } else if (mode == Action.MAINTENANCE_OFF.getCode()) {
-                if (isTradeOpen(chr)) return;
+                if (isTradeOpen(chr)) {
+                    return;
+                }
 
                 HiredMerchant merchant = chr.getHiredMerchant();
-                if(merchant != null) {
+                if (merchant != null) {
                     if (merchant.isOwner(chr)) {
                         if (merchant.getItems().isEmpty()) {
                             merchant.closeOwnerMerchant(chr);
@@ -759,22 +779,22 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
                 }
             } else if (mode == Action.EXPEL.getCode()) {
                 MiniGame miniGame = chr.getMiniGame();
-                if(miniGame != null && miniGame.isOwner(chr)) {
+                if (miniGame != null && miniGame.isOwner(chr)) {
                     Character visitor = miniGame.getVisitor();
 
-                    if(visitor != null) {
+                    if (visitor != null) {
                         visitor.closeMiniGame(false);
                         visitor.sendPacket(PacketCreator.getMiniGameClose(true, 5));
                     }
                 }
             } else if (mode == Action.EXIT_AFTER_GAME.getCode()) {
                 MiniGame miniGame = chr.getMiniGame();
-                if(miniGame != null) {
+                if (miniGame != null) {
                     miniGame.setQuitAfterGame(chr, true);
                 }
             } else if (mode == Action.CANCEL_EXIT_AFTER_GAME.getCode()) {
                 MiniGame miniGame = chr.getMiniGame();
-                if(miniGame != null) {
+                if (miniGame != null) {
                     miniGame.setQuitAfterGame(chr, false);
                 }
             }

src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java

@@ -385,7 +385,9 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
             player.commitExcludedItems();
             showDueyNotification(c, player);
 
-            if (player.getMap().getHPDec() > 0) player.resetHpDecreaseTask();
+            if (player.getMap().getHPDec() > 0) {
+                player.resetHpDecreaseTask();
+            }
 
             player.resetPlayerRates();
             if (YamlConfig.config.server.USE_ADD_RATES_BY_LEVEL) {
@@ -432,7 +434,9 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
                 c.sendPacket(PacketCreator.setNPCScriptable(npcsIds));
             }
 
-            if (newcomer) player.setLoginTime(System.currentTimeMillis());
+            if (newcomer) {
+                player.setLoginTime(System.currentTimeMillis());
+            }
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
@@ -447,7 +451,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
 
             try (ResultSet rs = ps.executeQuery()) {
                 if (rs.next()) {
-                    try (PreparedStatement ps2 = con.prepareStatement("UPDATE dueypackages SET Checked = 0 WHERE ReceiverId = ?")){
+                    try (PreparedStatement ps2 = con.prepareStatement("UPDATE dueypackages SET Checked = 0 WHERE ReceiverId = ?")) {
                         ps2.setInt(1, player.getId());
                         ps2.executeUpdate();
 
@@ -464,7 +468,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
         List<Pair<Long, PlayerBuffValueHolder>> timedBuffs = new ArrayList<>();
         long curtime = currentServerTime();
 
-        for(PlayerBuffValueHolder pb : lpbvl) {
+        for (PlayerBuffValueHolder pb : lpbvl) {
             timedBuffs.add(new Pair<>(curtime - pb.usedTime, pb));
         }
 

src/main/java/net/server/channel/handlers/PlayerMapTransitionHandler.java

@@ -34,7 +34,6 @@ import java.util.Collections;
 import java.util.List;
 
 /**
- *
  * @author Ronan
  */
 public final class PlayerMapTransitionHandler extends AbstractPacketHandler {