Updated Upstream (Bukkit/CraftBukkit/Spigot)

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:
d25437bc Update to Minecraft 1.18-pre8

CraftBukkit Changes:
5a39a236 Update to Minecraft 1.18-pre8

Spigot Changes:
7840c2af Update to Minecraft 1.18-pre8

patches/server/Fix-PlayerItemConsumeEvent-cancelling-properly.patch

@@ -13,10 +13,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity {
-                     level.getCraftServer().getPluginManager().callEvent(event);
+                         level.getCraftServer().getPluginManager().callEvent(event);
  
-                     if (event.isCancelled()) {
+                         if (event.isCancelled()) {
 +                        this.stopUsingItem(); // Paper - event is using an item, clear active item to reset its use
-                         // Update client
-                         ((ServerPlayer) this).getBukkitEntity().updateInventory();
-                         ((ServerPlayer) this).getBukkitEntity().updateScaledHealth();
+                             // Update client
+                             ((ServerPlayer) this).getBukkitEntity().updateInventory();
+                             ((ServerPlayer) this).getBukkitEntity().updateScaledHealth();