Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup: remove unnecessary semicolon

Browse Source
This commit is contained in:
P0nk
2021-04-08 07:34:56 +02:00
parent f37d4063fb
commit 0ff8a80ef2
9 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/server/audit/locks/MonitoredLockType.java
View File

@@ -108,5 +108,5 @@ public enum MonitoredLockType {
MAP_AGGRO_IDLE, MAP_AGGRO_IDLE,
MINIDUNGEON, MINIDUNGEON,
REACTOR, REACTOR,
REACTOR_HIT; REACTOR_HIT
} }

2
src/main/java/net/server/channel/handlers/EnterMTSHandler.java
View File

@@ -120,7 +120,7 @@ public final class EnterMTSHandler extends AbstractMaplePacketHandler {
c.announce(MaplePacketCreator.showMTSCash(c.getPlayer())); c.announce(MaplePacketCreator.showMTSCash(c.getPlayer()));
List<MTSItemInfo> items = new ArrayList<>(); List<MTSItemInfo> items = new ArrayList<>();
int pages = 0; 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"); 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()) { ResultSet rs = ps.executeQuery()) {
while (rs.next()) { while (rs.next()) {

12
src/main/java/net/server/channel/handlers/TransferNameHandler.java
View File

@@ -20,13 +20,6 @@
package net.server.channel.handlers; 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.MapleCharacter;
import client.MapleClient; import client.MapleClient;
import config.YamlConfig; import config.YamlConfig;
@@ -35,6 +28,9 @@ import tools.DatabaseConnection;
import tools.MaplePacketCreator; import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor; import tools.data.input.SeekableLittleEndianAccessor;
import java.sql.*;
import java.util.Calendar;
/** /**
* *
* @author Ronan * @author Ronan
@@ -76,7 +72,7 @@ public final class TransferNameHandler extends AbstractMaplePacketHandler {
} else if(completedTimestamp.getTime() + YamlConfig.config.server.NAME_CHANGE_COOLDOWN > System.currentTimeMillis()) { } else if(completedTimestamp.getTime() + YamlConfig.config.server.NAME_CHANGE_COOLDOWN > System.currentTimeMillis()) {
c.announce(MaplePacketCreator.sendNameTransferRules(3)); c.announce(MaplePacketCreator.sendNameTransferRules(3));
return; return;
}; }
} }
} catch(SQLException e) { } catch(SQLException e) {
e.printStackTrace(); e.printStackTrace();

10
src/main/java/net/server/channel/handlers/TransferWorldHandler.java
View File

@@ -20,12 +20,6 @@
package net.server.channel.handlers; 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.MapleCharacter;
import client.MapleClient; import client.MapleClient;
import config.YamlConfig; import config.YamlConfig;
@@ -35,6 +29,8 @@ import tools.DatabaseConnection;
import tools.MaplePacketCreator; import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor; import tools.data.input.SeekableLittleEndianAccessor;
import java.sql.*;
/** /**
* *
* @author Ronan * @author Ronan
@@ -73,7 +69,7 @@ public final class TransferWorldHandler extends AbstractMaplePacketHandler {
} else if(completedTimestamp.getTime() + YamlConfig.config.server.WORLD_TRANSFER_COOLDOWN > System.currentTimeMillis()) { } else if(completedTimestamp.getTime() + YamlConfig.config.server.WORLD_TRANSFER_COOLDOWN > System.currentTimeMillis()) {
c.announce(MaplePacketCreator.sendWorldTransferRules(7, c)); c.announce(MaplePacketCreator.sendWorldTransferRules(7, c));
return; return;
}; }
} }
} catch(SQLException e) { } catch(SQLException e) {
e.printStackTrace(); e.printStackTrace();

4
src/main/java/net/server/coordinator/world/MapleInviteCoordinator.java
View File

@@ -22,10 +22,10 @@ package net.server.coordinator.world;
import client.MapleCharacter; import client.MapleCharacter;
import tools.Pair; import tools.Pair;
import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.HashSet;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
/** /**
@@ -37,7 +37,7 @@ public class MapleInviteCoordinator {
public enum InviteResult { public enum InviteResult {
ACCEPTED, ACCEPTED,
DENIED, DENIED,
NOT_FOUND; NOT_FOUND
} }
public enum InviteType { public enum InviteType {

2
src/main/java/provider/wz/MapleDataType.java
View File

@@ -22,5 +22,5 @@
package provider.wz; package provider.wz;
public enum MapleDataType { 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
} }

2
src/main/java/server/maps/MapleMapObjectType.java
View File

@@ -22,5 +22,5 @@
package server.maps; package server.maps;
public enum MapleMapObjectType { 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
} }

5
src/main/java/server/maps/MapleMiniGame.java
View File

@@ -24,10 +24,11 @@ package server.maps;
import client.MapleCharacter; import client.MapleCharacter;
import client.MapleClient; import client.MapleClient;
import net.server.Server; import net.server.Server;
import tools.MaplePacketCreator;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import tools.MaplePacketCreator;
/** /**
* *
@@ -68,7 +69,7 @@ public class MapleMiniGame extends AbstractMapleMapObject {
} }
public static enum MiniGameResult { public static enum MiniGameResult {
WIN, LOSS, TIE; WIN, LOSS, TIE
} }
public MapleMiniGame(MapleCharacter owner, String description, String password) { public MapleMiniGame(MapleCharacter owner, String description, String password) {

16
src/main/java/tools/LogHelper.java
View File

@@ -1,16 +1,16 @@
package tools; package tools;
import java.text.SimpleDateFormat; import client.MapleCharacter;
import java.util.Calendar;
import java.util.Date;
import client.MapleClient; import client.MapleClient;
import client.inventory.Item;
import net.server.Server; import net.server.Server;
import server.MapleItemInformationProvider; import server.MapleItemInformationProvider;
import server.MapleTrade; import server.MapleTrade;
import server.expeditions.MapleExpedition; 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 { public class LogHelper {
@@ -22,13 +22,13 @@ public class LogHelper {
log += trade1.getExchangeMesos() + " mesos from " + name1 + " to " + name2 + " \r\n"; log += trade1.getExchangeMesos() + " mesos from " + name1 + " to " + name2 + " \r\n";
for (Item item : trade1.getItems()){ for (Item item : trade1.getItems()){
String itemName = MapleItemInformationProvider.getInstance().getName(item.getItemId()) + "(" + item.getItemId() + ")"; 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 //Trade 2 to trade 1
log += trade2.getExchangeMesos() + " mesos from " + name2 + " to " + name1 + " \r\n"; log += trade2.getExchangeMesos() + " mesos from " + name2 + " to " + name1 + " \r\n";
for (Item item : trade2.getItems()){ for (Item item : trade2.getItems()){
String itemName = MapleItemInformationProvider.getInstance().getName(item.getItemId()) + "(" + item.getItemId() + ")"; 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"; log += "\r\n\r\n";
FilePrinter.print(FilePrinter.LOG_TRADE, log); FilePrinter.print(FilePrinter.LOG_TRADE, log);