From b7d50720ad0b2fe10acf62a3a3235caa09aa6555 Mon Sep 17 00:00:00 2001 From: Zrips Date: Tue, 29 Sep 2020 12:39:19 +0300 Subject: [PATCH] Cleanup --- .../gamingmesh/jobs/CMILib/CMIChatColor.java | 27 ++++++-------- .../jobs/config/ExploreManager.java | 9 ++--- .../jobs/container/ExploreChunk.java | 10 +++--- .../com/gamingmesh/jobs/dao/JobsMySQL.java | 36 ++++++++++--------- .../jobs/economy/BufferedEconomy.java | 8 ++--- 5 files changed, 42 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/CMIChatColor.java b/src/main/java/com/gamingmesh/jobs/CMILib/CMIChatColor.java index da188e72..43c3c53f 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/CMIChatColor.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/CMIChatColor.java @@ -179,23 +179,16 @@ public class CMIChatColor { gtext = stripColor(gtext); - for (int i = 0; i < gtext.length(); i++) { - char ch = gtext.charAt(i); - int length = gtext.length(); - length = length < 2 ? 2 : length; - - double percent = (i * 100D) / (length - 1); - -// if (gtext.length() == 1) { -// percent = 50D; -// } - - CMIChatColor mix = CMIChatColor.mixColors(c1, c2, percent); - updated += CMIChatColor.colorCodePrefix + mix.getHex() + CMIChatColor.colorCodeSuffix; - - updated += String.valueOf(ch); -// updated += charEscape(String.valueOf(ch)); - } + if (gtext != null) + for (int i = 0; i < gtext.length(); i++) { + char ch = gtext.charAt(i); + int length = gtext.length(); + length = length < 2 ? 2 : length; + double percent = (i * 100D) / (length - 1); + CMIChatColor mix = CMIChatColor.mixColors(c1, c2, percent); + updated += CMIChatColor.colorCodePrefix + mix.getHex() + CMIChatColor.colorCodeSuffix; + updated += String.valueOf(ch); + } if (continuous) { updated += CMIChatColor.colorCodePrefix + gradientMatch.group(5).replace("#", "") + ">" + CMIChatColor.colorCodeSuffix; diff --git a/src/main/java/com/gamingmesh/jobs/config/ExploreManager.java b/src/main/java/com/gamingmesh/jobs/config/ExploreManager.java index ee3354de..af3eedc2 100644 --- a/src/main/java/com/gamingmesh/jobs/config/ExploreManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/ExploreManager.java @@ -91,10 +91,6 @@ public class ExploreManager { try { int worldId = res.getInt(ExploreDataTableFields.worldid.getCollumn()); String worldName = res.getString(ExploreDataTableFields.worldname.getCollumn()); - int x = res.getInt(ExploreDataTableFields.chunkX.getCollumn()); - int z = res.getInt(ExploreDataTableFields.chunkZ.getCollumn()); - String names = res.getString(ExploreDataTableFields.playerNames.getCollumn()); - int id = res.getInt("id"); JobsWorld jobsWorld = Util.getJobsWorld(worldName); if (jobsWorld == null) @@ -103,6 +99,11 @@ public class ExploreManager { if (jobsWorld == null) return; + int x = res.getInt(ExploreDataTableFields.chunkX.getCollumn()); + int z = res.getInt(ExploreDataTableFields.chunkZ.getCollumn()); + String names = res.getString(ExploreDataTableFields.playerNames.getCollumn()); + int id = res.getInt("id"); + ExploreRegion eRegions = worlds.get(jobsWorld.getName()); if (eRegions == null) { int RegionX = (int) Math.floor(x / 32D); diff --git a/src/main/java/com/gamingmesh/jobs/container/ExploreChunk.java b/src/main/java/com/gamingmesh/jobs/container/ExploreChunk.java index e97b987b..f77706b6 100644 --- a/src/main/java/com/gamingmesh/jobs/container/ExploreChunk.java +++ b/src/main/java/com/gamingmesh/jobs/container/ExploreChunk.java @@ -102,12 +102,10 @@ public class ExploreChunk { } } - if (playerIds.size() >= Jobs.getExplore().getPlayerAmount()) { - if (Jobs.getGCManager().ExploreCompact) { - playerIds = null; - if (!names.isEmpty()) - updated = true; - } + if (playerIds.size() >= Jobs.getExplore().getPlayerAmount() && Jobs.getGCManager().ExploreCompact) { + playerIds = null; + if (!names.isEmpty()) + updated = true; } } diff --git a/src/main/java/com/gamingmesh/jobs/dao/JobsMySQL.java b/src/main/java/com/gamingmesh/jobs/dao/JobsMySQL.java index e2003361..dd370806 100644 --- a/src/main/java/com/gamingmesh/jobs/dao/JobsMySQL.java +++ b/src/main/java/com/gamingmesh/jobs/dao/JobsMySQL.java @@ -106,25 +106,27 @@ public class JobsMySQL extends JobsDAO { return false; } catch (SQLException e) { Jobs.consoleMsg("Not a table |" + "SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME ='" + table + "';" + "|"); - } - try { - - PreparedStatement insert = conn.prepareStatement("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME ='" + table + "';"); - ResultSet res = insert.executeQuery(); - if (res.next()) { - res.close(); - insert.close(); - return true; - } - res.close(); - insert.close(); - return false; - } catch (SQLException e) { - Jobs.consoleMsg("Not a table |" + "SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME ='" + table + "';" + "|"); - return false; - } finally { close(statement); } + PreparedStatement insert = null; + ResultSet res = null; + try { + insert = conn.prepareStatement("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME ='" + table + "';"); + res = insert.executeQuery(); + if (res.next()) { + close(res); + close(insert); + close(statement); + return true; + } + } catch (SQLException e) { + Jobs.consoleMsg("Not a table |" + "SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME ='" + table + "';" + "|"); + } finally { + } + close(res); + close(insert); + close(statement); + return false; } @Override diff --git a/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java b/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java index b4b8f387..03eb5110 100644 --- a/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java +++ b/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java @@ -155,7 +155,7 @@ public class BufferedEconomy { if (ServerTaxesAccount.isOnline() && Jobs.getGCManager().ActionBarsMessageByDefault) { ActionBarManager.send(Bukkit.getPlayer(ServerAccountname), - Jobs.getLanguage().getMessage("message.taxes", "[amount]", (int) (TotalAmount * 100) / 100.0)); + Jobs.getLanguage().getMessage("message.taxes", "[amount]", (int) (TotalAmount * 100) / 100.0)); } } @@ -224,15 +224,15 @@ public class BufferedEconomy { String Message = Jobs.getLanguage().getMessage("command.toggle.output.paid.main"); if (payment.get(CurrencyType.MONEY) != 0D) { Message = Message + " " + Jobs.getLanguage().getMessage("command.toggle.output.paid.money", "[amount]", String.format(Jobs.getGCManager().getDecimalPlacesMoney(), - Double.valueOf(payment.get(CurrencyType.MONEY)))); + payment.get(CurrencyType.MONEY))); } if (payment.get(CurrencyType.POINTS) != 0D) { Message = Message + " " + Jobs.getLanguage().getMessage("command.toggle.output.paid.points", "[points]", String.format(Jobs.getGCManager().getDecimalPlacesPoints(), - Double.valueOf(payment.get(CurrencyType.POINTS)))); + payment.get(CurrencyType.POINTS))); } if (payment.get(CurrencyType.EXP) != 0D) { Message = Message + " " + Jobs.getLanguage().getMessage("command.toggle.output.paid.exp", "[exp]", String.format(Jobs.getGCManager().getDecimalPlacesExp(), - Double.valueOf(payment.get(CurrencyType.EXP)))); + payment.get(CurrencyType.EXP))); } ActionBarManager.send(abp, Message); }