Updated Upstream (Paper, Purpur)
Upstream has released updates that appear to apply and compile correctly. [Purpur Changes] PlazmaMC/Purpur@69d3bb4: Updated Upstream (Paper) PlazmaMC/Purpur@ad32b22: fix version command throwing an exception PlazmaMC/Purpur@9dcfdf1: [ci skip] missed this from the upstream PlazmaMC/Purpur@88aa731: Updated Upstream (Paper) PlazmaMC/Purpur@3d25693: Updated Upstream (Paper) PlazmaMC/Purpur@248ba17: Updated Upstream (Paper) PlazmaMC/Purpur@ed1e0ec: Updated Upstream (Paper) PlazmaMC/Purpur@1bbb033: Updated Upstream (Paper) PlazmaMC/Purpur@222387f: Updated Upstream (Paper) PlazmaMC/Purpur@692ff89: [ci skip] specify purpur in version command PlazmaMC/Purpur@7b850ef: [ci skip] Fix version inconsistency in README (#1517) PlazmaMC/Purpur@22fc5f9: Updated Upstream (Paper) PlazmaMC/Purpur@2842b97: Updated Upstream (Paper) PlazmaMC/Purpur@ec1b4fa: Updated Upstream (Paper) PlazmaMC/Purpur@b1464f3: Updated Upstream (Paper) PlazmaMC/Purpur@ee56117: Updated Upstream (Paper) PlazmaMC/Purpur@847719c: one punch!! improvements PlazmaMC/Purpur@1af7456: [ci skip] document mods that patches took inspiration from PlazmaMC/Purpur@224e7c7: Updated Upstream (Paper) PlazmaMC/Purpur@7095128: Add back Pufferfish patches [Paper Changes] PaperMC/Paper@23fe116: Fix missing debug trace PaperMC/Paper@b0c9b9c: Only remove worldgen block entity on changed block (#10794) PaperMC/Paper@9c917fe: [ci skip] Clean up paperclip build-pr workflow (#10802) PaperMC/Paper@9d6f2cc: [ci skip] Rebuild patches (#10803) PaperMC/Paper@84f6e6e: Fix max temper API for llama (#10823) PaperMC/Paper@672c077: handle BODY slot for non-mobs (#10822) PaperMC/Paper@716b868: Use RegistryOps for loadAdvancement (#10799) PaperMC/Paper@d9e659a: Allow firework effects with no colors (#10814) PaperMC/Paper@7e2b682: Fix skipping custom block entity tag (#10812) PaperMC/Paper@ed85aac: Flatten namespaced vanilla command alias redirects (#10821) PaperMC/Paper@a31dc90: Several fixes and new api for experience merging/stacking (#9242) PaperMC/Paper@efd91e5: Add registry-related argument types (#10770) PaperMC/Paper@27d2ed8: Extend fishing API (#10634) PaperMC/Paper@0fcf3e3: Deprecate InvAction#HOTBAR_MOVE_AND_READD (#10784) PaperMC/Paper@8e6554a: Fix sending disconnect packet in phases where it doesn't exist PaperMC/Paper@06e69c8: Use CommandSourceStack in AsyncPlayerSendCommandsEvent (#10826) PaperMC/Paper@a47e11d: fix knockback events (#10831) PaperMC/Paper@3181470: Add entity heal API (#10267) PaperMC/Paper@0513374: Fire TabCompleteEvent for legacy commands (#10834) PaperMC/Paper@5d8e53d: Fix CommandSourceStack#bypassSelectorPermissions (#10837)
This commit is contained in:
AlphaKR93
@@ -1,8 +1,23 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: AlphaKR93 <dev@alpha93.kr>
|
||||
Date: Sun, 26 May 2024 19:50:35 +0900
|
||||
From: --author=Kevin Raneri <kevin.raneri@gmail.com>
|
||||
Date: Sun, 2 Jun 2024 20:00:52 +0900
|
||||
Subject: [PATCH] Pufferfish API Changes
|
||||
|
||||
Pufferfish
|
||||
Copyright (C) 2024 Pufferfish Studios LLC
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index fd39ed209b20c927054b8482c400beeeeab460a3..1336685fde70c4a88a1fb591cdfcd781a8f06d0b 100644
|
||||
@@ -373,6 +388,24 @@ index 0000000000000000000000000000000000000000..ae2464920c9412ac90b819a540ee58be
|
||||
+ }
|
||||
+
|
||||
+}
|
||||
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
||||
index 9df9d09aa477d4cd3c496ba0933c816df1ef0964..ad81341bdd1eb73554cd24f27ac5d655d89db791 100644
|
||||
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
||||
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
||||
@@ -17,6 +17,13 @@ public interface ServerBuildInfo {
|
||||
* The brand id for Paper.
|
||||
*/
|
||||
Key BRAND_PAPER_ID = Key.key("papermc", "paper");
|
||||
+
|
||||
+ // Pufferfish start
|
||||
+ /**
|
||||
+ * The brand id for Paper.
|
||||
+ */
|
||||
+ Key BRAND_PUFFERFISH_ID = Key.key("pufferfishgg", "pufferfish");
|
||||
+ // Pufferfish end
|
||||
|
||||
/**
|
||||
* Gets the {@code ServerBuildInfo}.
|
||||
diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
|
||||
index c80faa079eca1564847070f0338fc98024639829..e632d51d3487eb4807243b6705999ad124466bf5 100644
|
||||
--- a/src/main/java/org/bukkit/map/MapPalette.java
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: granny <contact@granny.dev>
|
||||
Date: Mon, 27 May 2024 13:23:14 +0900
|
||||
From: --author=granny <contact@granny.dev>
|
||||
Date: Sun, 2 Jun 2024 20:02:16 +0900
|
||||
Subject: [PATCH] Purpur API Changes
|
||||
|
||||
PurpurMC
|
||||
@@ -199,12 +199,12 @@ index ab5fea0b03224bf249352ce340e94704ff713345..3441cdad70da1bd523c5933b1a914688
|
||||
} else {
|
||||
SIMDDetection.testRun = true;
|
||||
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
||||
index 9df9d09aa477d4cd3c496ba0933c816df1ef0964..7107eabf02d9d9b69d97c978ba421ad52031ec3f 100644
|
||||
index ad81341bdd1eb73554cd24f27ac5d655d89db791..fe23268c418cccbd45caf2870f7931cfed978d28 100644
|
||||
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
||||
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
||||
@@ -18,6 +18,13 @@ public interface ServerBuildInfo {
|
||||
*/
|
||||
Key BRAND_PAPER_ID = Key.key("papermc", "paper");
|
||||
@@ -25,6 +25,13 @@ public interface ServerBuildInfo {
|
||||
Key BRAND_PUFFERFISH_ID = Key.key("pufferfishgg", "pufferfish");
|
||||
// Pufferfish end
|
||||
|
||||
+ // Purpur start
|
||||
+ /**
|
||||
@@ -3785,7 +3785,7 @@ index 12946bd55fcf7c40d39081779a7fa30049ee6165..9c2d605c50cbf9aefa56ec209df9f6ce
|
||||
|
||||
}
|
||||
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
|
||||
index 88f1ca89fa640a686231b8eec87e70419b2d73ef..d6b91c49a267c89d7df2ddee7ccfe64675d117be 100644
|
||||
index 057dc3ebea3516863dda24252fe05d344c16fab3..5b341346cb9582ad5a0bb77a0d4046d8527797a3 100644
|
||||
--- a/src/test/java/org/bukkit/AnnotationTest.java
|
||||
+++ b/src/test/java/org/bukkit/AnnotationTest.java
|
||||
@@ -47,6 +47,10 @@ public class AnnotationTest {
|
||||
|
||||
@@ -45,10 +45,10 @@ index 199789d56d22fcb1b77ebd56805cc28aa5a5ab0a..3b3bcfa6fa2dbcc7fef899cc7570da09
|
||||
Logger.getGlobal().log(Level.SEVERE, "TIMING_STACK_CORRUPTION - Report this to the plugin " + last.identifier.group + " (Look for errors above this in the logs) (" + last.identifier + " did not stopTiming)", new Throwable());
|
||||
}
|
||||
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
||||
index 7107eabf02d9d9b69d97c978ba421ad52031ec3f..098125a57409b480f045c3a8c3b58db74a6605f3 100644
|
||||
index fe23268c418cccbd45caf2870f7931cfed978d28..bcf09f735e98f8bbce7c7dfab802ad20e2f17548 100644
|
||||
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
||||
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
||||
@@ -25,6 +25,29 @@ public interface ServerBuildInfo {
|
||||
@@ -32,6 +32,29 @@ public interface ServerBuildInfo {
|
||||
Key BRAND_PURPUR_ID = Key.key("purpurmc", "purpur");
|
||||
// Purpur end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user