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

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

Browse Source
This commit is contained in:
P0nk
2021-04-04 15:50:53 +02:00
parent e322b05707
commit 817a518e82
1 changed files with 169 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

259
src/main/java/net/server/guild/MapleGuild.java
View File

@@ -24,33 +24,24 @@ package net.server.guild;
import client.MapleCharacter; import client.MapleCharacter;
import client.MapleClient; import client.MapleClient;
import config.YamlConfig; import config.YamlConfig;
import net.server.PlayerStorage;
import net.server.Server;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.channel.Channel;
import net.server.coordinator.matchchecker.MapleMatchCheckerCoordinator;
import net.server.coordinator.world.MapleInviteCoordinator;
import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.*;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.PlayerStorage;
import net.server.Server;
import net.server.channel.Channel;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import net.server.audit.locks.MonitoredLockType;
import net.server.coordinator.world.MapleInviteCoordinator;
import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult;
import net.server.coordinator.matchchecker.MapleMatchCheckerCoordinator;
public class MapleGuild { public class MapleGuild {
@@ -61,7 +52,7 @@ public class MapleGuild {
private final List<MapleGuildCharacter> members; private final List<MapleGuildCharacter> members;
private final Lock membersLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.GUILD, true); private final Lock membersLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.GUILD, true);
private String rankTitles[] = new String[5]; // 1 = master, 2 = jr, 5 = lowest member private String[] rankTitles = new String[5]; // 1 = master, 2 = jr, 5 = lowest member
private String name, notice; private String name, notice;
private int id, gp, logo, logoColor, leader, capacity, logoBG, logoBGColor, signature, allianceId; private int id, gp, logo, logoColor, leader, capacity, logoBG, logoBGColor, signature, allianceId;
private int world; private int world;
@@ -71,49 +62,46 @@ public class MapleGuild {
public MapleGuild(int guildid, int world) { public MapleGuild(int guildid, int world) {
this.world = world; this.world = world;
members = new ArrayList<>(); members = new ArrayList<>();
Connection con = null;
try {
con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT * FROM guilds WHERE guildid = " + guildid);
ResultSet rs = ps.executeQuery();
if (!rs.next()) {
id = -1;
ps.close();
rs.close();
return;
}
id = guildid;
name = rs.getString("name");
gp = rs.getInt("GP");
logo = rs.getInt("logo");
logoColor = rs.getInt("logoColor");
logoBG = rs.getInt("logoBG");
logoBGColor = rs.getInt("logoBGColor");
capacity = rs.getInt("capacity");
for (int i = 1; i <= 5; i++) {
rankTitles[i - 1] = rs.getString("rank" + i + "title");
}
leader = rs.getInt("leader");
notice = rs.getString("notice");
signature = rs.getInt("signature");
allianceId = rs.getInt("allianceId");
ps.close();
rs.close();
ps = con.prepareStatement("SELECT id, name, level, job, guildrank, allianceRank FROM characters WHERE guildid = ? ORDER BY guildrank ASC, name ASC");
ps.setInt(1, guildid);
rs = ps.executeQuery();
if (!rs.next()) {
rs.close();
ps.close();
return;
}
do {
members.add(new MapleGuildCharacter(null, rs.getInt("id"), rs.getInt("level"), rs.getString("name"), (byte) -1, world, rs.getInt("job"), rs.getInt("guildrank"), guildid, false, rs.getInt("allianceRank")));
} while (rs.next());
ps.close(); try (Connection con = DatabaseConnection.getConnection()) {
rs.close(); try (PreparedStatement ps = con.prepareStatement("SELECT * FROM guilds WHERE guildid = " + guildid);
con.close(); ResultSet rs = ps.executeQuery()) {
if (!rs.next()) {
id = -1;
ps.close();
rs.close();
return;
}
id = guildid;
name = rs.getString("name");
gp = rs.getInt("GP");
logo = rs.getInt("logo");
logoColor = rs.getInt("logoColor");
logoBG = rs.getInt("logoBG");
logoBGColor = rs.getInt("logoBGColor");
capacity = rs.getInt("capacity");
for (int i = 1; i <= 5; i++) {
rankTitles[i - 1] = rs.getString("rank" + i + "title");
}
leader = rs.getInt("leader");
notice = rs.getString("notice");
signature = rs.getInt("signature");
allianceId = rs.getInt("allianceId");
}
try (PreparedStatement ps = con.prepareStatement("SELECT id, name, level, job, guildrank, allianceRank FROM characters WHERE guildid = ? ORDER BY guildrank ASC, name ASC")) {
ps.setInt(1, guildid);
try (ResultSet rs = ps.executeQuery()) {
if (!rs.next()) {
return;
}
do {
members.add(new MapleGuildCharacter(null, rs.getInt("id"), rs.getInt("level"), rs.getString("name"), (byte) -1, world, rs.getInt("job"), rs.getInt("guildrank"), guildid, false, rs.getInt("allianceRank")));
} while (rs.next());
}
}
} catch (SQLException se) { } catch (SQLException se) {
se.printStackTrace(); se.printStackTrace();
System.out.println("Unable to read guild information from sql: " + se); System.out.println("Unable to read guild information from sql: " + se);
@@ -149,7 +137,9 @@ public class MapleGuild {
synchronized (notifications) { synchronized (notifications) {
chl = notifications.get(mgc.getChannel()); chl = notifications.get(mgc.getChannel());
} }
if (chl != null) chl.add(mgc.getId()); if (chl != null) {
chl.add(mgc.getId());
}
//Unable to connect to Channel... error was here //Unable to connect to Channel... error was here
} }
} finally { } finally {
@@ -160,8 +150,7 @@ public class MapleGuild {
} }
public void writeToDB(boolean bDisband) { public void writeToDB(boolean bDisband) {
try { try (Connection con = DatabaseConnection.getConnection()) {
Connection con = DatabaseConnection.getConnection();
if (!bDisband) { if (!bDisband) {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
@@ -182,17 +171,18 @@ public class MapleGuild {
ps.setInt(11, capacity); ps.setInt(11, capacity);
ps.setString(12, notice); ps.setString(12, notice);
ps.setInt(13, this.id); ps.setInt(13, this.id);
ps.execute(); ps.executeUpdate();
} }
} else { } else {
PreparedStatement ps = con.prepareStatement("UPDATE characters SET guildid = 0, guildrank = 5 WHERE guildid = ?"); try (PreparedStatement ps = con.prepareStatement("UPDATE characters SET guildid = 0, guildrank = 5 WHERE guildid = ?")) {
ps.setInt(1, this.id); ps.setInt(1, this.id);
ps.execute(); ps.executeUpdate();
ps.close(); }
ps = con.prepareStatement("DELETE FROM guilds WHERE guildid = ?");
ps.setInt(1, this.id); try (PreparedStatement ps = con.prepareStatement("DELETE FROM guilds WHERE guildid = ?")) {
ps.execute(); ps.setInt(1, this.id);
ps.close(); ps.executeUpdate();
}
membersLock.lock(); membersLock.lock();
try { try {
@@ -201,8 +191,6 @@ public class MapleGuild {
membersLock.unlock(); membersLock.unlock();
} }
} }
con.close();
} catch (SQLException se) { } catch (SQLException se) {
se.printStackTrace(); se.printStackTrace();
} }
@@ -289,7 +277,9 @@ public class MapleGuild {
for (MapleGuildCharacter mgc : getMembers()) { for (MapleGuildCharacter mgc : getMembers()) {
MapleCharacter chr = ps.getCharacterById(mgc.getId()); MapleCharacter chr = ps.getCharacterById(mgc.getId());
if (chr == null || !chr.isLoggedinWorld()) continue; if (chr == null || !chr.isLoggedinWorld()) {
continue;
}
byte[] packet = MaplePacketCreator.guildNameChanged(chr.getId(), this.getName()); byte[] packet = MaplePacketCreator.guildNameChanged(chr.getId(), this.getName());
chr.getMap().broadcastMessage(chr, packet); chr.getMap().broadcastMessage(chr, packet);
@@ -301,7 +291,9 @@ public class MapleGuild {
for (MapleGuildCharacter mgc : getMembers()) { for (MapleGuildCharacter mgc : getMembers()) {
MapleCharacter chr = ps.getCharacterById(mgc.getId()); MapleCharacter chr = ps.getCharacterById(mgc.getId());
if (chr == null || !chr.isLoggedinWorld()) continue; if (chr == null || !chr.isLoggedinWorld()) {
continue;
}
byte[] packet = MaplePacketCreator.guildMarkChanged(chr.getId(), this); byte[] packet = MaplePacketCreator.guildMarkChanged(chr.getId(), this);
chr.getMap().broadcastMessage(chr, packet); chr.getMap().broadcastMessage(chr, packet);
@@ -313,7 +305,9 @@ public class MapleGuild {
for (MapleGuildCharacter mgc : getMembers()) { for (MapleGuildCharacter mgc : getMembers()) {
MapleCharacter chr = ps.getCharacterById(mgc.getId()); MapleCharacter chr = ps.getCharacterById(mgc.getId());
if (chr == null || !chr.isLoggedinWorld()) continue; if (chr == null || !chr.isLoggedinWorld()) {
continue;
}
byte[] packet = MaplePacketCreator.showGuildInfo(chr); byte[] packet = MaplePacketCreator.showGuildInfo(chr);
chr.announce(packet); chr.announce(packet);
@@ -381,7 +375,7 @@ public class MapleGuild {
membersLock.lock(); membersLock.lock();
try { try {
for (MapleGuildCharacter mgc : members) { for (MapleGuildCharacter mgc : members) {
if(mgc.getCharacter() != null) { if (mgc.getCharacter() != null) {
mgc.getCharacter().dropMessage(type, message); mgc.getCharacter().dropMessage(type, message);
} }
} }
@@ -431,41 +425,40 @@ public class MapleGuild {
} }
public static int createGuild(int leaderId, String name) { public static int createGuild(int leaderId, String name) {
try { try (Connection con = DatabaseConnection.getConnection()) {
Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT guildid FROM guilds WHERE name = ?"); try (PreparedStatement ps = con.prepareStatement("SELECT guildid FROM guilds WHERE name = ?")) {
ps.setString(1, name); ps.setString(1, name);
ResultSet rs = ps.executeQuery(); try (ResultSet rs = ps.executeQuery()) {
if (rs.next()) { if (rs.next()) {
ps.close(); return 0;
rs.close(); }
return 0; }
} }
ps.close();
rs.close();
ps = con.prepareStatement("INSERT INTO guilds (`leader`, `name`, `signature`) VALUES (?, ?, ?)"); try (PreparedStatement ps = con.prepareStatement("INSERT INTO guilds (`leader`, `name`, `signature`) VALUES (?, ?, ?)")) {
ps.setInt(1, leaderId); ps.setInt(1, leaderId);
ps.setString(2, name); ps.setString(2, name);
ps.setInt(3, (int) System.currentTimeMillis()); ps.setInt(3, (int) System.currentTimeMillis());
ps.execute(); ps.executeUpdate();
ps.close(); }
ps = con.prepareStatement("SELECT guildid FROM guilds WHERE leader = ?"); final int guildId;
ps.setInt(1, leaderId); try (PreparedStatement ps = con.prepareStatement("SELECT guildid FROM guilds WHERE leader = ?")) {
rs = ps.executeQuery(); ps.setInt(1, leaderId);
rs.next();
int guildId = rs.getInt("guildid");
rs.close();
ps.close();
ps = con.prepareStatement("UPDATE characters SET guildid = ? WHERE id = ?"); try (ResultSet rs = ps.executeQuery()) {
ps.setInt(1, guildId); rs.next();
ps.setInt(2, leaderId); guildId = rs.getInt("guildid");
ps.executeUpdate(); }
ps.close(); }
try (PreparedStatement ps = con.prepareStatement("UPDATE characters SET guildid = ? WHERE id = ?")) {
ps.setInt(1, guildId);
ps.setInt(2, leaderId);
ps.executeUpdate();
}
con.close();
return guildId; return guildId;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@@ -646,7 +639,7 @@ public class MapleGuild {
} }
public void disbandGuild() { public void disbandGuild() {
if(allianceId > 0) { if (allianceId > 0) {
if (!MapleAlliance.removeGuildFromAlliance(allianceId, id, world)) { if (!MapleAlliance.removeGuildFromAlliance(allianceId, id, world)) {
MapleAlliance.disbandAlliance(allianceId); MapleAlliance.disbandAlliance(allianceId);
} }
@@ -714,7 +707,7 @@ public class MapleGuild {
this.guildMessage(MaplePacketCreator.getGPMessage(amount)); this.guildMessage(MaplePacketCreator.getGPMessage(amount));
} }
public void removeGP(int amount){ public void removeGP(int amount) {
this.gp -= amount; this.gp -= amount;
this.writeToDB(false); this.writeToDB(false);
this.guildMessage(MaplePacketCreator.updateGP(this.id, this.gp)); this.guildMessage(MaplePacketCreator.updateGP(this.id, this.gp));
@@ -776,16 +769,10 @@ public class MapleGuild {
} }
public static void displayGuildRanks(MapleClient c, int npcid) { public static void displayGuildRanks(MapleClient c, int npcid) {
try { try (Connection con = DatabaseConnection.getConnection();
ResultSet rs; PreparedStatement ps = con.prepareStatement("SELECT `name`, `GP`, `logoBG`, `logoBGColor`, `logo`, `logoColor` FROM guilds ORDER BY `GP` DESC LIMIT 50", ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
Connection con = DatabaseConnection.getConnection(); ResultSet rs = ps.executeQuery()) {
try (PreparedStatement ps = con.prepareStatement("SELECT `name`, `GP`, `logoBG`, `logoBGColor`, `logo`, `logoColor` FROM guilds ORDER BY `GP` DESC LIMIT 50", c.announce(MaplePacketCreator.showGuildRanks(npcid, rs));
ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY)) {
rs = ps.executeQuery();
c.announce(MaplePacketCreator.showGuildRanks(npcid, rs));
}
rs.close();
con.close();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
System.out.println("failed to display guild ranks. " + e); System.out.println("failed to display guild ranks. " + e);
@@ -798,15 +785,11 @@ public class MapleGuild {
public void setAllianceId(int aid) { public void setAllianceId(int aid) {
this.allianceId = aid; this.allianceId = aid;
try { try (Connection con = DatabaseConnection.getConnection();
Connection con = DatabaseConnection.getConnection(); PreparedStatement ps = con.prepareStatement("UPDATE guilds SET allianceId = ? WHERE guildid = ?")) {
try (PreparedStatement ps = con.prepareStatement("UPDATE guilds SET allianceId = ? WHERE guildid = ?")) { ps.setInt(1, aid);
ps.setInt(1, aid); ps.setInt(2, id);
ps.setInt(2, id); ps.executeUpdate();
ps.executeUpdate();
}
con.close();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -816,8 +799,8 @@ public class MapleGuild {
try { try {
membersLock.lock(); membersLock.lock();
try { try {
for(MapleGuildCharacter mgc: members) { for (MapleGuildCharacter mgc : members) {
if(mgc.isOnline()) { if (mgc.isOnline()) {
mgc.setAllianceRank(5); mgc.setAllianceRank(5);
} }
} }
@@ -825,14 +808,12 @@ public class MapleGuild {
membersLock.unlock(); membersLock.unlock();
} }
Connection con = DatabaseConnection.getConnection(); try (Connection con = DatabaseConnection.getConnection();
try (PreparedStatement ps = con.prepareStatement("UPDATE characters SET allianceRank = ? WHERE guildid = ?")) { PreparedStatement ps = con.prepareStatement("UPDATE characters SET allianceRank = ? WHERE guildid = ?")) {
ps.setInt(1, 5); ps.setInt(1, 5);
ps.setInt(2, id); ps.setInt(2, id);
ps.executeUpdate(); ps.executeUpdate();
} }
con.close();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
} }