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-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.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-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch')
| -rw-r--r-- | Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch index 2ff1c55e2c..fe7880ae84 100644 --- a/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions https://github.com/PaperMC/Paper/issues/49 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index aa74c838147d67c9cbfcff1f9b0dc653808fb109..7c4ef70f540de9d5486d1ccef65ef8d82580694e 100644 +index 3c5b3ab38c22dd127caa2218e9bc62baf7cf5760..ed6832b13c4e59afb2e8e74f075c991f9f91de39 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2168,5 +2168,23 @@ public final class CraftServer implements Server { +@@ -2175,5 +2175,23 @@ public final class CraftServer implements Server { return null; } } |