diff options
| author | Aikar <[email protected]> | 2020-07-22 04:26:59 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2020-07-22 04:26:59 -0400 |
| commit | 2712c688856c79a6acbd2fb2c414d22127ac71d9 (patch) | |
| tree | 39466af961fb4a7849aa9b7a0b4ddf1d2034cf14 /Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch | |
| parent | 0901ffd046156b8dfdc97a797ae4c8cf0cce0449 (diff) | |
| download | Paper-2712c688856c79a6acbd2fb2c414d22127ac71d9.tar.gz Paper-2712c688856c79a6acbd2fb2c414d22127ac71d9.zip | |
[Auto] Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
f1e73b03 #525: Add contributors plugin.yml field.
ef0999fe #529: Added getRecipe() method to retrieve a Recipe by it's NamespacedKey
CraftBukkit Changes:
8b831a965 #714: Added getRecipe() method to retrieve a Recipe by it's NamespacedKey
Diffstat (limited to 'Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch')
| -rw-r--r-- | Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch index bc1cd82b9c..1e0c4ba1cc 100644 --- a/Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch +++ b/Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch @@ -267,10 +267,10 @@ index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index c5b6e5fa0cfd876733b2010494ad7bbeafc789f8..d27405a8cfa590c13f5a3976c74c05655ae1f93d 100644 +index 016efcee2abefb3e92c59527e8762ee51956bc81..039c44654621c434a8cc1fa4a2dc46ede793054a 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1632,6 +1632,40 @@ public final class Bukkit { +@@ -1643,6 +1643,40 @@ public final class Bukkit { public static boolean suggestPlayerNamesWhenNullTabCompletions() { return server.suggestPlayerNamesWhenNullTabCompletions(); } @@ -312,10 +312,10 @@ index c5b6e5fa0cfd876733b2010494ad7bbeafc789f8..d27405a8cfa590c13f5a3976c74c0565 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 457007005f9ff5f6818c559635379a2e698fc4d7..24922e5699241e29bc615dcffadce21c89f6ff35 100644 +index 843b3f949d60cd78df830208bf98a93346f8d754..5582e377bb2a85b94d0c9c2a90d5b488991af098 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1429,5 +1429,33 @@ public interface Server extends PluginMessageRecipient { +@@ -1438,5 +1438,33 @@ public interface Server extends PluginMessageRecipient { * @return true if player names should be suggested */ boolean suggestPlayerNamesWhenNullTabCompletions(); |