diff --git a/patches/api/Add-Player-Client-Options-API.patch b/patches/api/Add-Player-Client-Options-API.patch
index c579c4940c..e1a66a70d0 100644
--- a/patches/api/Add-Player-Client-Options-API.patch
+++ b/patches/api/Add-Player-Client-Options-API.patch
@@ -180,8 +180,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ package org.bukkit.entity;
+ 
  import java.net.InetSocketAddress;
- import java.util.List; // Paper
  import java.util.UUID;
 +import com.destroystokyo.paper.ClientOption; // Paper
  import com.destroystokyo.paper.Title; // Paper
diff --git a/patches/api/Add-String-based-Action-Bar-API.patch b/patches/api/Add-String-based-Action-Bar-API.patch
index 23823244f1..40c557dabf 100644
--- a/patches/api/Add-String-based-Action-Bar-API.patch
+++ b/patches/api/Add-String-based-Action-Bar-API.patch
@@ -8,8 +8,8 @@ diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/buk
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -0,0 +0,0 @@ import java.net.InetSocketAddress;
- import java.util.List; // Paper
+@@ -0,0 +0,0 @@ package org.bukkit.entity;
+ import java.net.InetSocketAddress;
  import java.util.UUID;
  import com.destroystokyo.paper.Title; // Paper
 +import net.kyori.adventure.text.Component;
diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch
index 2456445989..2f740686d2 100644
--- a/patches/api/Adventure.patch
+++ b/patches/api/Adventure.patch
@@ -1355,14 +1355,6 @@ diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/buk
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -0,0 +0,0 @@
- package org.bukkit.entity;
- 
- import java.net.InetSocketAddress;
-+import java.util.List; // Paper
- import java.util.UUID;
- import org.bukkit.DyeColor;
- import org.bukkit.Effect;
 @@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a player, connected or not
@@ -1650,7 +1642,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * @throws IllegalArgumentException if location is null
       * @throws IllegalArgumentException if dyeColor is null
       * @throws IllegalArgumentException if lines is non-null and has a length less than 4
-+     * @deprecated Deprecated in favour of {@link #sendSignChange(Location, List, DyeColor, boolean)}
++     * @deprecated Deprecated in favour of {@link #sendSignChange(Location, java.util.List, DyeColor, boolean)}
       */
 +    @Deprecated // Paper
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException;
diff --git a/patches/api/Expose-Tracked-Players.patch b/patches/api/Expose-Tracked-Players.patch
index 68dab829aa..a667005325 100644
--- a/patches/api/Expose-Tracked-Players.patch
+++ b/patches/api/Expose-Tracked-Players.patch
@@ -8,10 +8,10 @@ diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/buk
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -0,0 +0,0 @@ package org.bukkit.entity;
+@@ -0,0 +0,0 @@
+ package org.bukkit.entity;
  
  import java.net.InetSocketAddress;
- import java.util.List; // Paper
 +import java.util.Set; // Paper
  import java.util.UUID;
  import com.destroystokyo.paper.ClientOption; // Paper
diff --git a/patches/api/Player-Tab-List-and-Title-APIs.patch b/patches/api/Player-Tab-List-and-Title-APIs.patch
index d24aa05121..7d7d129e72 100644
--- a/patches/api/Player-Tab-List-and-Title-APIs.patch
+++ b/patches/api/Player-Tab-List-and-Title-APIs.patch
@@ -436,8 +436,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ package org.bukkit.entity;
+ 
  import java.net.InetSocketAddress;
- import java.util.List; // Paper
  import java.util.UUID;
 +import com.destroystokyo.paper.Title; // Paper
  import org.bukkit.DyeColor;
diff --git a/patches/api/Player.setPlayerProfile-API.patch b/patches/api/Player.setPlayerProfile-API.patch
index 9118dbd7c2..a99e290d5e 100644
--- a/patches/api/Player.setPlayerProfile-API.patch
+++ b/patches/api/Player.setPlayerProfile-API.patch
@@ -9,7 +9,7 @@ diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/buk
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -0,0 +0,0 @@ import java.util.List; // Paper
+@@ -0,0 +0,0 @@ import java.net.InetSocketAddress;
  import java.util.UUID;
  import com.destroystokyo.paper.Title; // Paper
  import net.kyori.adventure.text.Component;