diff --git a/patches/server/Add-configurable-portal-search-radius.patch b/patches/server/Add-configurable-portal-search-radius.patch
index 2ebe8e5c4a..89d46939ef 100644
--- a/patches/server/Add-configurable-portal-search-radius.patch
+++ b/patches/server/Add-configurable-portal-search-radius.patch
@@ -12,14 +12,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  double d0 = DimensionType.getTeleportationScale(this.level.dimensionType(), destination.dimensionType());
                  BlockPos blockposition = worldborder.clampToBounds(this.getX() * d0, this.getY(), this.getZ() * d0);
                  // CraftBukkit start
--                CraftPortalEvent event = this.callPortalEvent(this, destination, blockposition, PlayerTeleportEvent.TeleportCause.NETHER_PORTAL, flag2 ? 16 : 128, 16);
+-                CraftPortalEvent event = this.callPortalEvent(this, destination, new PositionImpl(blockposition.getX(), blockposition.getY(), blockposition.getZ()), PlayerTeleportEvent.TeleportCause.NETHER_PORTAL, flag2 ? 16 : 128, 16);
 +                // Paper start
 +                int portalSearchRadius = destination.paperConfig().environment.portalSearchRadius;
 +                if (level.paperConfig().environment.portalSearchVanillaDimensionScaling && flag2) { // == THE_NETHER
 +                    portalSearchRadius = (int) (portalSearchRadius / destination.dimensionType().coordinateScale());
 +                }
 +                // Paper end
-+                CraftPortalEvent event = this.callPortalEvent(this, destination, blockposition, PlayerTeleportEvent.TeleportCause.NETHER_PORTAL, portalSearchRadius, destination.paperConfig().environment.portalCreateRadius); // Paper start - configurable portal radius
++                CraftPortalEvent event = this.callPortalEvent(this, destination, new PositionImpl(blockposition.getX(), blockposition.getY(), blockposition.getZ()), PlayerTeleportEvent.TeleportCause.NETHER_PORTAL, portalSearchRadius, destination.paperConfig().environment.portalCreateRadius); // Paper start - configurable portal radius
                  if (event == null) {
                      return null;
                  }
diff --git a/patches/server/Adventure.patch b/patches/server/Adventure.patch
index c5fed05b0d..435c5d9ad7 100644
--- a/patches/server/Adventure.patch
+++ b/patches/server/Adventure.patch
@@ -3118,7 +3118,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java
-@@ -0,0 +0,0 @@ import org.apache.commons.lang.Validate;
+@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.util.CraftChatMessage;
  
  public class CraftMerchantCustom extends CraftMerchant {
  
@@ -3137,13 +3137,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public String toString() {
 @@ -0,0 +0,0 @@ public class CraftMerchantCustom extends CraftMerchant {
-         private Level tradingWorld;
+         private Player tradingPlayer;
          protected CraftMerchant craftMerchant;
  
 +        @Deprecated // Paper - Adventure
          public MinecraftMerchant(String title) {
              Validate.notNull(title, "Title cannot be null");
-             this.title = Component.literal(title);
+             this.title = CraftChatMessage.fromString(title)[0];
          }
 +        // Paper start
 +        public MinecraftMerchant(net.kyori.adventure.text.Component title) {
diff --git a/work/CraftBukkit b/work/CraftBukkit
index fc3071161c..ef09464094 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit fc3071161ce4ceacceafcf77c03e5fe8464c6675
+Subproject commit ef094640942637ee78314416474425a1a53b2a64