Updated Upstream (Bukkit/CraftBukkit)

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:
9153f77e PR-841: Remove incorrect ClickType.CONTROL_DROP from ClickType#isShiftClick
bceda6ab PR-840: Adjust annotations in Display entity interface
a6b85ac3 PR-835: Add Jukebox#hasRecord() and #startPlaying(), clarify #setRecord()

CraftBukkit Changes:
e142fb9fd SPIGOT-7188: ChunkSnapshot biome y coordinate doesn't match chunk biome y coord
eff1743b9 SPIGOT-7313: More accurately edit data on Jukeboxes

patches/server/0934-Fix-chunk-snapshot-biome-getter.patch

@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
-Date: Sat, 10 Dec 2022 13:01:52 +0100
-Subject: [PATCH] Fix chunk snapshot biome getter
-
-Fixes SPIGOT-7188: https://hub.spigotmc.org/jira/browse/SPIGOT-7188
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
-index 05512cc19eb213b6be5c869e133376ee42827806..c6416b3db0166374065d537e379d05da0f093b21 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
-@@ -149,7 +149,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
-         Preconditions.checkState(this.biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true");
-         this.validateChunkCoordinates(x, y, z);
- 
--        PalettedContainerRO<Holder<net.minecraft.world.level.biome.Biome>> biome = this.biome[this.getSectionIndex(y >> 2)];
-+        PalettedContainerRO<Holder<net.minecraft.world.level.biome.Biome>> biome = this.biome[this.getSectionIndex(y)]; // Paper
-         return CraftBlock.biomeBaseToBiome(biomeRegistry, biome.get(x >> 2, (y & 0xF) >> 2, z >> 2));
-     }
- 
-@@ -163,7 +163,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
-         Preconditions.checkState(this.biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true");
-         this.validateChunkCoordinates(x, y, z);
- 
--        PalettedContainerRO<Holder<net.minecraft.world.level.biome.Biome>> biome = this.biome[this.getSectionIndex(y >> 2)];
-+        PalettedContainerRO<Holder<net.minecraft.world.level.biome.Biome>> biome = this.biome[this.getSectionIndex(y)]; // Paper
-         return biome.get(x >> 2, (y & 0xF) >> 2, z >> 2).value().getTemperature(new BlockPos((this.x << 4) | x, y, (this.z << 4) | z));
-     }
- 

patches/server/0940-Improve-PortalEvents.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 071b241de8f6e00f57e8564bb3feb757ee1f05eb..56e7e423ef3f1016ea095ef98dc9c06e7763ac3b 100644
+index 8a7af77e8ac456cc89da7e954a8090bf794475c8..448b3d68b440cfeeb4bf8c5c7aabfdc9bdb97fc0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3561,7 +3561,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0941-Add-config-option-for-spider-worldborder-climbing.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for spider worldborder climbing
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 56e7e423ef3f1016ea095ef98dc9c06e7763ac3b..1a302abc9864b727288de748a8e1627f771c17f1 100644
+index 448b3d68b440cfeeb4bf8c5c7aabfdc9bdb97fc0..4d5c68aaea1fe44517862075b60e1989170618ab 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -398,6 +398,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0942-Add-missing-SpigotConfig-logCommands-check.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5ddb75e6f60e4a4960018055991ea087ec473beb..3bec358de0348ba64ddbd83b63814fdc7b375b55 100644
+index 04386413177d0fb1338fccabf8af5746a18ef784..afcdd85d2b10bbd76c589c419feefd87f3ea1825 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2248,7 +2248,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0946-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1a302abc9864b727288de748a8e1627f771c17f1..9a1e8589e6b371869b2199650172d61ae186c907 100644
+index 4d5c68aaea1fe44517862075b60e1989170618ab..4705d7066207250c03a5f98eef61554c901f2e35 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1104,7 +1104,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0949-Correctly-shrink-items-during-EntityResurrectEvent.patch

@@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem
 of undying was found and the event was called uncancelled.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ee859b78121fe80bfd7858c49d41d8770b204801..9358a2112952f0a90b058a7078b3577b5a56f76b 100644
+index 1f41b48964f168532e9f07a4e708e2afb3791c3e..e9d3e34520b706627205e0d5b17b25e09f198e7e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1543,7 +1543,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0950-Win-Screen-API.patch

@@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ec7a028f36cb4d116c1ff63d34d3d69dfe063f14..eca5e6b93dd84307bf9dbadf32414d6f506e69dc 100644
+index cdb1e5d82ff1e18e3f27c816df57bd9eeebbe80b..0ae1fce0c1a2e3bfbbab756a088fc76545e263fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1208,6 +1208,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0965-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch

@@ -18,7 +18,7 @@ index 6986b2a5df34bfe078c902594f6409ad0ea847ef..ed12a23448dc9ada423ebd79a131eab2
              this.updateState(slot);
          }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java
-index 9cb6c0d80a988c23dd7af4263882ac128d08d6e8..08a6f2924b36d36fadb35d8d2443bb717ff4567e 100644
+index 77ece220a2e204c3e66e660c639abda957bf21b9..62acd6686626c84c9fc3964af62097101e8e582f 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java
 @@ -183,6 +183,12 @@ public class JukeboxBlockEntity extends BlockEntity implements Clearable, Contai

work/Bukkit

@@ -1 +1 @@
-Subproject commit 2c64d8c4a880c6aec8ee8ce3abdd0238b0e0d8a3
+Subproject commit 9153f77e75057c0d0be267de6e0dca89e487625f

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit f92c945173a83c754203f372cb0111780c24b540
+Subproject commit e142fb9fd3784080c43e025c32d8306881fee4ca