9
0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-04 15:41:31 +00:00

Update Paper

This commit is contained in:
violetc
2024-05-25 17:30:25 +08:00
parent 46ac3c65f8
commit a485bc9b5e
42 changed files with 132 additions and 132 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Server Config
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c8595ffcfcbdd79794d464415287d46acef72b72..99d754d3d06accbe13363f729b284e0eab67f2aa 100644
index 49d2547fcdaf779e284f513e58c1ac2ae3000bda..28ae66ae562dc7ab999908fe2a01a083a8d3de2b 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2256,6 +2256,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

View File

@@ -14,10 +14,10 @@ index 97e78e27ee0eea2c8b24886eeb19164d552323fe..9764fa643039f215627c20a33ca70c9e
/.factorypath
+
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 71f1c361ebccbe83193c37ec3a90faa4085001c3..0bfaeca0b1e1fadfaeed486c94dac19447062575 100644
index 9a219b255b63f10005fc68faacb771dd32f61ac2..6dcec4061e2bec84b23cc7e5fbd2927b1571b77e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2903,6 +2903,17 @@ public final class Bukkit {
@@ -2909,6 +2909,17 @@ public final class Bukkit {
}
// Paper end - Folia region threading API
@@ -36,7 +36,7 @@ index 71f1c361ebccbe83193c37ec3a90faa4085001c3..0bfaeca0b1e1fadfaeed486c94dac194
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 99d754d3d06accbe13363f729b284e0eab67f2aa..5e60df867b3111c203c0fe249b09e8c6333d1255 100644
index 28ae66ae562dc7ab999908fe2a01a083a8d3de2b..f549901dfde495282390479337a1d13b62461295 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -61,6 +61,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -47,7 +47,7 @@ index 99d754d3d06accbe13363f729b284e0eab67f2aa..5e60df867b3111c203c0fe249b09e8c6
/**
* Represents a server implementation.
@@ -2550,4 +2551,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2554,4 +2555,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API

View File

@@ -14,10 +14,10 @@ index 9764fa643039f215627c20a33ca70c9e36b2d599..97e78e27ee0eea2c8b24886eeb19164d
/.factorypath
-
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 0bfaeca0b1e1fadfaeed486c94dac19447062575..3c2b252243c1fa0d3adcc9c860c24af73165de33 100644
index 6dcec4061e2bec84b23cc7e5fbd2927b1571b77e..336b8d396f067cface060354c45e03c71ca35f27 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2913,6 +2913,11 @@ public final class Bukkit {
@@ -2919,6 +2919,11 @@ public final class Bukkit {
return server.getBotManager();
}
// Leaves end - Bot API
@@ -30,7 +30,7 @@ index 0bfaeca0b1e1fadfaeed486c94dac19447062575..3c2b252243c1fa0d3adcc9c860c24af7
@NotNull
public static Server.Spigot spigot() {
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 5e60df867b3111c203c0fe249b09e8c6333d1255..4a03044938630e4a0e701bc481f15da5a3323115 100644
index f549901dfde495282390479337a1d13b62461295..9384d1d8015aeae910756f35fa27bdc16dfb5662 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -62,6 +62,7 @@ import org.jetbrains.annotations.Contract;
@@ -41,7 +41,7 @@ index 5e60df867b3111c203c0fe249b09e8c6333d1255..4a03044938630e4a0e701bc481f15da5
/**
* Represents a server implementation.
@@ -2560,4 +2561,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2564,4 +2565,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull BotManager getBotManager();
// Leaves end - Bot API

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Bytebuf API
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 3c2b252243c1fa0d3adcc9c860c24af73165de33..1caffc8771680505be1c51a2f5050528435cdc33 100644
index 336b8d396f067cface060354c45e03c71ca35f27..900156f8a6c749177de5fc305a76b8d77c23b90e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2919,6 +2919,12 @@ public final class Bukkit {
@@ -2925,6 +2925,12 @@ public final class Bukkit {
}
// Leaves end - Photographer API
@@ -22,10 +22,10 @@ index 3c2b252243c1fa0d3adcc9c860c24af73165de33..1caffc8771680505be1c51a2f5050528
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 4a03044938630e4a0e701bc481f15da5a3323115..7a006d2582cd91b83ab05aeb6d6a6f96b77d2dbc 100644
index 9384d1d8015aeae910756f35fa27bdc16dfb5662..42cb311cbc6001e3116a4e2a0b4207d385995b2e 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2564,4 +2564,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2568,4 +2568,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
// Leaves start - Photographer API
@NotNull PhotographerManager getPhotographerManager();
// Leaves end - Photographer API