From 7a00758b1b952c308041d87632b84a48dc18535f Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 23 Sep 2023 23:41:38 -0700 Subject: [PATCH] Rebuild patches --- ...7-Use-username-instead-of-display-name-in-PlayerList-g.patch | 2 +- patches/server/0894-Properly-resend-entities.patch | 2 +- .../0910-Use-single-player-info-update-packet-on-join.patch | 2 +- patches/server/0978-Folia-scheduler-and-owned-region-API.patch | 2 +- patches/server/0980-API-for-updating-recipes-on-clients.patch | 2 +- patches/server/0998-Add-Listing-API-for-Player.patch | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/server/0797-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0797-Use-username-instead-of-display-name-in-PlayerList-g.patch index c496ff05d0..e78af9af5b 100644 --- a/patches/server/0797-Use-username-instead-of-display-name-in-PlayerList-g.patch +++ b/patches/server/0797-Use-username-instead-of-display-name-in-PlayerList-g.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use username instead of display name in diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index cdf40a67c868a50a695b7501381171dd0fe6579b..6b114f553759d60c55805dff0769ddf0cf7241ee 100644 +index 76e83980e96f52a8cea71d9c5e80c998021fe2ff..255f7ab2560e493770bd99a8404f3c122cfca2ad 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1424,7 +1424,7 @@ public abstract class PlayerList { diff --git a/patches/server/0894-Properly-resend-entities.patch b/patches/server/0894-Properly-resend-entities.patch index c11519a085..bfaa0894c7 100644 --- a/patches/server/0894-Properly-resend-entities.patch +++ b/patches/server/0894-Properly-resend-entities.patch @@ -95,7 +95,7 @@ index 7ffd1d56ec88ffc8e3d6d0124260c3f76f3554ee..9e8f224a6d2986caaacea75eeea64d84 } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 6b114f553759d60c55805dff0769ddf0cf7241ee..e53073d09343e29255f59e1e20fc36d7e7ad6171 100644 +index 255f7ab2560e493770bd99a8404f3c122cfca2ad..a56995333931685eecf6ea90ff1a89d38b4a2336 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -357,7 +357,7 @@ public abstract class PlayerList { diff --git a/patches/server/0910-Use-single-player-info-update-packet-on-join.patch b/patches/server/0910-Use-single-player-info-update-packet-on-join.patch index 761c91d20d..64fa22a769 100644 --- a/patches/server/0910-Use-single-player-info-update-packet-on-join.patch +++ b/patches/server/0910-Use-single-player-info-update-packet-on-join.patch @@ -18,7 +18,7 @@ index ebcb7a1e09c63c83819e0831d0db23a8a9b17a94..24c8f5d859b7084cf838d5c6ef4be7a7 }); } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index e53073d09343e29255f59e1e20fc36d7e7ad6171..4cbb35cac2736c80cba2a72649c485a3ea8e920b 100644 +index a56995333931685eecf6ea90ff1a89d38b4a2336..fb257dac3abcf899d3db1df47cd7c0ce395c585b 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -339,6 +339,7 @@ public abstract class PlayerList { diff --git a/patches/server/0978-Folia-scheduler-and-owned-region-API.patch b/patches/server/0978-Folia-scheduler-and-owned-region-API.patch index 43f21453d0..f8d7e5e478 100644 --- a/patches/server/0978-Folia-scheduler-and-owned-region-API.patch +++ b/patches/server/0978-Folia-scheduler-and-owned-region-API.patch @@ -1146,7 +1146,7 @@ index 0dbfe7e9c57e0ff52d30ccce3ae3a6af413b7aa4..8f0769d248c7f3cce753130147223403 this.profiler.push("commandFunctions"); MinecraftTimings.commandFunctionsTimer.startTiming(); // Spigot // Paper diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 4cbb35cac2736c80cba2a72649c485a3ea8e920b..723a87701a44e379c80e6def91c5340e37c87ba1 100644 +index fb257dac3abcf899d3db1df47cd7c0ce395c585b..2fcca41018e6432211606276ea33170ff4f86529 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -630,6 +630,7 @@ public abstract class PlayerList { diff --git a/patches/server/0980-API-for-updating-recipes-on-clients.patch b/patches/server/0980-API-for-updating-recipes-on-clients.patch index b5437c77a3..8613c17c1a 100644 --- a/patches/server/0980-API-for-updating-recipes-on-clients.patch +++ b/patches/server/0980-API-for-updating-recipes-on-clients.patch @@ -5,7 +5,7 @@ Subject: [PATCH] API for updating recipes on clients diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 723a87701a44e379c80e6def91c5340e37c87ba1..986ab7dd2135b4cb871923b20e3dc83e17e2bae9 100644 +index 2fcca41018e6432211606276ea33170ff4f86529..c2d50d5b070e2e916cd9cb370d2d8ce074049e56 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1518,6 +1518,13 @@ public abstract class PlayerList { diff --git a/patches/server/0998-Add-Listing-API-for-Player.patch b/patches/server/0998-Add-Listing-API-for-Player.patch index d0c52891a0..4a4062188c 100644 --- a/patches/server/0998-Add-Listing-API-for-Player.patch +++ b/patches/server/0998-Add-Listing-API-for-Player.patch @@ -76,7 +76,7 @@ index 32e3f347e2e025e2675e9410116386e472bd6a79..929483116d05a803d317ece7a44861af static class EntryBuilder { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 986ab7dd2135b4cb871923b20e3dc83e17e2bae9..ba415d400c706c0483c0dc8da959b5ff39de1f4d 100644 +index c2d50d5b070e2e916cd9cb370d2d8ce074049e56..48d1444fbad1c57738807d0128b94160a5a17a4d 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -337,14 +337,22 @@ public abstract class PlayerList {