diff --git a/patches/api/0477-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0478-Added-API-to-get-player-ha-proxy-address.patch
similarity index 100%
rename from patches/api/0477-Added-API-to-get-player-ha-proxy-address.patch
rename to patches/api/0478-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/server/1046-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/1046-Added-API-to-get-player-ha-proxy-address.patch
index e6f2ce2a1a..f14e9bae13 100644
--- a/patches/server/1046-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/server/1046-Added-API-to-get-player-ha-proxy-address.patch
@@ -5,26 +5,10 @@ Subject: [PATCH] Added API to get player ha proxy address
 
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 58d28b6c1cc7da7d786f78308db971f7502ad844..80e50e4e59109f63f0ffe0ac711d46347986076c 100644
+index 58d28b6c1cc7da7d786f78308db971f7502ad844..02833deaa2bb7e5abc655bc1bdbe15c4b3ac7119 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -27,7 +27,6 @@ import io.netty.channel.epoll.EpollSocketChannel;
- import io.netty.channel.local.LocalChannel;
- import io.netty.channel.local.LocalServerChannel;
- import io.netty.channel.nio.NioEventLoopGroup;
--import io.netty.channel.socket.SocketChannel;
- import io.netty.channel.socket.nio.NioSocketChannel;
- import io.netty.handler.flow.FlowControlHandler;
- import io.netty.handler.timeout.ReadTimeoutHandler;
-@@ -41,7 +40,6 @@ import java.util.concurrent.RejectedExecutionException;
- import java.util.function.Consumer;
- import java.util.function.Supplier;
- import javax.annotation.Nullable;
--import javax.crypto.Cipher;
- import net.minecraft.SharedConstants;
- import net.minecraft.Util;
- import net.minecraft.network.chat.Component;
-@@ -157,6 +155,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -157,6 +157,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
          this.stopReadingPackets = true;
      }
      // Paper end - packet limiter
@@ -33,18 +17,10 @@ index 58d28b6c1cc7da7d786f78308db971f7502ad844..80e50e4e59109f63f0ffe0ac711d4634
      public Connection(PacketFlow side) {
          this.receiving = side;
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 52f537b7bfbdeaad9d17c0e88a1ed1c8925a833f..713f86b1b7273368c3f2162ea7feed0d819931ce 100644
+index 52f537b7bfbdeaad9d17c0e88a1ed1c8925a833f..8aff5129f85ab5729b3da2e465871be62d15bdf2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -20,7 +20,6 @@ import io.netty.channel.epoll.EpollServerSocketChannel;
- import io.netty.channel.local.LocalAddress;
- import io.netty.channel.local.LocalServerChannel;
- import io.netty.channel.nio.NioEventLoopGroup;
--import io.netty.channel.socket.ServerSocketChannel;
- import io.netty.channel.socket.nio.NioServerSocketChannel;
- import io.netty.handler.timeout.ReadTimeoutHandler;
- import io.netty.util.HashedWheelTimer;
-@@ -146,6 +145,13 @@ public class ServerConnectionListener {
+@@ -146,6 +146,13 @@ public class ServerConnectionListener {
  
                                          Connection connection = (Connection) channel.pipeline().get("packet_handler");
                                          connection.address = socketaddr;
@@ -59,34 +35,10 @@ index 52f537b7bfbdeaad9d17c0e88a1ed1c8925a833f..713f86b1b7273368c3f2162ea7feed0d
                                  } else {
                                      super.channelRead(ctx, msg);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0ff9bb5f5d312503ec4b3cf3bf8c532b09a8f08b..5d660f54f88a4108e52fa165c5510d9da84193b1 100644
+index 0ff9bb5f5d312503ec4b3cf3bf8c532b09a8f08b..5f896948d158651cd9837364759dbfbcce6b7d21 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -159,7 +159,6 @@ import org.bukkit.craftbukkit.map.CraftMapView;
- import org.bukkit.craftbukkit.map.RenderData;
- import org.bukkit.craftbukkit.potion.CraftPotionEffectType;
- import org.bukkit.craftbukkit.potion.CraftPotionUtil;
--import org.bukkit.craftbukkit.profile.CraftPlayerProfile;
- import org.bukkit.craftbukkit.scoreboard.CraftScoreboard;
- import org.bukkit.craftbukkit.util.CraftChatMessage;
- import org.bukkit.craftbukkit.util.CraftLocation;
-@@ -172,7 +171,6 @@ import org.bukkit.event.player.PlayerExpCooldownChangeEvent;
- import org.bukkit.event.player.PlayerHideEntityEvent;
- import org.bukkit.event.player.PlayerRegisterChannelEvent;
- import org.bukkit.event.player.PlayerShowEntityEvent;
--import org.bukkit.event.player.PlayerSpawnChangeEvent;
- import org.bukkit.event.player.PlayerTeleportEvent;
- import org.bukkit.event.player.PlayerUnregisterChannelEvent;
- import org.bukkit.inventory.EquipmentSlot;
-@@ -185,7 +183,6 @@ import org.bukkit.plugin.Plugin;
- import org.bukkit.plugin.messaging.StandardMessenger;
- import org.bukkit.potion.PotionEffect;
- import org.bukkit.potion.PotionEffectType;
--import org.bukkit.profile.PlayerProfile;
- import org.bukkit.scoreboard.Scoreboard;
- import org.jetbrains.annotations.NotNull;
- 
-@@ -273,6 +270,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -273,6 +273,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }