From 88d68220d023f6e3ee0dd494ee6d27ee0080ddec Mon Sep 17 00:00:00 2001 From: Swirny Date: Sat, 23 May 2020 17:57:29 +0200 Subject: [PATCH 1/5] Added Ban counter to MOD Tools --- .../modtool/ModToolUserInfoComposer.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java index 5e1b4111..d0322384 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java @@ -11,8 +11,7 @@ import gnu.trove.map.hash.THashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.sql.ResultSet; -import java.sql.SQLException; +import java.sql.*; import java.util.ArrayList; public class ModToolUserInfoComposer extends MessageComposer { @@ -28,6 +27,17 @@ public class ModToolUserInfoComposer extends MessageComposer { protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolUserInfoComposer); try { + int totalBans = 0; + try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("SELECT COUNT(*) AS amount FROM bans WHERE user_id = ?")) { + statement.setInt(1, this.set.getInt("user_id")); + try (ResultSet set = statement.executeQuery()) { + if (set.next()) { + totalBans = set.getInt("totalBans"); + } + } + } catch (SQLException e) { + LOGGER.error("Caught SQL exception", e); + } this.response.appendInt(this.set.getInt("user_id")); this.response.appendString(this.set.getString("username")); this.response.appendString(this.set.getString("look")); @@ -42,7 +52,7 @@ public class ModToolUserInfoComposer extends MessageComposer { this.response.appendString(""); //Trading lock expiry timestamp this.response.appendString(""); //Last Purchase Timestamp this.response.appendInt(this.set.getInt("user_id")); //Personal Identification # - this.response.appendInt(0); //Number of bans + this.response.appendInt(totalBans); //Number of bans this.response.appendString(this.set.getString("mail")); this.response.appendString("Rank (" + this.set.getInt("rank_id") + "): " + this.set.getString("rank_name")); //user_class_txt From 4ad8d3d077226d61d1ec22550754b2f26680b0b2 Mon Sep 17 00:00:00 2001 From: Swirny <140-Swirny@users.noreply.git.krews.org> Date: Sat, 23 May 2020 17:37:39 -0400 Subject: [PATCH 2/5] Removed optional exception logger --- .../messages/outgoing/modtool/ModToolUserInfoComposer.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java index d0322384..df4ce0d7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java @@ -35,8 +35,6 @@ public class ModToolUserInfoComposer extends MessageComposer { totalBans = set.getInt("totalBans"); } } - } catch (SQLException e) { - LOGGER.error("Caught SQL exception", e); } this.response.appendInt(this.set.getInt("user_id")); this.response.appendString(this.set.getString("username")); From 5bd184a03affda6dd2088e222e9da3804a90a8a9 Mon Sep 17 00:00:00 2001 From: Swirny <140-Swirny@users.noreply.git.krews.org> Date: Sat, 23 May 2020 17:37:39 -0400 Subject: [PATCH 3/5] Revert "Removed optional exception logger" This reverts commit 4ad8d3d077226d61d1ec22550754b2f26680b0b2. --- .../messages/outgoing/modtool/ModToolUserInfoComposer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java index df4ce0d7..d0322384 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java @@ -35,6 +35,8 @@ public class ModToolUserInfoComposer extends MessageComposer { totalBans = set.getInt("totalBans"); } } + } catch (SQLException e) { + LOGGER.error("Caught SQL exception", e); } this.response.appendInt(this.set.getInt("user_id")); this.response.appendString(this.set.getString("username")); From 10f860dc0ceb21a3bbd5d6757253cc85510afd60 Mon Sep 17 00:00:00 2001 From: Mike <76-Mike@users.noreply.git.krews.org> Date: Sun, 7 Jun 2020 02:58:38 +0200 Subject: [PATCH 4/5] Add catch. --- .../messages/outgoing/modtool/ModToolUserInfoComposer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java index d0322384..e1bb135c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java @@ -28,16 +28,21 @@ public class ModToolUserInfoComposer extends MessageComposer { this.response.init(Outgoing.ModToolUserInfoComposer); try { int totalBans = 0; - try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("SELECT COUNT(*) AS amount FROM bans WHERE user_id = ?")) { + + try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); + PreparedStatement statement = connection.prepareStatement("SELECT COUNT(*) AS amount FROM bans WHERE user_id = ?")) { statement.setInt(1, this.set.getInt("user_id")); try (ResultSet set = statement.executeQuery()) { if (set.next()) { totalBans = set.getInt("totalBans"); } + } catch (SQLException e) { + LOGGER.error("Caught SQL exception", e); } } catch (SQLException e) { LOGGER.error("Caught SQL exception", e); } + this.response.appendInt(this.set.getInt("user_id")); this.response.appendString(this.set.getString("username")); this.response.appendString(this.set.getString("look")); From 46d431e190a54c02f6c7a23e34f9647f22895835 Mon Sep 17 00:00:00 2001 From: Mike <76-Mike@users.noreply.git.krews.org> Date: Sun, 7 Jun 2020 03:05:22 +0200 Subject: [PATCH 5/5] Fix bans count --- .../messages/outgoing/modtool/ModToolUserInfoComposer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java index e1bb135c..74fde87e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java @@ -34,7 +34,7 @@ public class ModToolUserInfoComposer extends MessageComposer { statement.setInt(1, this.set.getInt("user_id")); try (ResultSet set = statement.executeQuery()) { if (set.next()) { - totalBans = set.getInt("totalBans"); + totalBans = set.getInt("amount"); } } catch (SQLException e) { LOGGER.error("Caught SQL exception", e); @@ -52,12 +52,12 @@ public class ModToolUserInfoComposer extends MessageComposer { this.response.appendInt(this.set.getInt("cfh_send")); this.response.appendInt(this.set.getInt("cfh_abusive")); this.response.appendInt(this.set.getInt("cfh_warnings")); - this.response.appendInt(this.set.getInt("cfh_bans")); + this.response.appendInt(totalBans); // Number of bans this.response.appendInt(this.set.getInt("tradelock_amount")); this.response.appendString(""); //Trading lock expiry timestamp this.response.appendString(""); //Last Purchase Timestamp this.response.appendInt(this.set.getInt("user_id")); //Personal Identification # - this.response.appendInt(totalBans); //Number of bans + this.response.appendInt(0); // Number of account bans this.response.appendString(this.set.getString("mail")); this.response.appendString("Rank (" + this.set.getInt("rank_id") + "): " + this.set.getString("rank_name")); //user_class_txt