From 613b2276ac2e66d0b3a83c716055b663c2e1c564 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 31 Mar 2023 07:23:41 +0000 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@bd5c4b6 Updated Upstream (Paper) --- .upstream-data | 2 +- patches/api/0001-Pufferfish-API-Changes.patch | 2 +- patches/api/0002-Purpur-API-Changes.patch | 2 +- patches/server/0001-Pufferfish-Server-Changes.patch | 4 ++-- patches/server/0002-Purpur-Server-Changes.patch | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.upstream-data b/.upstream-data index 43815ee..fe994c8 100644 --- a/.upstream-data +++ b/.upstream-data @@ -1,2 +1,2 @@ -purpurCommit = 7cb1f466d1031ae7c8c371330360c5ae17a2ac62 +purpurCommit = bd5c4b67e6bdb6d2d6d67fd9bc63bbd99b24ab78 pufferfishCommit = 751dfb0338e2c09519313ffaca04084dc3140b80 diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch index 6cc254d..d0fd25d 100644 --- a/patches/api/0001-Pufferfish-API-Changes.patch +++ b/patches/api/0001-Pufferfish-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Fri, 31 Mar 2023 03:20:52 +0000 +Date: Fri, 31 Mar 2023 07:18:37 +0000 Subject: [PATCH] Pufferfish API Changes Original: Kevin Raneri diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch index bb60946..4e319bb 100644 --- a/patches/api/0002-Purpur-API-Changes.patch +++ b/patches/api/0002-Purpur-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Fri, 31 Mar 2023 03:22:47 +0000 +Date: Fri, 31 Mar 2023 07:20:33 +0000 Subject: [PATCH] Purpur API Changes Original: PurpurMC diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index 3d828d3..453681c 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Fri, 31 Mar 2023 03:20:52 +0000 +Date: Fri, 31 Mar 2023 07:18:37 +0000 Subject: [PATCH] Pufferfish Server Changes Original: Kevin Raneri @@ -3533,7 +3533,7 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7 @Nullable diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f9a9d2bb7b6d1bf4a0931438de4d8c7ee0757479..b2d94582037c091bd6a04451bf62b3f9c4923d19 100644 +index 4cd95134811fd65465681d159b2f30cf77455830..7672fe8e6d08370327bb7ad5fa5ac3292c49e3c4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -256,7 +256,7 @@ import javax.annotation.Nullable; // Paper diff --git a/patches/server/0002-Purpur-Server-Changes.patch b/patches/server/0002-Purpur-Server-Changes.patch index e41eb36..a024035 100644 --- a/patches/server/0002-Purpur-Server-Changes.patch +++ b/patches/server/0002-Purpur-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Fri, 31 Mar 2023 03:22:46 +0000 +Date: Fri, 31 Mar 2023 07:20:33 +0000 Subject: [PATCH] Purpur Server Changes Original: PurpurMC @@ -20109,7 +20109,7 @@ index 714afc98b5150907b45a00060be4e41582333204..312a6d90c0a09570aef24c205dc2ff27 + // Purpur end - OfflinePlayer API } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b2d94582037c091bd6a04451bf62b3f9c4923d19..bc1a2df0a7ddaf030917e4723994464d77e55d02 100644 +index 7672fe8e6d08370327bb7ad5fa5ac3292c49e3c4..5ace171b786e5b5a9a33b51e9b93e6d71159c29b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -256,7 +256,7 @@ import javax.annotation.Nullable; // Paper