mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-21 16:09:19 +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:
@@ -742,7 +742,7 @@ index 0c3c82b28e581286b798ee58ca4193efc2faff4a..5a2a4f69995f23e799370c05f28f9353
|
||||
// return true as command was handled
|
||||
return 1;
|
||||
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
||||
index 214ea75502d4abf9ebbc99a3811e4d2f8465227e..64f8dea161f99491c969dfa3d97eb47068069037 100644
|
||||
index 690086adcb1f87adc0b3ab664fde735ad3e1093a..97af7a985085e868cb21f91361e26327e1d4c108 100644
|
||||
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
||||
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
||||
@@ -1,6 +1,5 @@
|
||||
@@ -752,7 +752,7 @@ index 214ea75502d4abf9ebbc99a3811e4d2f8465227e..64f8dea161f99491c969dfa3d97eb470
|
||||
import com.mojang.logging.LogUtils;
|
||||
import io.papermc.paper.configuration.constraint.Constraints;
|
||||
import io.papermc.paper.configuration.type.number.DoubleOr;
|
||||
@@ -99,29 +98,6 @@ public class GlobalConfiguration extends ConfigurationPart {
|
||||
@@ -100,29 +99,6 @@ public class GlobalConfiguration extends ConfigurationPart {
|
||||
public boolean enableImmediately = false;
|
||||
}
|
||||
|
||||
@@ -1639,7 +1639,7 @@ index 4aa33233060b2b2bd809d92d35bd0933cb015d41..5ad94cabbab741d69363d40df359075d
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index d4fe9164831bb1e066926e3bdecf2c15ec44fa10..ea78041ea6fa87f8c810d05188a89829ce301647 100644
|
||||
index 5d7280ad82c03b35ea6636d633ef411c220f9bb6..5bb054398651fedc99c5bb454e638ba3a694b9c8 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -478,7 +478,6 @@ public final class CraftServer implements Server {
|
||||
|
||||
Reference in New Issue
Block a user