Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a15152e Allow old behavior for CommandRegisteredEvent (#8249)
PaperMC/Paper@0118c0b Improve MojangAPI docs and replace @Deprecated with @ApiStatus.Experimental on draft APIs (#8261)
PaperMC/Paper@3624637 Improve documentation of Inventory#removeItem (#8263)
PaperMC/Paper@a47301e Fix Player#chat kicking all clients (#8262)
PaperMC/Paper@78b19f8 Separate Command Sending to Separate Thread Pool (#8170)
This commit is contained in:
BillyGalbreath
2022-08-08 09:23:12 -05:00
parent 7e7693cb64
commit 28e3713086
23 changed files with 90 additions and 90 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts
index 74c91f79576e85618fefb79be8d313ba871701c7..fd3805da1f276c76a2e814f755f6755245ec2ff4 100644
index 27d1663fea7cbddfa4e2000cf73d215886c70aa5..a9acec9feef3c5322ce2c312cd8800bcdaca0947 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
@@ -15,7 +15,7 @@ index 74c91f79576e85618fefb79be8d313ba871701c7..fd3805da1f276c76a2e814f755f67552
- implementation(project(":pufferfish-api")) // Pufferfish // Paper
+ implementation(project(":purpur-api")) // Purpur
// Pufferfish start
implementation("io.papermc.paper:paper-mojangapi:1.19-R0.1-SNAPSHOT") {
implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") { // Purpur
exclude("io.papermc.paper", "paper-api")
@@ -44,6 +44,9 @@ dependencies {
runtimeOnly("mysql:mysql-connector-java:8.0.29")
@@ -168,7 +168,7 @@ index abe37c7c3c6f5ab73afd738ec78f06d7e4d2ed96..b5b6657e52e4f7a630229bd3ba433438
stringbuilder.append(CrashReport.getErrorComment());
stringbuilder.append("\n\n");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d66c60918313b0ede41ed96aa82e11fb2230f95b..9f551e09f6aea3df16af577f7754ff774731377f 100644
index 06d31a03ec7d049649e94d013429d2197b697545..f0eb6be38cb2c53f4f19d4e18a8d03232375fc6b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -298,7 +298,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -189,7 +189,7 @@ index d66c60918313b0ede41ed96aa82e11fb2230f95b..9f551e09f6aea3df16af577f7754ff77
while (this.getRunningThread().isAlive()) {
this.getRunningThread().stop();
try {
@@ -1657,7 +1657,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1658,7 +1658,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -297,7 +297,7 @@ index cdefb2025eedea7e204d70d568adaf1c1ec4c03c..d1526ed7197b883e1d1f07baf285bf5e
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index a912b96a4e099c7e90cbba37218972f830188d24..4f37159aad0063645d0213286ca31975531b7ba2 100644
index 522c519752d2fdb838bd797c77fdc7d0934b51e9..03382a35e5b22b871ba945687c4030c5cf091625 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -430,7 +430,7 @@ public final class CraftMagicNumbers implements UnsafeValues {