diff options
author | Prof-Bloodstone <[email protected]> | 2020-07-23 01:35:44 +0200 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-22 19:35:44 -0400 |
commit | 42433c2626c21a6bf22b958341e2f076dfb20dd0 (patch) | |
tree | 900745248d46e71ca8a3704fa4fd519e4a893de8 /Spigot-Server-Patches/0304-Call-player-spectator-target-events-and-improve-impl.patch | |
parent | e5ede546a2153d2d022f6374673ab6e8d359c7e4 (diff) | |
download | Paper-42433c2626c21a6bf22b958341e2f076dfb20dd0.tar.gz Paper-42433c2626c21a6bf22b958341e2f076dfb20dd0.zip |
Updated Upstream (Bukkit/CraftBukkit) (#3980)
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:
09f10fd9 SPIGOT-5950: Add PrepareSmithingEvent event
CraftBukkit Changes:
7c03d257 SPIGOT-6011: End Gateways do not work on Non-Main End Worlds
d492e363 SPIGOT-6015: Small Armor Stand doesn't drop items
5db13eea SPIGOT-5950: Add PrepareSmithingEvent event
Diffstat (limited to 'Spigot-Server-Patches/0304-Call-player-spectator-target-events-and-improve-impl.patch')
-rw-r--r-- | Spigot-Server-Patches/0304-Call-player-spectator-target-events-and-improve-impl.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Spigot-Server-Patches/0304-Call-player-spectator-target-events-and-improve-impl.patch b/Spigot-Server-Patches/0304-Call-player-spectator-target-events-and-improve-impl.patch index 16f59decc7..9871341ba6 100644 --- a/Spigot-Server-Patches/0304-Call-player-spectator-target-events-and-improve-impl.patch +++ b/Spigot-Server-Patches/0304-Call-player-spectator-target-events-and-improve-impl.patch @@ -19,7 +19,7 @@ spectate the target entity. Co-authored-by: Spottedleaf <[email protected]> diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 650579eb1bb73416b629229fce897d2941bd3b0d..91de641e52693d2a776ae68810965b6e4643220f 100644 +index c272bab87f9248cc3e7afe3607522f0b5e9c48d1..0909c926b9298d99b36c43dcbec9db071444cc7c 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1694,15 +1694,59 @@ public class EntityPlayer extends EntityHuman implements ICrafting { |