diff --git a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch
index d3fbcb1c96..7e2e4c7cea 100644
--- a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch
@@ -33,19 +33,6 @@ index 52595b6534e2798b36b3a7c2d97451bd0ea2f3a0..716ea2fced5dc9e9a790f25e68252d5b
                  if (event == null) {
                      return null;
                  }
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index aed80f8a4a39d677ee0ea82f8795c5c8fdedcd6c..553b2729a3a50a35e68602da451fbd69a9dfbe9b 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -875,7 +875,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     protected CraftPortalEvent callPortalEvent(Entity entity, WorldServer exitWorldServer, BlockPosition exitPosition, TeleportCause cause, int searchRadius, int creationRadius) {
-         Location enter = this.getBukkitEntity().getLocation();
-         Location exit = new Location(exitWorldServer.getWorld(), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ(), yaw, pitch);
--        PlayerPortalEvent event = new PlayerPortalEvent(this.getBukkitEntity(), enter, exit, cause, 128, true, creationRadius);
-+        PlayerPortalEvent event = new PlayerPortalEvent(this.getBukkitEntity(), enter, exit, cause, searchRadius, true, creationRadius); // Paper - use searchRadius
-         Bukkit.getServer().getPluginManager().callEvent(event);
-         if (event.isCancelled() || event.getTo() == null || event.getTo().getWorld() == null) {
-             return null;
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 index 150c688262e79b3b675685dbd1754b9e01cb4d75..e10995ec30dd9a10d781b3c1709fd2db5a9becdd 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 009f0ba0ef..23618b2cb5 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 009f0ba0efc92da460667c30a15d2120eeb74909
+Subproject commit 23618b2cb56759e176e5c7796f945782cd065bc6