Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6722)

This commit is contained in:
Jason 2021-10-04 22:14:11 -05:00 committed by GitHub
parent 90f717fa5a
commit a3dfe6dca5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
365 changed files with 725 additions and 732 deletions

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Make the default permission message configurable
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 85bdfecaecbb2303f55742d024aa3b1d4f89dcf6..d8c6d6252e79ee7d4c2a1ba4618e833772192c12 100644
index 7a5ed3f1ff00ac689f570cd8c02fbd6c7beb7f44..a4b717250bf4800803b3173c2f2771b11777577f 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1874,6 +1874,15 @@ public final class Bukkit {
@@ -1915,6 +1915,15 @@ public final class Bukkit {
return server.suggestPlayerNamesWhenNullTabCompletions();
}
@ -25,10 +25,10 @@ index 85bdfecaecbb2303f55742d024aa3b1d4f89dcf6..d8c6d6252e79ee7d4c2a1ba4618e8337
* Creates a PlayerProfile for the specified uuid, with name as null
* @param uuid UUID to create profile for
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 01f48e15bf502b4e8bd415bf606bbe22b2343380..4c7ceb92bd529e263b08ce53a8fcdfe91d4e5136 100644
index 87690bd58bdab40edcfddc40b26acc8e1f8cf8fc..bb77ab2a93eb4242b2e66c679effc7e466ed6f6f 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1648,6 +1648,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1684,6 +1684,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean suggestPlayerNamesWhenNullTabCompletions();