mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-22 00:19:20 +00:00
Updated Upstream (Paper/Gale/Purpur)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@8fd3a67 [ci skip] Clean up book limits patch (#11297) PaperMC/Paper@dae906b Add getWorld method that uses adventure Key (#11199) PaperMC/Paper@ba1b016 Allow server administrators to disable book size checks (#10457) PaperMC/Paper@a8cb8e6 [ci skip] Fix JavaDocs for HeightMap#MOTION_BLOCKING_NO_LEAVES (#11291) PaperMC/Paper@e4b38b4 Fixup config parsing PaperMC/Paper@3271119 Fix SculkBloomEvent firing for block entity loading (#11306) Gale Changes: Dreeam-qwq/Gale@38ba923 Updated Upstream (Paper) Dreeam-qwq/Gale@7ebf026 Fix code style & Adjust sequence of `organizationDisplayName` and `projectDisplayName` in version fetcher Purpur Changes: PurpurMC/Purpur@3510a9e Updated Upstream (Paper) PurpurMC/Purpur@1d3cef7 Updated Upstream (Paper) PurpurMC/Purpur@c4a6f63 Updated Upstream (Paper) PurpurMC/Purpur@568a028 Updated Upstream (Paper)
This commit is contained in:
@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
|
||||
Original license: MIT
|
||||
Original project: https://github.com/PurpurMC/Purpur
|
||||
|
||||
Commit: f5303959cdb3274a2672962faaa3889592ed5b31
|
||||
Commit: 568a028f8c33ad919f01c85a7fac5a9aced3d614
|
||||
|
||||
Patches below are removed in this patch:
|
||||
Pufferfish-API-Changes.patch
|
||||
@@ -35,10 +35,10 @@ index 25ad7e9a9aa11049ad6ce2d2c829d3e75f8886c2..0cafbbcb8fe294bcd84b93da8fba9636
|
||||
/**
|
||||
* The brand id for Pufferfish.
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index cd191a6039717c70d2b8be0ae475d040cad54f96..c7e2dd4465334ab845e931ed14fbfde43b6d4ea4 100644
|
||||
index 625f4f07b493826b13304960ba81e9ff0fd93ddb..0e258af4bf9e7dca550d3498e8d57c5abf2be8c7 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -2977,4 +2977,127 @@ public final class Bukkit {
|
||||
@@ -2988,4 +2988,127 @@ public final class Bukkit {
|
||||
public static Server.Spigot spigot() {
|
||||
return server.spigot();
|
||||
}
|
||||
@@ -405,10 +405,10 @@ index 3993fecec5b4c2bbd77e175a168afcad571ce4d1..d0206c9c2f423a9b77237d9a005b9ee1
|
||||
+ // Purpur end - OfflinePlayer API
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index e72a7adee66a2843c49fc4b293b91ec5dba0bc65..c9049ac104a3b8c294223089425bd294a3928915 100644
|
||||
index 2a22f20f25f46766cd8bc69a640898f4b051fc68..55ebeb1a107f660754536c48539ac7b2b51a8ec9 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -2307,6 +2307,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -2318,6 +2318,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
|
||||
// Paper end
|
||||
|
||||
@@ -427,7 +427,7 @@ index e72a7adee66a2843c49fc4b293b91ec5dba0bc65..c9049ac104a3b8c294223089425bd294
|
||||
// Leaf start
|
||||
@NotNull
|
||||
public org.bukkit.configuration.file.YamlConfiguration getLeafConfig()
|
||||
@@ -2630,4 +2642,104 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -2641,4 +2653,104 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
long getLastTickOversleepTime();
|
||||
// Gale end - YAPFA - last tick time - API
|
||||
|
||||
|
||||
Reference in New Issue
Block a user