Updated Upstream (CraftBukkit/Spigot) (#7848)

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:
95d233dc SPIGOT-1807: PlayerTeleportEvent is called twice

Spigot Changes:
b0819150 PR-116: Slightly reduce item merge radius in Y-direction
ef2aa765 PR-119: Fix off-by-one and allow disabling max-tnt-per-tick option

patches/server/Avoid-item-merge-if-stack-size-above-max-stack-size.patch

@@ -18,4 +18,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            // Paper end
              // Spigot start
              double radius = level.spigotConfig.itemMerge;
-             List<ItemEntity> list = this.level.getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(radius, radius, radius), (entityitem) -> {
+             List<ItemEntity> list = this.level.getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(radius, radius - 0.5D, radius), (entityitem) -> {

patches/server/Optimise-collision-checking-in-player-move-packet-ha.patch

@@ -137,7 +137,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                                } // else: no collision at all detected, why do we care?
 +                            }
 +                            if (!this.player.noPhysics && !this.player.isSleeping() && teleportBack) { // Paper end - optimise out extra getCubes
-                                 this.teleport(d3, d4, d5, f, f1);
+                                 this.internalTeleport(d3, d4, d5, f, f1, Collections.emptySet(), false); // CraftBukkit - SPIGOT-1807: Don't call teleport event, when the client thinks the player is falling, because the chunks are not loaded on the client yet.
                              } else {
                                  // CraftBukkit start - fire PlayerMoveEvent
 @@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit d48f2d1a508937908a7fb9169d29f53f1b34ab76
+Subproject commit 95d233dc5b5ab0bf125ce761ace782bc2f1ac78e

work/Spigot

@@ -1 +1 @@
-Subproject commit b6d12d17cd1763d488a42cb9f3e6c424de5f12a8
+Subproject commit b0819150028ec7233960ec622a4b1ba57f102047