diff --git a/patches/api/Multiple-Entries-with-Scoreboards.patch b/patches/api/Multiple-Entries-with-Scoreboards.patch
new file mode 100644
index 0000000000..68f60db216
--- /dev/null
+++ b/patches/api/Multiple-Entries-with-Scoreboards.patch
@@ -0,0 +1,128 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cryptite <cryptite@gmail.com>
+Date: Tue, 21 Sep 2021 18:17:34 -0500
+Subject: [PATCH] Multiple Entries with Scoreboards
+
+
+diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/scoreboard/Team.java
++++ b/src/main/java/org/bukkit/scoreboard/Team.java
+@@ -0,0 +0,0 @@ public interface Team {
+      */
+     void addEntry(@NotNull String entry) throws IllegalStateException, IllegalArgumentException;
+ 
++    // Paper start
++    /**
++     * This puts a collection of entities onto this team for the scoreboard which results in one
++     * packet for the updates rather than a packet-per-entity.
++     * <p>
++     * Entities on other teams will be removed from their respective teams.
++     *
++     * @param entities the entities to add
++     * @throws IllegalArgumentException if entities are null
++     * @throws IllegalStateException if this team has been unregistered
++     */
++    default void addEntities(@NotNull org.bukkit.entity.Entity @NotNull ...entities) {
++        this.addEntities(java.util.List.of(entities));
++    }
++
++    /**
++     * This puts a collection of entities onto this team for the scoreboard which results in one
++     * packet for the updates rather than a packet-per-entity.
++     * <p>
++     * Entities on other teams will be removed from their respective teams.
++     *
++     * @param entities the entities to add
++     * @throws IllegalArgumentException if entities are null
++     * @throws IllegalStateException if this team has been unregistered
++     */
++    void addEntities(@NotNull java.util.Collection<org.bukkit.entity.Entity> entities) throws IllegalStateException, IllegalArgumentException;
++
++    /**
++     * This puts a collection of entries onto this team for the scoreboard which results in one
++     * packet for the updates rather than a packet-per-entry.
++     * <p>
++     * Entries on other teams will be removed from their respective teams.
++     *
++     * @param entries the entries to add
++     * @throws IllegalArgumentException if entries are null
++     * @throws IllegalStateException if this team has been unregistered
++     */
++    default void addEntries(@NotNull String... entries) throws IllegalStateException, IllegalArgumentException {
++        this.addEntries(java.util.List.of(entries));
++    }
++
++    /**
++     * This puts a collection of entries onto this team for the scoreboard which results in one
++     * packet for the updates rather than a packet-per-entry.
++     * <p>
++     * Entries on other teams will be removed from their respective teams.
++     *
++     * @param entries the entries to add
++     * @throws IllegalArgumentException if entries are null
++     * @throws IllegalStateException if this team has been unregistered
++     */
++    void addEntries(@NotNull java.util.Collection<String> entries) throws IllegalStateException, IllegalArgumentException;
++    // Paper end
++
+     /**
+      * Removes the player from this team.
+      *
+@@ -0,0 +0,0 @@ public interface Team {
+      */
+     boolean removeEntry(@NotNull String entry) throws IllegalStateException, IllegalArgumentException;
+ 
++    // Paper start
++    /**
++     * Removes a collection of entities from this team  which results in one
++     * packet for the updates rather than a packet-per-entity.
++     *
++     * @param entities the entries to remove
++     * @return if any of the entities were a part of this team
++     * @throws IllegalArgumentException if entities is null
++     * @throws IllegalStateException if this team has been unregistered
++     */
++    default boolean removeEntities(@NotNull org.bukkit.entity.Entity @NotNull ... entities) throws IllegalStateException, IllegalArgumentException {
++        return this.removeEntities(java.util.List.of(entities));
++    }
++
++    /**
++     * Removes a collection of entities from this team  which results in one
++     * packet for the updates rather than a packet-per-entity.
++     *
++     * @param entities the entries to remove
++     * @return if any of the entities were a part of this team
++     * @throws IllegalArgumentException if entities is null
++     * @throws IllegalStateException if this team has been unregistered
++     */
++    boolean removeEntities(@NotNull java.util.Collection<org.bukkit.entity.Entity> entities) throws IllegalStateException, IllegalArgumentException;
++
++    /**
++     * Removes a collection of entries from this team  which results in one
++     * packet for the updates rather than a packet-per-entry.
++     *
++     * @param entries the entries to remove
++     * @return if any of the entries were a part of this team
++     * @throws IllegalArgumentException if entries is null
++     * @throws IllegalStateException if this team has been unregistered
++     */
++    default boolean removeEntries(@NotNull String... entries) throws IllegalStateException, IllegalArgumentException {
++        return this.removeEntries(java.util.List.of(entries));
++    }
++
++    /**
++     * Removes a collection of entries from this team  which results in one
++     * packet for the updates rather than a packet-per-entry.
++     *
++     * @param entries the entries to remove
++     * @return if any of the entries were a part of this team
++     * @throws IllegalArgumentException if entries is null
++     * @throws IllegalStateException if this team has been unregistered
++     */
++    boolean removeEntries(@NotNull java.util.Collection<String> entries) throws IllegalStateException, IllegalArgumentException;
++    // Paper end
++
+     /**
+      * Unregisters this team from the Scoreboard
+      *
diff --git a/patches/server/Multiple-Entries-with-Scoreboards.patch b/patches/server/Multiple-Entries-with-Scoreboards.patch
new file mode 100644
index 0000000000..d15a125c23
--- /dev/null
+++ b/patches/server/Multiple-Entries-with-Scoreboards.patch
@@ -0,0 +1,126 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cryptite <cryptite@gmail.com>
+Date: Tue, 21 Sep 2021 18:17:33 -0500
+Subject: [PATCH] Multiple Entries with Scoreboards
+
+
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
+@@ -0,0 +0,0 @@ public class ClientboundSetPlayerTeamPacket implements Packet<ClientGamePacketLi
+         return new ClientboundSetPlayerTeamPacket(team.getName(), operation == ClientboundSetPlayerTeamPacket.Action.ADD ? 3 : 4, Optional.empty(), ImmutableList.of(playerName));
+     }
+ 
++    // Paper start
++    public static ClientboundSetPlayerTeamPacket createMultiplePlayerPacket(PlayerTeam team, Collection<String> players, ClientboundSetPlayerTeamPacket.Action operation) {
++        return new ClientboundSetPlayerTeamPacket(team.getName(), operation == ClientboundSetPlayerTeamPacket.Action.ADD ? 3 : 4, Optional.empty(), players);
++    }
++    // Paper end
++
+     public ClientboundSetPlayerTeamPacket(FriendlyByteBuf buf) {
+         this.name = buf.readUtf();
+         this.method = buf.readByte();
+diff --git a/src/main/java/net/minecraft/server/ServerScoreboard.java b/src/main/java/net/minecraft/server/ServerScoreboard.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/ServerScoreboard.java
++++ b/src/main/java/net/minecraft/server/ServerScoreboard.java
+@@ -0,0 +0,0 @@ public class ServerScoreboard extends Scoreboard {
+         }
+     }
+ 
++    // Paper start
++    public boolean addPlayersToTeam(java.util.Collection<String> players, PlayerTeam team) {
++        boolean anyAdded = false;
++        for (String playerName : players) {
++            if (super.addPlayerToTeam(playerName, team)) {
++                anyAdded = true;
++            }
++        }
++
++        if (anyAdded) {
++            this.broadcastAll(ClientboundSetPlayerTeamPacket.createMultiplePlayerPacket(team, players, ClientboundSetPlayerTeamPacket.Action.ADD));
++            this.setDirty();
++            return true;
++        } else {
++            return false;
++        }
++    }
++    // Paper end
++
+     @Override
+     public void removePlayerFromTeam(String playerName, PlayerTeam team) {
+         super.removePlayerFromTeam(playerName, team);
+@@ -0,0 +0,0 @@ public class ServerScoreboard extends Scoreboard {
+         this.setDirty();
+     }
+ 
++    // Paper start
++    public void removePlayersFromTeam(java.util.Collection<String> players, PlayerTeam team) {
++        for (String playerName : players) {
++            super.removePlayerFromTeam(playerName, team);
++        }
++
++        this.broadcastAll(ClientboundSetPlayerTeamPacket.createMultiplePlayerPacket(team, players, ClientboundSetPlayerTeamPacket.Action.REMOVE));
++        this.setDirty();
++    }
++    // Paper end
++
+     @Override
+     public void onObjectiveAdded(Objective objective) {
+         super.onObjectiveAdded(objective);
+diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
++++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
+@@ -0,0 +0,0 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
+         scoreboard.board.addPlayerToTeam(entry, team);
+     }
+ 
++    // Paper start
++    @Override
++    public void addEntities(java.util.Collection<org.bukkit.entity.Entity> entities) throws IllegalStateException, IllegalArgumentException {
++        this.addEntries(entities.stream().map(entity -> ((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName()).toList());
++    }
++
++    @Override
++    public void addEntries(java.util.Collection<String> entries) throws IllegalStateException, IllegalArgumentException {
++        Validate.notNull(entries, "Entries cannot be null");
++        CraftScoreboard scoreboard = this.checkState();
++
++        ((net.minecraft.server.ServerScoreboard) scoreboard.board).addPlayersToTeam(entries, this.team);
++    }
++    // Paper end
++
+     @Override
+     public boolean removePlayer(OfflinePlayer player) throws IllegalStateException, IllegalArgumentException {
+         Validate.notNull(player, "OfflinePlayer cannot be null");
+@@ -0,0 +0,0 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
+         return true;
+     }
+ 
++    // Paper start
++    @Override
++    public boolean removeEntities(java.util.Collection<org.bukkit.entity.Entity> entities) throws IllegalStateException, IllegalArgumentException {
++        return this.removeEntries(entities.stream().map(entity -> ((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle().getScoreboardName()).toList());
++    }
++
++    @Override
++    public boolean removeEntries(java.util.Collection<String> entries) throws IllegalStateException, IllegalArgumentException {
++        Validate.notNull(entries, "Entry cannot be null");
++        CraftScoreboard scoreboard = this.checkState();
++
++        for (String entry : entries) {
++            if (this.team.getPlayers().contains(entry)) {
++                ((net.minecraft.server.ServerScoreboard) scoreboard.board).removePlayersFromTeam(entries, this.team);
++                return true;
++            }
++        }
++
++        return false;
++    }
++    // Paper end
++
+     @Override
+     public boolean hasPlayer(OfflinePlayer player) throws IllegalArgumentException, IllegalStateException {
+         Validate.notNull(player, "OfflinePlayer cannot be null");