Updated Upstream (Bukkit/CraftBukkit) (#5508)

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

Bukkit Changes:
14883d6b SPIGOT-6078: Add SmithItemEvent and expand SmithingInventory API

CraftBukkit Changes:
115244c7 SPIGOT-6078: Add SmithItemEvent and expand SmithingInventory API

1 files changed, 8 insertions, 8 deletions

diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index b917bae172..e484a20644 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1376,18 +1376,18 @@ index da53050c6c3d0a6ef3d5b96a88517e694536a268..4170743875d2fb16987e513713b2d141
  
          // CraftBukkit start - moved from MinecraftServer.saveChunks
 diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-index f5e9758b051b5404297748e164917d18222ed723..462461f3cfebe7a8217f6e341bfc2c7759b0b758 100644
+index bc9321e77c6b2f9ac17821413fa1357da2f26b05..4ed497ee04d9e9116e1f7d90bf975aeadd24aa93 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
-@@ -209,6 +209,7 @@ import org.bukkit.inventory.CraftingInventory;
- import org.bukkit.inventory.EquipmentSlot;
+@@ -211,6 +211,7 @@ import org.bukkit.inventory.EquipmentSlot;
  import org.bukkit.inventory.InventoryView;
+ import org.bukkit.inventory.SmithingInventory;
  import org.bukkit.util.NumberConversions;
 +import co.aikar.timings.MinecraftTimings; // Paper
  // CraftBukkit end
  
  public class PlayerConnection implements PacketListenerPlayIn {
-@@ -291,7 +292,6 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -293,7 +294,6 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // CraftBukkit end
  
      public void tick() {
@@ -1395,7 +1395,7 @@ index f5e9758b051b5404297748e164917d18222ed723..462461f3cfebe7a8217f6e341bfc2c77
          this.syncPosition();
          this.player.lastX = this.player.locX();
          this.player.lastY = this.player.locY();
-@@ -367,7 +367,6 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -369,7 +369,6 @@ public class PlayerConnection implements PacketListenerPlayIn {
              this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
              this.disconnect(new ChatMessage("multiplayer.disconnect.idling"));
          }
@@ -1403,7 +1403,7 @@ index f5e9758b051b5404297748e164917d18222ed723..462461f3cfebe7a8217f6e341bfc2c77
  
      }
  
-@@ -1914,7 +1913,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1916,7 +1915,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -1412,7 +1412,7 @@ index f5e9758b051b5404297748e164917d18222ed723..462461f3cfebe7a8217f6e341bfc2c77
          // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1925,7 +1924,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1927,7 +1926,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -1421,7 +1421,7 @@ index f5e9758b051b5404297748e164917d18222ed723..462461f3cfebe7a8217f6e341bfc2c77
              return;
          }
  
-@@ -1938,7 +1937,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1940,7 +1939,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
              java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
              return;
          } finally {