From 327bfd41bbf7ba07c22484bca0d6ed7e93f22d0d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 11 Jul 2019 23:38:19 -0500 Subject: [PATCH] Remove debug output from metrics --- patches/server/0002-Purpur-config-files.patch | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch index 7b81958bc..00ee78991 100644 --- a/patches/server/0002-Purpur-config-files.patch +++ b/patches/server/0002-Purpur-config-files.patch @@ -1,4 +1,4 @@ -From e76332348871976aff4c44c7f305d75c7603ed39 Mon Sep 17 00:00:00 2001 +From f4f109e1a980f9de4939adae5bd88266311022af Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 9 May 2019 18:09:43 -0500 Subject: [PATCH] Purpur config files @@ -7,13 +7,13 @@ Subject: [PATCH] Purpur config files .../com/destroystokyo/paper/PaperConfig.java | 2 + .../net/minecraft/server/DedicatedServer.java | 9 + src/main/java/net/minecraft/server/World.java | 3 + - src/main/java/net/pl3x/purpur/Metrics.java | 612 ++++++++++++++++++ + src/main/java/net/pl3x/purpur/Metrics.java | 598 ++++++++++++++++++ .../java/net/pl3x/purpur/PurpurCommand.java | 59 ++ .../java/net/pl3x/purpur/PurpurConfig.java | 133 ++++ .../net/pl3x/purpur/PurpurWorldConfig.java | 63 ++ .../org/bukkit/craftbukkit/CraftServer.java | 3 + .../java/org/bukkit/craftbukkit/Main.java | 8 + - 9 files changed, 892 insertions(+) + 9 files changed, 878 insertions(+) create mode 100644 src/main/java/net/pl3x/purpur/Metrics.java create mode 100644 src/main/java/net/pl3x/purpur/PurpurCommand.java create mode 100644 src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -79,10 +79,10 @@ index ee6474b18..c86c9d1ec 100644 this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/net/pl3x/purpur/Metrics.java b/src/main/java/net/pl3x/purpur/Metrics.java new file mode 100644 -index 000000000..98727df67 +index 000000000..246eb8140 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/Metrics.java -@@ -0,0 +1,612 @@ +@@ -0,0 +1,598 @@ +package net.pl3x.purpur; + +import com.google.gson.JsonArray; @@ -92,13 +92,10 @@ index 000000000..98727df67 +import org.bukkit.configuration.file.YamlConfiguration; + +import javax.net.ssl.HttpsURLConnection; -+import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.IOException; -+import java.io.InputStream; -+import java.io.InputStreamReader; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; @@ -265,18 +262,7 @@ index 000000000..98727df67 + outputStream.flush(); + outputStream.close(); + -+ //connection.getInputStream().close(); -+ -+ InputStream inputStream = connection.getInputStream(); -+ BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream)); -+ -+ StringBuilder builder = new StringBuilder(); -+ String line; -+ while ((line = bufferedReader.readLine()) != null) { -+ builder.append(line); -+ } -+ bufferedReader.close(); -+ logger.info("Sent data to bStats and received response: " + builder.toString()); ++ connection.getInputStream().close(); + } + + /** @@ -969,7 +955,7 @@ index 000000000..30f11fe26 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6dfdc9813..ae290996d 100644 +index 2aaa89ef5..ad6260c79 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -793,6 +793,7 @@ public final class CraftServer implements Server { @@ -997,7 +983,7 @@ index 6dfdc9813..ae290996d 100644 ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 405ea5c46..2d60e7588 100644 +index 1fa81904d..2bc8773d4 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -137,6 +137,14 @@ public class Main {