Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Paper & Purpur)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4e99466 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8874)

Purpur Changes:
PurpurMC/Purpur@235d507 Updated Upstream (Paper & Pufferfish)
This commit is contained in:
github-actions[bot]
2023-03-12 05:36:49 +00:00
parent 59ae1c54ce
commit f6bc22d7c2
6 changed files with 87 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api/0002-Purpur-API-Changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Fri, 10 Mar 2023 11:36:23 +0000
Date: Sun, 12 Mar 2023 05:33:21 +0000
Subject: [PATCH] Purpur API Changes
Original: PurpurMC
@@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/build.gradle.kts b/build.gradle.kts
index d351ae66db72208a78ee6c522201693f19f68ef5..754c700cbdf0e775d0c12ebe468d9f2bdcc22cc2 100644
index 181e9cd8623995f40e696ccfe49754dc340405d8..e7c5f7eabaf4f2af07dd987a7879f45c4f66658d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -104,6 +104,8 @@ tasks.jar {
@@ -1155,10 +1155,10 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 7e7a21b21afdf40d7516ce1a5f5c1c5d6048984a..5ff9f0d9bc2bc08af251a677a8c98d6f288da8a8 100644
index fd890d0a3a2c92ad821ade7711191bdb0e3e3624..b9a924058f99c24db499dbb97373514d1f2ea174 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2978,4 +2978,139 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2969,4 +2969,139 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end
@@ -2160,7 +2160,7 @@ index cd3296fea01648592d2af89b3d80135acb6d0958..45797a6fbae1d8edc4211cb30def24ad
permissions.put(lname, new PermissionAttachmentInfo(parent, lname, attachment, value));
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 6efa6732e5559c3192d08b8631911be7cdaf15b4..1cf1f761790a5e3cd9286b9cecab817ce58de352 100644
index 301e82369603f3dd6e6c1bd380da4bacacd7ef6c..0c6ca7588fb3d6b6497ddf032fe75e5c6c9719e5 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -55,6 +55,7 @@ public final class JavaPluginLoader implements PluginLoader {