diff --git a/src/main/java/net/server/audit/locks/MonitoredLockType.java b/src/main/java/net/server/audit/locks/MonitoredLockType.java index 53d78f062f..520db9a291 100644 --- a/src/main/java/net/server/audit/locks/MonitoredLockType.java +++ b/src/main/java/net/server/audit/locks/MonitoredLockType.java @@ -108,5 +108,5 @@ public enum MonitoredLockType { MAP_AGGRO_IDLE, MINIDUNGEON, REACTOR, - REACTOR_HIT; + REACTOR_HIT } diff --git a/src/main/java/net/server/channel/handlers/EnterMTSHandler.java b/src/main/java/net/server/channel/handlers/EnterMTSHandler.java index 6cd496cae0..8695b1f714 100644 --- a/src/main/java/net/server/channel/handlers/EnterMTSHandler.java +++ b/src/main/java/net/server/channel/handlers/EnterMTSHandler.java @@ -120,7 +120,7 @@ public final class EnterMTSHandler extends AbstractMaplePacketHandler { c.announce(MaplePacketCreator.showMTSCash(c.getPlayer())); List items = new ArrayList<>(); int pages = 0; - try (Connection con = DatabaseConnection.getConnection();) { + try (Connection con = DatabaseConnection.getConnection()) { try (PreparedStatement ps = con.prepareStatement("SELECT * FROM mts_items WHERE tab = 1 AND transfer = 0 ORDER BY id DESC LIMIT 16, 16"); ResultSet rs = ps.executeQuery()) { while (rs.next()) { diff --git a/src/main/java/net/server/channel/handlers/TransferNameHandler.java b/src/main/java/net/server/channel/handlers/TransferNameHandler.java index 17f16e4e2e..d434fae6be 100644 --- a/src/main/java/net/server/channel/handlers/TransferNameHandler.java +++ b/src/main/java/net/server/channel/handlers/TransferNameHandler.java @@ -20,13 +20,6 @@ package net.server.channel.handlers; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Timestamp; -import java.util.Calendar; -import java.sql.Connection; - import client.MapleCharacter; import client.MapleClient; import config.YamlConfig; @@ -35,6 +28,9 @@ import tools.DatabaseConnection; import tools.MaplePacketCreator; import tools.data.input.SeekableLittleEndianAccessor; +import java.sql.*; +import java.util.Calendar; + /** * * @author Ronan @@ -76,7 +72,7 @@ public final class TransferNameHandler extends AbstractMaplePacketHandler { } else if(completedTimestamp.getTime() + YamlConfig.config.server.NAME_CHANGE_COOLDOWN > System.currentTimeMillis()) { c.announce(MaplePacketCreator.sendNameTransferRules(3)); return; - }; + } } } catch(SQLException e) { e.printStackTrace(); diff --git a/src/main/java/net/server/channel/handlers/TransferWorldHandler.java b/src/main/java/net/server/channel/handlers/TransferWorldHandler.java index 83a27d8bce..b34078c1b4 100644 --- a/src/main/java/net/server/channel/handlers/TransferWorldHandler.java +++ b/src/main/java/net/server/channel/handlers/TransferWorldHandler.java @@ -20,12 +20,6 @@ package net.server.channel.handlers; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Timestamp; - import client.MapleCharacter; import client.MapleClient; import config.YamlConfig; @@ -35,6 +29,8 @@ import tools.DatabaseConnection; import tools.MaplePacketCreator; import tools.data.input.SeekableLittleEndianAccessor; +import java.sql.*; + /** * * @author Ronan @@ -73,7 +69,7 @@ public final class TransferWorldHandler extends AbstractMaplePacketHandler { } else if(completedTimestamp.getTime() + YamlConfig.config.server.WORLD_TRANSFER_COOLDOWN > System.currentTimeMillis()) { c.announce(MaplePacketCreator.sendWorldTransferRules(7, c)); return; - }; + } } } catch(SQLException e) { e.printStackTrace(); diff --git a/src/main/java/net/server/coordinator/world/MapleInviteCoordinator.java b/src/main/java/net/server/coordinator/world/MapleInviteCoordinator.java index 05a75324b5..91de9c9590 100644 --- a/src/main/java/net/server/coordinator/world/MapleInviteCoordinator.java +++ b/src/main/java/net/server/coordinator/world/MapleInviteCoordinator.java @@ -22,10 +22,10 @@ package net.server.coordinator.world; import client.MapleCharacter; import tools.Pair; +import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import java.util.HashSet; import java.util.concurrent.ConcurrentHashMap; /** @@ -37,7 +37,7 @@ public class MapleInviteCoordinator { public enum InviteResult { ACCEPTED, DENIED, - NOT_FOUND; + NOT_FOUND } public enum InviteType { diff --git a/src/main/java/provider/wz/MapleDataType.java b/src/main/java/provider/wz/MapleDataType.java index e074d57d14..517d8e55ea 100644 --- a/src/main/java/provider/wz/MapleDataType.java +++ b/src/main/java/provider/wz/MapleDataType.java @@ -22,5 +22,5 @@ package provider.wz; public enum MapleDataType { - NONE, IMG_0x00, SHORT, INT, FLOAT, DOUBLE, STRING, EXTENDED, PROPERTY, CANVAS, VECTOR, CONVEX, SOUND, UOL, UNKNOWN_TYPE, UNKNOWN_EXTENDED_TYPE; + NONE, IMG_0x00, SHORT, INT, FLOAT, DOUBLE, STRING, EXTENDED, PROPERTY, CANVAS, VECTOR, CONVEX, SOUND, UOL, UNKNOWN_TYPE, UNKNOWN_EXTENDED_TYPE } \ No newline at end of file diff --git a/src/main/java/server/maps/MapleMapObjectType.java b/src/main/java/server/maps/MapleMapObjectType.java index aaec452ce1..2e6f2dbcc6 100644 --- a/src/main/java/server/maps/MapleMapObjectType.java +++ b/src/main/java/server/maps/MapleMapObjectType.java @@ -22,5 +22,5 @@ package server.maps; public enum MapleMapObjectType { - NPC, MONSTER, ITEM, PLAYER, DOOR, SUMMON, SHOP, MINI_GAME, MIST, REACTOR, HIRED_MERCHANT, PLAYER_NPC, DRAGON, KITE; + NPC, MONSTER, ITEM, PLAYER, DOOR, SUMMON, SHOP, MINI_GAME, MIST, REACTOR, HIRED_MERCHANT, PLAYER_NPC, DRAGON, KITE } diff --git a/src/main/java/server/maps/MapleMiniGame.java b/src/main/java/server/maps/MapleMiniGame.java index 30b7066fe2..bd4b00a1bb 100644 --- a/src/main/java/server/maps/MapleMiniGame.java +++ b/src/main/java/server/maps/MapleMiniGame.java @@ -24,10 +24,11 @@ package server.maps; import client.MapleCharacter; import client.MapleClient; import net.server.Server; +import tools.MaplePacketCreator; + import java.util.ArrayList; import java.util.Collections; import java.util.List; -import tools.MaplePacketCreator; /** * @@ -68,7 +69,7 @@ public class MapleMiniGame extends AbstractMapleMapObject { } public static enum MiniGameResult { - WIN, LOSS, TIE; + WIN, LOSS, TIE } public MapleMiniGame(MapleCharacter owner, String description, String password) { diff --git a/src/main/java/tools/LogHelper.java b/src/main/java/tools/LogHelper.java index 7d37d78a8c..3a7e83ccf6 100644 --- a/src/main/java/tools/LogHelper.java +++ b/src/main/java/tools/LogHelper.java @@ -1,16 +1,16 @@ package tools; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; - +import client.MapleCharacter; import client.MapleClient; +import client.inventory.Item; import net.server.Server; import server.MapleItemInformationProvider; import server.MapleTrade; import server.expeditions.MapleExpedition; -import client.MapleCharacter; -import client.inventory.Item; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; public class LogHelper { @@ -22,14 +22,14 @@ public class LogHelper { log += trade1.getExchangeMesos() + " mesos from " + name1 + " to " + name2 + " \r\n"; for (Item item : trade1.getItems()){ String itemName = MapleItemInformationProvider.getInstance().getName(item.getItemId()) + "(" + item.getItemId() + ")"; - log += item.getQuantity() + " " + itemName + " from " + name1 + " to " + name2 + " \r\n";; - } + log += item.getQuantity() + " " + itemName + " from " + name1 + " to " + name2 + " \r\n"; + } //Trade 2 to trade 1 log += trade2.getExchangeMesos() + " mesos from " + name2 + " to " + name1 + " \r\n"; for (Item item : trade2.getItems()){ String itemName = MapleItemInformationProvider.getInstance().getName(item.getItemId()) + "(" + item.getItemId() + ")"; - log += item.getQuantity() + " " + itemName + " from " + name2 + " to " + name1 + " \r\n";; - } + log += item.getQuantity() + " " + itemName + " from " + name2 + " to " + name1 + " \r\n"; + } log += "\r\n\r\n"; FilePrinter.print(FilePrinter.LOG_TRADE, log); }