From 43d6dabb27b80d95ed9831ccb93e45dcfd32e403 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 21 Dec 2020 01:07:19 -0600 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: d5f3458c8 Adjust bStats data sending delay (#4914) de31e8c70 Remove Paper's UnsafeUtils (#4913) --- Paper | 2 +- ...c-warnings-missing-param-and-return.patch} | 0 .../api/0035-Remove-paper-s-unsafe-util.patch | 58 ------------------- .../server/0001-Tuinity-Server-Changes.patch | 6 +- patches/server/0003-Purpur-config-files.patch | 6 +- 5 files changed, 7 insertions(+), 65 deletions(-) rename patches/api/{0036-Fix-javadoc-warnings-missing-param-and-return.patch => 0035-Fix-javadoc-warnings-missing-param-and-return.patch} (100%) delete mode 100644 patches/api/0035-Remove-paper-s-unsafe-util.patch diff --git a/Paper b/Paper index 4e16d36e2..d5f3458c8 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 4e16d36e294edaf9a4e096411eb2123c1eeed856 +Subproject commit d5f3458c8c30f3dd116de20a07d5ed1cdbfa7611 diff --git a/patches/api/0036-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0035-Fix-javadoc-warnings-missing-param-and-return.patch similarity index 100% rename from patches/api/0036-Fix-javadoc-warnings-missing-param-and-return.patch rename to patches/api/0035-Fix-javadoc-warnings-missing-param-and-return.patch diff --git a/patches/api/0035-Remove-paper-s-unsafe-util.patch b/patches/api/0035-Remove-paper-s-unsafe-util.patch deleted file mode 100644 index 2337f8233..000000000 --- a/patches/api/0035-Remove-paper-s-unsafe-util.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Fri, 18 Dec 2020 20:59:25 -0600 -Subject: [PATCH] Remove paper's unsafe util - - -diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java -index beed9e6e07a9080f1c059e08220839090553d0a4..f79685b48bb581277a6891927988b6f7a4389dc4 100644 ---- a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java -+++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java -@@ -1,6 +1,5 @@ - package com.destroystokyo.paper.event.executor.asm; - --import com.destroystokyo.paper.utils.UnsafeUtils; - import org.jetbrains.annotations.NotNull; - - public interface ClassDefiner { -diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java -deleted file mode 100644 -index 72e48e8efdf750d77fc1f9d5fa7dc279e88aa9a7..0000000000000000000000000000000000000000 ---- a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java -+++ /dev/null -@@ -1,35 +0,0 @@ --package com.destroystokyo.paper.utils; -- --import org.jetbrains.annotations.Nullable; --import sun.misc.Unsafe; -- --import java.lang.reflect.Field; -- --public class UnsafeUtils { -- private UnsafeUtils() {} -- -- private static final Unsafe UNSAFE; -- static { -- Unsafe unsafe; -- try { -- Class c = Class.forName("sun.misc.Unsafe"); -- Field f = c.getDeclaredField("theUnsafe"); -- f.setAccessible(true); -- unsafe = (Unsafe) f.get(null); -- } catch (ClassNotFoundException | NoSuchFieldException | SecurityException e) { -- unsafe = null; -- } catch (IllegalAccessException e) { -- throw new AssertionError(e); -- } -- UNSAFE = unsafe; -- } -- -- public static boolean isUnsafeSupported() { -- return UNSAFE != null; -- } -- -- @Nullable -- public static Unsafe getUnsafe() { -- return UNSAFE; -- } --} diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index 46526ef2c..26d6ca5c2 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -548,10 +548,10 @@ index e33e889c291d37a821a4fbd40d9aac7bb079de0d..5dfa0658838c4801cdf260eae8b98163 new TimingsExport(listeners, parent, history).start(); diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 03c95b30d8a0557482d39468c058e7966114f824..ac7f390cf0a404daeb80f89326fe1e510292f817 100644 +index dee00aac05f1acf050f05d4db557a08dd0f301c8..52c0ab1ce46e1f3233ef746d9bc699356fa9fae4 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java -@@ -585,7 +585,7 @@ public class Metrics { +@@ -593,7 +593,7 @@ public class Metrics { boolean logFailedRequests = config.getBoolean("logFailedRequests", false); // Only start Metrics, if it's enabled in the config if (config.getBoolean("enabled", true)) { @@ -560,7 +560,7 @@ index 03c95b30d8a0557482d39468c058e7966114f824..ac7f390cf0a404daeb80f89326fe1e51 metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { String minecraftVersion = Bukkit.getVersion(); -@@ -595,7 +595,7 @@ public class Metrics { +@@ -603,7 +603,7 @@ public class Metrics { metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size())); metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() || PaperConfig.isProxyOnlineMode() ? "online" : "offline")); diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch index 1ff303eb0..00ec2cfab 100644 --- a/patches/server/0003-Purpur-config-files.patch +++ b/patches/server/0003-Purpur-config-files.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index ac7f390cf0a404daeb80f89326fe1e510292f817..3b9b44851c5832a3660a73449b52478c73ffb23a 100644 +index 52c0ab1ce46e1f3233ef746d9bc699356fa9fae4..4d8740678049aa749b42618470e9cc838555528d 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java -@@ -585,7 +585,7 @@ public class Metrics { +@@ -593,7 +593,7 @@ public class Metrics { boolean logFailedRequests = config.getBoolean("logFailedRequests", false); // Only start Metrics, if it's enabled in the config if (config.getBoolean("enabled", true)) { @@ -17,7 +17,7 @@ index ac7f390cf0a404daeb80f89326fe1e510292f817..3b9b44851c5832a3660a73449b52478c metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { String minecraftVersion = Bukkit.getVersion(); -@@ -594,8 +594,8 @@ public class Metrics { +@@ -602,8 +602,8 @@ public class Metrics { })); metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));