diff options
| author | Shane Freeder <[email protected]> | 2019-04-22 22:36:14 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2019-04-22 22:36:14 +0100 |
| commit | fb25dc17c62acce335346d5e96899257ae7230c7 (patch) | |
| tree | 44f004622c605490512882661faf912f2f98a85c /Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch | |
| parent | 10d58504f7d079381d1b0b189a1a8328a8e6ef51 (diff) | |
| download | Paper-fb25dc17c62acce335346d5e96899257ae7230c7.tar.gz Paper-fb25dc17c62acce335346d5e96899257ae7230c7.zip | |
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:
da08d022 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN
0cef14e4 Remove draft API from selectEntities
CraftBukkit Changes:
a46fdbc6 Remove outdated build delay.
3697519b SPIGOT-4708: Fix ExactChoice recipes neglecting material
9ead7009 SPIGOT-4677: Add minecraft.admin.command_feedback permission
c3749a23 Remove the Damage tag from items when it is 0.
f74c7b95 SPIGOT-4706: Can't interact with active item
494eef45 Mention requirement of JIRA ticket for bug fixes
51d62dec SPIGOT-4702: Exception when middle clicking certain slots
be557e69 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN
Diffstat (limited to 'Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch')
| -rw-r--r-- | Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch index 9a5eeb3747..05a550b73a 100644 --- a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From c74ed751192df73e8d8ee4ccc6c8cec0d44a2116 Mon Sep 17 00:00:00 2001 +From c257016dfd957d957c31920232cd6ba10a5db45e Mon Sep 17 00:00:00 2001 From: kashike <[email protected]> Date: Fri, 9 Jun 2017 07:24:24 -0700 Subject: [PATCH] Add configuration option to prevent player names from being @@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 8e0cbbf15..90b41fd25 100644 +index 08570c13..92bc8eb6 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1564,6 +1564,16 @@ public final class Bukkit { +@@ -1562,6 +1562,16 @@ public final class Bukkit { public static boolean reloadCommandAliases() { return server.reloadCommandAliases(); } @@ -27,10 +27,10 @@ index 8e0cbbf15..90b41fd25 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 8f61619a3..fe3144c00 100644 +index fc8887d1..9fa704e3 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1370,4 +1370,14 @@ public interface Server extends PluginMessageRecipient { +@@ -1368,4 +1368,14 @@ public interface Server extends PluginMessageRecipient { void reloadPermissions(); // Paper boolean reloadCommandAliases(); // Paper @@ -46,7 +46,7 @@ index 8f61619a3..fe3144c00 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java -index 92c23424e..e420b7902 100644 +index 92c23424..e420b790 100644 --- a/src/main/java/org/bukkit/command/PluginCommand.java +++ b/src/main/java/org/bukkit/command/PluginCommand.java @@ -151,6 +151,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo |