From 2c0743b7e9a615609d936c95d93af57dd54fd5e4 Mon Sep 17 00:00:00 2001 From: manuelgu Date: Fri, 13 May 2016 19:04:55 +0200 Subject: [PATCH 1/4] Proper method name --- .../java/com/plotsquared/bukkit/listeners/PlayerEvents.java | 2 +- .../main/java/com/intellectualcrafters/plot/util/EventUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java index 100daaead..e5729b814 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java @@ -464,7 +464,7 @@ public class PlayerEvents extends PlotListener implements Listener { public void playerRespawn(PlayerRespawnEvent event) { Player player = event.getPlayer(); PlotPlayer pp = BukkitUtil.getPlayer(player); - EventUtil.manager.doDeathTask(pp); + EventUtil.manager.doRespawnTask(pp); } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java b/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java index 0efcbf848..0daac16ea 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java @@ -79,7 +79,7 @@ public abstract class EventUtil { } } - public void doDeathTask(final PlotPlayer pp) { + public void doRespawnTask(final PlotPlayer pp) { final Plot plot = pp.getCurrentPlot(); if (Settings.TELEPORT_ON_DEATH && plot != null) { TaskManager.runTask(new Runnable() { From 7701e7f05f8c28aea5a9b00fcc611e7853e5e617 Mon Sep 17 00:00:00 2001 From: manuelgu Date: Fri, 13 May 2016 19:05:50 +0200 Subject: [PATCH 2/4] Beautify listing of plot areas --- .../intellectualcrafters/plot/commands/Debug.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Debug.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Debug.java index b2c7ee346..46d4322c9 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Debug.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Debug.java @@ -2,10 +2,9 @@ package com.intellectualcrafters.plot.commands; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.object.PlotArea; import com.intellectualcrafters.plot.object.PlotPlayer; -import com.intellectualcrafters.plot.object.RunnableVal; import com.intellectualcrafters.plot.util.MainUtil; +import com.intellectualcrafters.plot.util.StringMan; import com.plotsquared.general.commands.CommandDeclaration; @CommandDeclaration(command = "debug", @@ -29,16 +28,9 @@ public class Debug extends SubCommand { String header = C.DEBUG_HEADER.s(); String line = C.DEBUG_LINE.s(); String section = C.DEBUG_SECTION.s(); - final StringBuilder worlds = new StringBuilder(""); - PS.get().foreachPlotArea(new RunnableVal() { - @Override - public void run(PlotArea value) { - worlds.append(value.toString()).append(", "); - } - }); information.append(header); information.append(getSection(section, "PlotArea")); - information.append(getLine(line, "Plot Worlds", worlds.substring(0, worlds.length() - 2))); + information.append(getLine(line, "Plot Worlds", StringMan.join(PS.get().getPlotAreas(), ", "))); information.append(getLine(line, "Owned Plots", PS.get().getPlots().size())); information.append(getSection(section, "Messages")); information.append(getLine(line, "Total Messages", C.values().length)); From c1bc3dfc293022167a53175261887c67a6e5595a Mon Sep 17 00:00:00 2001 From: manuelgu Date: Fri, 13 May 2016 19:07:56 +0200 Subject: [PATCH 3/4] Add HttpUtil utility class --- .../intellectualcrafters/plot/Updater.java | 41 ++----------------- .../plot/commands/PluginCmd.java | 34 +-------------- .../plot/util/HttpUtil.java | 40 ++++++++++++++++++ 3 files changed, 46 insertions(+), 69 deletions(-) create mode 100644 Core/src/main/java/com/intellectualcrafters/plot/util/HttpUtil.java diff --git a/Core/src/main/java/com/intellectualcrafters/plot/Updater.java b/Core/src/main/java/com/intellectualcrafters/plot/Updater.java index f1e24c170..f7406c9ee 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/Updater.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/Updater.java @@ -1,52 +1,19 @@ package com.intellectualcrafters.plot; -import static com.intellectualcrafters.plot.PS.log; - import com.intellectualcrafters.json.JSONArray; import com.intellectualcrafters.json.JSONObject; -import com.intellectualcrafters.plot.config.Settings; +import com.intellectualcrafters.plot.util.HttpUtil; import com.intellectualcrafters.plot.util.StringMan; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; +import static com.intellectualcrafters.plot.PS.log; + public class Updater { - private static String readUrl(String urlString) { - BufferedReader reader = null; - try { - URL url = new URL(urlString); - reader = new BufferedReader(new InputStreamReader(url.openStream())); - StringBuilder buffer = new StringBuilder(); - int read; - char[] chars = new char[1024]; - while ((read = reader.read(chars)) != -1) { - buffer.append(chars, 0, read); - } - - return buffer.toString(); - } catch (IOException e) { - log("&dCould not check for updates"); - if (Settings.DEBUG) { - e.printStackTrace(); - } - } finally { - try { - if (reader != null) { - reader.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - return null; - } - public static URL getUpdate() { - String str = readUrl("https://api.github.com/repos/IntellectualSites/PlotSquared/releases/latest"); + String str = HttpUtil.readUrl("https://api.github.com/repos/IntellectualSites/PlotSquared/releases/latest"); JSONObject release = new JSONObject(str); JSONArray assets = (JSONArray) release.get("assets"); String downloadURL = String.format("PlotSquared-%s.jar", PS.get().getPlatform()); diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java index 6c3e1afd2..99351dd66 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java @@ -3,13 +3,10 @@ package com.intellectualcrafters.plot.commands; import com.intellectualcrafters.json.JSONObject; import com.intellectualcrafters.plot.PS; import com.intellectualcrafters.plot.object.PlotPlayer; +import com.intellectualcrafters.plot.util.HttpUtil; import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.StringMan; import com.plotsquared.general.commands.CommandDeclaration; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; @CommandDeclaration(command = "plugin", permission = "plots.use", @@ -28,35 +25,8 @@ public class PluginCmd extends SubCommand { } public String getNewestVersionString() { - String str = readUrl("https://api.github.com/repos/IntellectualSites/PlotSquared/releases/latest"); + String str = HttpUtil.readUrl("https://api.github.com/repos/IntellectualSites/PlotSquared/releases/latest"); JSONObject release = new JSONObject(str); return release.getString("name"); } - - private static String readUrl(String urlString) { - BufferedReader reader = null; - try { - URL url = new URL(urlString); - reader = new BufferedReader(new InputStreamReader(url.openStream())); - StringBuilder buffer = new StringBuilder(); - int read; - char[] chars = new char[1024]; - while ((read = reader.read(chars)) != -1) { - buffer.append(chars, 0, read); - } - - return buffer.toString(); - } catch (IOException e) { - e.printStackTrace(); - } finally { - try { - if (reader != null) { - reader.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - return null; - } } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/HttpUtil.java b/Core/src/main/java/com/intellectualcrafters/plot/util/HttpUtil.java new file mode 100644 index 000000000..68f4a4c0e --- /dev/null +++ b/Core/src/main/java/com/intellectualcrafters/plot/util/HttpUtil.java @@ -0,0 +1,40 @@ +package com.intellectualcrafters.plot.util; + +import com.intellectualcrafters.plot.config.Settings; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; + +public class HttpUtil { + + public static String readUrl(String urlString) { + BufferedReader reader = null; + try { + URL url = new URL(urlString); + reader = new BufferedReader(new InputStreamReader(url.openStream())); + StringBuilder buffer = new StringBuilder(); + int read; + char[] chars = new char[1024]; + while ((read = reader.read(chars)) != -1) { + buffer.append(chars, 0, read); + } + + return buffer.toString(); + } catch (IOException e) { + if (Settings.DEBUG) { + e.printStackTrace(); + } + } finally { + try { + if (reader != null) { + reader.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + return null; + } +} From a5a001130c66e21b9e73869116f5edce585be15d Mon Sep 17 00:00:00 2001 From: manuelgu Date: Fri, 13 May 2016 19:09:40 +0200 Subject: [PATCH 4/4] Fetch latest vesion on command PS.get().update would return the URL of the latest update at the time the server was started. Not everybody is restarting their servers daily so it might end up in people not noticing an update in a long while --- .../java/com/intellectualcrafters/plot/commands/Update.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Update.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Update.java index 2f1b5960a..f42822bf0 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Update.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Update.java @@ -1,6 +1,7 @@ package com.intellectualcrafters.plot.commands; import com.intellectualcrafters.plot.PS; +import com.intellectualcrafters.plot.Updater; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.MainUtil; @@ -23,7 +24,7 @@ public class Update extends SubCommand { public boolean onCommand(PlotPlayer plr, String[] args) { URL url; if (args.length == 0) { - url = PS.get().update; + url = Updater.getUpdate(); } else if (args.length == 1) { try { url = new URL(args[0]);