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

refactor: use try-with-resources for pet db operations

Browse Source
This commit is contained in:
P0nk
2021-04-04 22:54:25 +02:00
parent 0b91b02f80
commit 5cb69910bd
1 changed files with 33 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/main/java/client/inventory/MaplePet.java
View File

@@ -21,23 +21,24 @@
*/ */
package client.inventory; package client.inventory;
import client.MapleCharacter;
import client.inventory.manipulator.MapleCashidGenerator;
import constants.game.ExpTable; import constants.game.ExpTable;
import java.awt.Point;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
import tools.DatabaseConnection;
import server.MapleItemInformationProvider; import server.MapleItemInformationProvider;
import server.movement.AbsoluteLifeMovement; import server.movement.AbsoluteLifeMovement;
import server.movement.LifeMovement; import server.movement.LifeMovement;
import server.movement.LifeMovementFragment; import server.movement.LifeMovementFragment;
import client.MapleCharacter; import tools.DatabaseConnection;
import client.inventory.manipulator.MapleCashidGenerator;
import java.sql.Connection;
import tools.MaplePacketCreator; import tools.MaplePacketCreator;
import tools.Pair; import tools.Pair;
import java.awt.*;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
/** /**
* *
* @author Matze * @author Matze
@@ -75,22 +76,20 @@ public class MaplePet extends Item {
} }
public static MaplePet loadFromDb(int itemid, short position, int petid) { public static MaplePet loadFromDb(int itemid, short position, int petid) {
try { MaplePet ret = new MaplePet(itemid, position, petid);
MaplePet ret = new MaplePet(itemid, position, petid); try (Connection con = DatabaseConnection.getConnection();
Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("SELECT name, level, closeness, fullness, summoned, flag FROM pets WHERE petid = ?")) { // Get the pet details...
PreparedStatement ps = con.prepareStatement("SELECT name, level, closeness, fullness, summoned, flag FROM pets WHERE petid = ?"); // Get pet details..
ps.setInt(1, petid); ps.setInt(1, petid);
ResultSet rs = ps.executeQuery();
rs.next(); try (ResultSet rs = ps.executeQuery()) {
ret.setName(rs.getString("name")); rs.next();
ret.setCloseness(Math.min(rs.getInt("closeness"), 30000)); ret.setName(rs.getString("name"));
ret.setLevel((byte) Math.min(rs.getByte("level"), 30)); ret.setCloseness(Math.min(rs.getInt("closeness"), 30000));
ret.setFullness(Math.min(rs.getInt("fullness"), 100)); ret.setLevel((byte) Math.min(rs.getByte("level"), 30));
ret.setSummoned(rs.getInt("summoned") == 1); ret.setFullness(Math.min(rs.getInt("fullness"), 100));
ret.setPetFlag(rs.getInt("flag")); ret.setSummoned(rs.getInt("summoned") == 1);
rs.close(); ret.setPetFlag(rs.getInt("flag"));
ps.close(); }
con.close();
return ret; return ret;
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
@@ -99,16 +98,11 @@ public class MaplePet extends Item {
} }
public static void deleteFromDb(MapleCharacter owner, int petid) { public static void deleteFromDb(MapleCharacter owner, int petid) {
try { try (Connection con = DatabaseConnection.getConnection();
Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("DELETE FROM pets WHERE `petid` = ?")) {
// thanks Vcoc for detecting petignores remaining after deletion
PreparedStatement ps = con.prepareStatement("DELETE FROM pets WHERE `petid` = ?"); // thanks Vcoc for detecting petignores remaining after deletion
ps.setInt(1, petid); ps.setInt(1, petid);
ps.executeUpdate();
ps.close();
con.close();
owner.resetExcluded(petid); owner.resetExcluded(petid);
MapleCashidGenerator.freeCashId(petid); MapleCashidGenerator.freeCashId(petid);
} catch (SQLException ex) { } catch (SQLException ex) {
@@ -117,9 +111,8 @@ public class MaplePet extends Item {
} }
public void saveToDb() { public void saveToDb() {
try { try (Connection con = DatabaseConnection.getConnection();
Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE pets SET name = ?, level = ?, closeness = ?, fullness = ?, summoned = ?, flag = ? WHERE petid = ?")) {
PreparedStatement ps = con.prepareStatement("UPDATE pets SET name = ?, level = ?, closeness = ?, fullness = ?, summoned = ?, flag = ? WHERE petid = ?");
ps.setString(1, getName()); ps.setString(1, getName());
ps.setInt(2, getLevel()); ps.setInt(2, getLevel());
ps.setInt(3, getCloseness()); ps.setInt(3, getCloseness());
@@ -128,23 +121,18 @@ public class MaplePet extends Item {
ps.setInt(6, getPetFlag()); ps.setInt(6, getPetFlag());
ps.setInt(7, getUniqueId()); ps.setInt(7, getUniqueId());
ps.executeUpdate(); ps.executeUpdate();
ps.close();
con.close();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
public static int createPet(int itemid) { public static int createPet(int itemid) {
try { try (Connection con = DatabaseConnection.getConnection();
Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO pets (petid, name, level, closeness, fullness, summoned, flag) VALUES (?, ?, 1, 0, 100, 0, 0)")) {
PreparedStatement ps = con.prepareStatement("INSERT INTO pets (petid, name, level, closeness, fullness, summoned, flag) VALUES (?, ?, 1, 0, 100, 0, 0)");
int ret = MapleCashidGenerator.generateCashId(); int ret = MapleCashidGenerator.generateCashId();
ps.setInt(1, ret); ps.setInt(1, ret);
ps.setString(2, MapleItemInformationProvider.getInstance().getName(itemid)); ps.setString(2, MapleItemInformationProvider.getInstance().getName(itemid));
ps.executeUpdate(); ps.executeUpdate();
ps.close();
con.close();
return ret; return ret;
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
@@ -153,9 +141,8 @@ public class MaplePet extends Item {
} }
public static int createPet(int itemid, byte level, int closeness, int fullness) { public static int createPet(int itemid, byte level, int closeness, int fullness) {
try { try (Connection con = DatabaseConnection.getConnection();
Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO pets (petid, name, level, closeness, fullness, summoned, flag) VALUES (?, ?, ?, ?, ?, 0, 0)")) {
PreparedStatement ps = con.prepareStatement("INSERT INTO pets (petid, name, level, closeness, fullness, summoned, flag) VALUES (?, ?, ?, ?, ?, 0, 0)");
int ret = MapleCashidGenerator.generateCashId(); int ret = MapleCashidGenerator.generateCashId();
ps.setInt(1, ret); ps.setInt(1, ret);
ps.setString(2, MapleItemInformationProvider.getInstance().getName(itemid)); ps.setString(2, MapleItemInformationProvider.getInstance().getName(itemid));
@@ -163,8 +150,6 @@ public class MaplePet extends Item {
ps.setInt(4, closeness); ps.setInt(4, closeness);
ps.setInt(5, fullness); ps.setInt(5, fullness);
ps.executeUpdate(); ps.executeUpdate();
ps.close();
con.close();
return ret; return ret;
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();