Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
8fcef3c1f Return after sending empty commands (#5586)
2a67a9e51 Fix missing CraftMetaBook#toBuilder override
48aa06106 Add more Wandering Trader API (#5020)
8cec462a5 [CI-SKIP] Remove Astei from the MIT list (#5577)
This commit is contained in:
BillyGalbreath
2021-05-06 20:24:05 -05:00
parent ebc07658d1
commit a24b31b74c
13 changed files with 32 additions and 32 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add /ping command
diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java
index 7cb062043a8a5e997557a23bdf71cbdf8dd457ae..5afee94075efcaf480c494360778570b1a02b726 100644
index 5ae31658fb1183eab66f682cc5477bc526c27753..94ed3811cbcc6f60a2c8bb033920f9c1ae2e91d6 100644
--- a/src/main/java/net/minecraft/commands/CommandDispatcher.java
+++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java
@@ -191,6 +191,7 @@ public class CommandDispatcher {
@@ -16,7 +16,7 @@ index 7cb062043a8a5e997557a23bdf71cbdf8dd457ae..5afee94075efcaf480c494360778570b
}
if (commanddispatcher_servertype.d) {
@@ -424,10 +425,12 @@ public class CommandDispatcher {
@@ -427,10 +428,12 @@ public class CommandDispatcher {
}
@@ -29,7 +29,7 @@ index 7cb062043a8a5e997557a23bdf71cbdf8dd457ae..5afee94075efcaf480c494360778570b
public static <T> RequiredArgumentBuilder<CommandListenerWrapper, T> a(String s, ArgumentType<T> argumenttype) {
return RequiredArgumentBuilder.argument(s, argumenttype);
}
@@ -443,6 +446,7 @@ public class CommandDispatcher {
@@ -446,6 +449,7 @@ public class CommandDispatcher {
};
}