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

refactor: use try-with-resources for db operations in various handlers

Browse Source
This commit is contained in:
P0nk
2021-04-05 00:11:42 +02:00
parent 429f82e4fe
commit e13c313839
5 changed files with 222 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/net/server/channel/handlers/WhisperHandler.java
View File

@@ -21,10 +21,9 @@
*/
package net.server.channel.handlers;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import client.MapleCharacter;
import client.MapleClient;
import client.autoban.AutobanFactory;
import config.YamlConfig;
import net.AbstractMaplePacketHandler;
import net.server.world.World;
@@ -33,10 +32,11 @@ import tools.FilePrinter;
import tools.LogHelper;
import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import client.MapleCharacter;
import client.MapleClient;
import client.autoban.AutobanFactory;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
/**
*
@@ -101,20 +101,18 @@ public final class WhisperHandler extends AbstractMaplePacketHandler {
c.announce(MaplePacketCreator.getFindReply(victim.getName(), victim.getMap().getId(), 1));
}
} else if (c.getPlayer().isGM()) { // not found
try {
Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT gm FROM characters WHERE name = ?");
try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT gm FROM characters WHERE name = ?")) {
ps.setString(1, recipient);
ResultSet rs = ps.executeQuery();
if (rs.next()) {
if (rs.getInt("gm") >= c.getPlayer().gmLevel()) {
c.announce(MaplePacketCreator.getWhisperReply(recipient, (byte) 0));
return;
try (ResultSet rs = ps.executeQuery()) {
if (rs.next()) {
if (rs.getInt("gm") >= c.getPlayer().gmLevel()) {
c.announce(MaplePacketCreator.getWhisperReply(recipient, (byte) 0));
return;
}
}
}
rs.close();
ps.close();
con.close();
byte channel = (byte) (c.getWorldServer().find(recipient) - 1);
if (channel > -1) {
c.announce(MaplePacketCreator.getFindReply(recipient, channel, 3));