diff options
| author | Nassim Jahnke <[email protected]> | 2021-08-27 11:51:18 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-08-27 11:51:18 +0200 |
| commit | f44d237de96b00e495bd5e33a560e18f58dec713 (patch) | |
| tree | 9aa720ae63476ddc57dbb321b2e0c0fbdbc78e71 /patches/server/0484-Add-PrepareResultEvent.patch | |
| parent | 08f746f5f0a1520e2632906af4a0df21f252eda5 (diff) | |
| download | Paper-f44d237de96b00e495bd5e33a560e18f58dec713.tar.gz Paper-f44d237de96b00e495bd5e33a560e18f58dec713.zip | |
Updated Upstream (CraftBukkit) (#6504)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
5be41fb8 SPIGOT-6720: Fix bed explosion checks
09b99daf SPIGOT-6722: Close entity manager when unloading world
3a9561bf SPIGOT-6686: Changes in MaximumRepairCost for Anvil Rename cause inconsistency
Diffstat (limited to 'patches/server/0484-Add-PrepareResultEvent.patch')
| -rw-r--r-- | patches/server/0484-Add-PrepareResultEvent.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0484-Add-PrepareResultEvent.patch b/patches/server/0484-Add-PrepareResultEvent.patch index 09b1692743..37b08e6fe2 100644 --- a/patches/server/0484-Add-PrepareResultEvent.patch +++ b/patches/server/0484-Add-PrepareResultEvent.patch @@ -8,10 +8,10 @@ Adds a new event for all crafting stations that generate a result slot item Anvil, Grindstone and Smithing now extend this event diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java -index 0d1e828debc87c6ddc569dfa8f85be9918365dc1..3070ad3a4bbe83485c6b4a68aa634045c70cafdd 100644 +index 2ed4930648411ccd52fc970b069e57eba9bceef8..593e23c10f2b1616db7256158dfe564b2d289df1 100644 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java -@@ -316,6 +316,7 @@ public class AnvilMenu extends ItemCombinerMenu { +@@ -317,6 +317,7 @@ public class AnvilMenu extends ItemCombinerMenu { } this.createResult(); |