Update upstream
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
plugins {
|
||||
java
|
||||
id("com.github.johnrengelman.shadow") version "7.0.0" apply false
|
||||
id("io.papermc.paperweight.patcher") version "1.1.6"
|
||||
id("io.papermc.paperweight.patcher") version "1.1.8"
|
||||
}
|
||||
|
||||
repositories {
|
||||
|
||||
@@ -3,4 +3,4 @@ version = 1.17-R0.1-SNAPSHOT
|
||||
|
||||
mcVersion = 1.17
|
||||
packageVersion = 1_17_R1
|
||||
paperRef = 0be7cdbd1715c4c98b88cb7535cfcdcb07f4d678
|
||||
paperRef = f18dc1e3c7c395e0caa0a047eb6aa49e1da8c18e
|
||||
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose MCUtil Executors
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index e88b47a838dc472ad64271a518ee1789f7be19fa..f7baef9e08c0e6a8cb89f7a2643693ff9115f555 100644
|
||||
index 07c9635ea2e09e823ed7fa164ed854af41fab7dc..bf2b0725929b0f7e824446e206472fa709d9bebb 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1716,4 +1716,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -1736,4 +1736,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@NotNull
|
||||
io.papermc.paper.datapack.DatapackManager getDatapackManager();
|
||||
// Paper end
|
||||
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose MCUtil Executors
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 5a4eb1eac2bdcba7990f9eb39a8d2ee2852bca21..c298fbda4916fed6e1716af58da00f75e793fe99 100644
|
||||
index f8f34e40e9090d1fa9eeddca46f44746b6c5c185..7cc3be0f0470c902ba41b2e7a8ee84bb2aa6cd46 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2518,4 +2518,16 @@ public final class CraftServer implements Server {
|
||||
@@ -2528,4 +2528,16 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
|
||||
// Paper end
|
||||
|
||||
Reference in New Issue
Block a user