diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch index 8bd1e3da6d..0c2b472b98 100644 --- a/patches/api/0001-Convert-project-to-Gradle.patch +++ b/patches/api/0001-Convert-project-to-Gradle.patch @@ -27,7 +27,7 @@ index 11038da2e071699d6561a331565db0c8d7850d0e..317acfec5894101294a55abff6181943 +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..8686d850f41753923e375bd8ed9fec45e6171e05 +index 0000000000000000000000000000000000000000..73bc33e7a498f8eca2d68c4588b04de4eaf8fc7a --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,85 @@ @@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..8686d850f41753923e375bd8ed9fec45 + api("com.google.guava:guava:31.1-jre") + api("com.google.code.gson:gson:2.10") + api("net.md-5:bungeecord-chat:1.16-R0.4") -+ api("org.yaml:snakeyaml:1.33") ++ api("org.yaml:snakeyaml:2.0") + api("org.joml:joml:1.10.5") + + compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") @@ -62,7 +62,7 @@ index 0000000000000000000000000000000000000000..8686d850f41753923e375bd8ed9fec45 + testImplementation("org.apache.commons:commons-lang3:3.12.0") + testImplementation("junit:junit:4.13.2") + testImplementation("org.hamcrest:hamcrest-library:1.3") -+ testImplementation("org.ow2.asm:asm-tree:9.4") ++ testImplementation("org.ow2.asm:asm-tree:9.5") +} + +configure { @@ -99,7 +99,7 @@ index 0000000000000000000000000000000000000000..8686d850f41753923e375bd8ed9fec45 + options.isDocFilesSubDirs = true + options.links( + "https://guava.dev/releases/31.1-jre/api/docs/", -+ "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", ++ "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/", + "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/", + "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", + ) @@ -118,7 +118,7 @@ index 0000000000000000000000000000000000000000..8686d850f41753923e375bd8ed9fec45 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index 2ac982a8bc43604298a0788bf03b5e6314f5ab9b..0000000000000000000000000000000000000000 +index 3c8af751e4b445dd65c9618633f16e181800a73b..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null @@ -1,270 +0,0 @@ @@ -318,7 +318,7 @@ index 2ac982a8bc43604298a0788bf03b5e6314f5ab9b..00000000000000000000000000000000 - - - https://guava.dev/releases/31.1-jre/api/docs/ -- https://javadoc.io/doc/org.yaml/snakeyaml/1.33/ +- https://javadoc.io/doc/org.yaml/snakeyaml/2.0/ - https://javadoc.io/doc/org.jetbrains/annotations-java5/24.0.1/ - https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/ - diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch index 4c535298ff..4204d5f382 100644 --- a/patches/api/0002-Build-system-changes.patch +++ b/patches/api/0002-Build-system-changes.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Build system changes diff --git a/build.gradle.kts b/build.gradle.kts -index 8686d850f41753923e375bd8ed9fec45e6171e05..d72a4e039e77a0dc9a2eacb6d2e07260c206c678 100644 +index 73bc33e7a498f8eca2d68c4588b04de4eaf8fc7a..34117c1178e04885ff9be5b73c7c2547e77ed4d5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,15 +17,27 @@ dependencies { api("net.md-5:bungeecord-chat:1.16-R0.4") - api("org.yaml:snakeyaml:1.33") + api("org.yaml:snakeyaml:2.0") api("org.joml:joml:1.10.5") + // Paper start + api("com.googlecode.json-simple:json-simple:1.1.1") { @@ -40,7 +40,7 @@ index 8686d850f41753923e375bd8ed9fec45e6171e05..d72a4e039e77a0dc9a2eacb6d2e07260 @@ -67,7 +79,7 @@ tasks.withType { options.links( "https://guava.dev/releases/31.1-jre/api/docs/", - "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", + "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/", - "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/", + "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", diff --git a/patches/api/0003-Test-changes.patch b/patches/api/0003-Test-changes.patch index 6a8879dfb7..1dde6be76c 100644 --- a/patches/api/0003-Test-changes.patch +++ b/patches/api/0003-Test-changes.patch @@ -12,7 +12,7 @@ Co-authored-by: Riley Park Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index d72a4e039e77a0dc9a2eacb6d2e07260c206c678..cf022f431c1a9c5b40d6b71411df2dfab98cde13 100644 +index 34117c1178e04885ff9be5b73c7c2547e77ed4d5..c174d9d6534382ae9d002b883bde929d46e32789 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,6 +37,7 @@ dependencies { diff --git a/patches/api/0004-Add-FastUtil-to-Bukkit.patch b/patches/api/0004-Add-FastUtil-to-Bukkit.patch index 0d38b90e72..fb0060fc79 100644 --- a/patches/api/0004-Add-FastUtil-to-Bukkit.patch +++ b/patches/api/0004-Add-FastUtil-to-Bukkit.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit Doesn't expose to plugins, just allows Paper-API to use it for optimization diff --git a/build.gradle.kts b/build.gradle.kts -index cf022f431c1a9c5b40d6b71411df2dfab98cde13..77078078c16671b65a604afe17eaf66042afcae2 100644 +index c174d9d6534382ae9d002b883bde929d46e32789..3e571743e76b26167e329dbd0a4c04ffd6427572 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,6 +21,7 @@ dependencies { diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch index d018e951a6..143272a183 100644 --- a/patches/api/0005-Adventure.patch +++ b/patches/api/0005-Adventure.patch @@ -7,7 +7,7 @@ Co-authored-by: zml Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index 77078078c16671b65a604afe17eaf66042afcae2..a346f0d360bacf245a8905e3ff3c4f370960e051 100644 +index 3e571743e76b26167e329dbd0a4c04ffd6427572..0bc5c544723e8ea0dc4441b2198b744b1a38b26b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,13 +8,26 @@ java { @@ -35,7 +35,7 @@ index 77078078c16671b65a604afe17eaf66042afcae2..a346f0d360bacf245a8905e3ff3c4f37 api("com.google.code.gson:gson:2.10") - api("net.md-5:bungeecord-chat:1.16-R0.4") + api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.9") // Paper - api("org.yaml:snakeyaml:1.33") + api("org.yaml:snakeyaml:2.0") api("org.joml:joml:1.10.5") // Paper start @@ -22,6 +35,13 @@ dependencies { @@ -54,7 +54,7 @@ index 77078078c16671b65a604afe17eaf66042afcae2..a346f0d360bacf245a8905e3ff3c4f37 compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") @@ -82,10 +102,25 @@ tasks.withType { "https://guava.dev/releases/31.1-jre/api/docs/", - "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", + "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/", "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations - "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", + // Paper start @@ -2043,7 +2043,7 @@ index f3afe67f0832cb828d25be3654518ff73a80b0e1..598abaa82c634178043a29f6caa6ac52 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451ea4967173 100644 +index 73e4d48cd2e424a7ecd6fc37d4c020aca7a6a726..1c072fbfdeb25a4fada75dcaa7cade4d24ca556a 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -42,7 +42,28 @@ import org.jetbrains.annotations.Nullable; @@ -2342,7 +2342,7 @@ index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451e public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException; /** -@@ -1179,6 +1355,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1181,6 +1357,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * pack correctly. * * @@ -2350,7 +2350,7 @@ index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451e * @param url The URL from which the client will download the resource * pack. The string must contain only US-ASCII characters and should * be encoded as per RFC 1738. -@@ -1235,8 +1412,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1237,8 +1414,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException Thrown if the hash is not 20 bytes * long. */ @@ -2361,7 +2361,7 @@ index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451e /** * Request that the player's client download and switch resource packs. *

-@@ -1272,6 +1451,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1274,6 +1453,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param hash The sha1 hash sum of the resource pack file which is used * to apply a cached version of the pack directly without downloading * if it is available. Hast to be 20 bytes long! @@ -2416,7 +2416,7 @@ index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451e * @param force If true, the client will be disconnected from the server * when it declines to use the resource pack. * @throws IllegalArgumentException Thrown if the URL is null. -@@ -1326,8 +1553,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1328,8 +1555,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException Thrown if the hash is not 20 bytes * long. */ @@ -2474,7 +2474,7 @@ index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451e /** * Gets the Scoreboard displayed to this player * -@@ -1443,7 +1719,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1445,7 +1721,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param title Title text * @param subtitle Subtitle text @@ -2483,7 +2483,7 @@ index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451e */ @Deprecated public void sendTitle(@Nullable String title, @Nullable String subtitle); -@@ -1462,7 +1738,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1464,7 +1740,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param fadeIn time in ticks for titles to fade in. Defaults to 10. * @param stay time in ticks for titles to stay. Defaults to 70. * @param fadeOut time in ticks for titles to fade out. Defaults to 20. @@ -2493,7 +2493,7 @@ index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451e public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut); /** -@@ -1689,6 +1967,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1691,6 +1969,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public int getClientViewDistance(); @@ -2508,7 +2508,7 @@ index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451e /** * Gets the player's estimated ping in milliseconds. * -@@ -1714,8 +2000,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1716,8 +2002,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * they wish. * * @return the player's locale @@ -2519,7 +2519,7 @@ index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451e public String getLocale(); /** -@@ -1767,6 +2055,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1769,6 +2057,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public boolean isAllowingServerListings(); @@ -2534,7 +2534,7 @@ index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451e // Spigot start public class Spigot extends Entity.Spigot { -@@ -1821,11 +2117,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1800,11 +2096,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM throw new UnsupportedOperationException("Not supported yet."); } @@ -2548,7 +2548,7 @@ index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451e @Override public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); -@@ -1836,7 +2134,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1815,7 +2113,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param position the screen position * @param component the components to send @@ -2558,7 +2558,7 @@ index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451e public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -1846,7 +2146,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1825,7 +2125,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param position the screen position * @param components the components to send @@ -2568,7 +2568,7 @@ index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451e public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -1857,7 +2159,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1836,7 +2138,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param position the screen position * @param sender the sender of the message * @param component the components to send @@ -2578,7 +2578,7 @@ index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451e public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent component) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -1868,7 +2172,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1847,7 +2151,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param position the screen position * @param sender the sender of the message * @param components the components to send diff --git a/patches/api/0007-Use-ASM-for-event-executors.patch b/patches/api/0007-Use-ASM-for-event-executors.patch index 2c5a9ad94f..e3b70b3280 100644 --- a/patches/api/0007-Use-ASM-for-event-executors.patch +++ b/patches/api/0007-Use-ASM-for-event-executors.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/build.gradle.kts b/build.gradle.kts -index a346f0d360bacf245a8905e3ff3c4f370960e051..57e5d0bf373067138a53067563b82e9aa8e100c4 100644 +index 0bc5c544723e8ea0dc4441b2198b744b1a38b26b..0270849badc82810c8c288a9bd02efff93b18141 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,6 +42,9 @@ dependencies { diff --git a/patches/api/0008-Paper-Plugins.patch b/patches/api/0008-Paper-Plugins.patch index 35f5a2bbf0..73f0d15f0c 100644 --- a/patches/api/0008-Paper-Plugins.patch +++ b/patches/api/0008-Paper-Plugins.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Paper Plugins diff --git a/build.gradle.kts b/build.gradle.kts -index 57e5d0bf373067138a53067563b82e9aa8e100c4..6c42827db10fb2fb4dede44cba84e7989c1a6fdc 100644 +index 0270849badc82810c8c288a9bd02efff93b18141..6d4493850bdb0ec72d480ec60bc5ffef540470d7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -47,7 +47,7 @@ dependencies { diff --git a/patches/api/0010-Timings-v2.patch b/patches/api/0010-Timings-v2.patch index 68a96e0957..2174f71771 100644 --- a/patches/api/0010-Timings-v2.patch +++ b/patches/api/0010-Timings-v2.patch @@ -3455,10 +3455,10 @@ index 516d7fc7812aac343782861d0d567f54aa578c2a..00000000000000000000000000000000 - // Spigot end -} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 44be86a9315d45dcbaabbbfcf2c7451ea4967173..02e09dc027409b3be9e960be6f2e4c10a06819b6 100644 +index 1c072fbfdeb25a4fada75dcaa7cade4d24ca556a..e983cc255885622b9990492a3b6fd2fd77835d91 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2177,7 +2177,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2156,7 +2156,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Deprecated // Paper public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); diff --git a/patches/api/0012-Player-affects-spawning-API.patch b/patches/api/0012-Player-affects-spawning-API.patch index 254e55960f..f9e4a6e3a5 100644 --- a/patches/api/0012-Player-affects-spawning-API.patch +++ b/patches/api/0012-Player-affects-spawning-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 02e09dc027409b3be9e960be6f2e4c10a06819b6..94d9882520a6a87d936e5f7823b910a630ec5f34 100644 +index e983cc255885622b9990492a3b6fd2fd77835d91..439572173999364b3ad9f5c89a1209773c51302b 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2006,6 +2006,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2008,6 +2008,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Deprecated // Paper public String getLocale(); diff --git a/patches/api/0017-Add-view-distance-API.patch b/patches/api/0017-Add-view-distance-API.patch index 39b6ed510e..88b157342f 100644 --- a/patches/api/0017-Add-view-distance-API.patch +++ b/patches/api/0017-Add-view-distance-API.patch @@ -75,10 +75,10 @@ index 5357291ff0f2f20bd87ab9f6e57f6a4f6ff65226..887aa6217583d224d66f6d238ac269c2 public class Spigot { diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 94d9882520a6a87d936e5f7823b910a630ec5f34..c8569243fdbb6673d7808a9cae12d08e4d81a947 100644 +index 439572173999364b3ad9f5c89a1209773c51302b..7be94e57dc2d665719e7dedfea790f0019a47310 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2020,6 +2020,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2022,6 +2022,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param affects Whether the player can affect mob spawning */ public void setAffectsSpawning(boolean affects); diff --git a/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index f6e53262da..a1730d3171 100644 --- a/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -76,7 +76,7 @@ index b6ff3a80fcb5c0e843caa1cfdb165cf2cadb8bd2..f24bb5b22975bcbdce1bf1e80cf7a1b3 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index c8569243fdbb6673d7808a9cae12d08e4d81a947..a08f7f055e450b5f4d79e62bdd6d076f38703e95 100644 +index 7be94e57dc2d665719e7dedfea790f0019a47310..67143a8ab7c18676054f5584dd2fd764a78c7836 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -872,6 +872,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0025-Player-Tab-List-and-Title-APIs.patch b/patches/api/0025-Player-Tab-List-and-Title-APIs.patch index b2bd7f7ba3..ffef8d0551 100644 --- a/patches/api/0025-Player-Tab-List-and-Title-APIs.patch +++ b/patches/api/0025-Player-Tab-List-and-Title-APIs.patch @@ -432,7 +432,7 @@ index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb90 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index a08f7f055e450b5f4d79e62bdd6d076f38703e95..6e40bc2a4e768d49d57998146e2d2cd8f0a32a95 100644 +index 67143a8ab7c18676054f5584dd2fd764a78c7836..87770881b17df45ff79fd8e26b78afec583eace0 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -906,6 +906,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0027-Complete-resource-pack-API.patch b/patches/api/0027-Complete-resource-pack-API.patch index 8f932688d6..d10c5d2ce4 100644 --- a/patches/api/0027-Complete-resource-pack-API.patch +++ b/patches/api/0027-Complete-resource-pack-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 6e40bc2a4e768d49d57998146e2d2cd8f0a32a95..2bac5662dc227e89ca74f8504bc30dc757618da5 100644 +index 87770881b17df45ff79fd8e26b78afec583eace0..b23e53ff71b50fcbadcb6c4e537a3e8f2164a692 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1484,7 +1484,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1486,7 +1486,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException Thrown if the URL is null. * @throws IllegalArgumentException Thrown if the URL is too long. The * length restriction is an implementation specific arbitrary value. @@ -18,7 +18,7 @@ index 6e40bc2a4e768d49d57998146e2d2cd8f0a32a95..2bac5662dc227e89ca74f8504bc30dc7 public void setResourcePack(@NotNull String url); /** -@@ -2310,6 +2312,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2312,6 +2314,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM default net.kyori.adventure.text.event.HoverEvent asHoverEvent(final @NotNull java.util.function.UnaryOperator op) { return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName()))); } diff --git a/patches/api/0046-Add-String-based-Action-Bar-API.patch b/patches/api/0046-Add-String-based-Action-Bar-API.patch index 649256226c..a58399bb4e 100644 --- a/patches/api/0046-Add-String-based-Action-Bar-API.patch +++ b/patches/api/0046-Add-String-based-Action-Bar-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add String based Action Bar API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 2bac5662dc227e89ca74f8504bc30dc757618da5..a30692c9128eca4d7a317e5fcc1c830e9cc239a7 100644 +index b23e53ff71b50fcbadcb6c4e537a3e8f2164a692..ef8980a8a0f24f31d1e8e2cd80dcc2785e739896 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -873,6 +873,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0055-Fix-upstream-javadocs.patch b/patches/api/0055-Fix-upstream-javadocs.patch index d4e66873e4..21bdfe51d9 100644 --- a/patches/api/0055-Fix-upstream-javadocs.patch +++ b/patches/api/0055-Fix-upstream-javadocs.patch @@ -414,7 +414,7 @@ index ae9eaaa8e38e1d9dfc459926c7fc51ddb89de84a..b2ec535bb1b0ce0c114ddd7638b90218 @Override public int getConversionTime(); diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index a30692c9128eca4d7a317e5fcc1c830e9cc239a7..530315d757f330b22cf6fd41e3609608cb242b6e 100644 +index ef8980a8a0f24f31d1e8e2cd80dcc2785e739896..8578a0d8ee622e0208563630b5b275726733716d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -313,15 +313,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -455,7 +455,7 @@ index a30692c9128eca4d7a317e5fcc1c830e9cc239a7..530315d757f330b22cf6fd41e3609608 * @param message The message to send * @deprecated use {@link #sendActionBar(net.kyori.adventure.text.Component)} */ -@@ -1354,7 +1354,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1356,7 +1356,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Allows this player to see a player that was previously hidden. If @@ -464,7 +464,7 @@ index a30692c9128eca4d7a317e5fcc1c830e9cc239a7..530315d757f330b22cf6fd41e3609608 * remain hidden until the other plugin calls this method too. * * @param plugin Plugin that wants to show the player -@@ -1383,7 +1383,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1385,7 +1385,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Allows this player to see an entity that was previously hidden. If diff --git a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch index ff6aa81254..8279746f20 100644 --- a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/build.gradle.kts b/build.gradle.kts -index 6c42827db10fb2fb4dede44cba84e7989c1a6fdc..7d6239855a84502de4eb3328b0dcf12ac671dce4 100644 +index 6d4493850bdb0ec72d480ec60bc5ffef540470d7..7cdc47292a33b303eca4601746cdb1705e9ec20e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,6 +42,8 @@ dependencies { diff --git a/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch index c2a2be9b39..6881401bcf 100644 --- a/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch +++ b/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch @@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b + +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 530315d757f330b22cf6fd41e3609608cb242b6e..47cf629a4d75f9c8b8502ff9f7898eebcf4e6762 100644 +index 8578a0d8ee622e0208563630b5b275726733716d..ca00c4383095de385f25a7ea311b48eb018642c3 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -42,7 +42,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch index e8ea0ae716..8b98fdc1ce 100644 --- a/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch +++ b/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch @@ -10,10 +10,10 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 47cf629a4d75f9c8b8502ff9f7898eebcf4e6762..1323badb5073735155e38751d954a51448f8e47e 100644 +index ca00c4383095de385f25a7ea311b48eb018642c3..e8ebbba8973e1ea01366b7a6fee71163db7b39b7 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1197,6 +1197,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1199,6 +1199,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void resetPlayerWeather(); @@ -29,7 +29,7 @@ index 47cf629a4d75f9c8b8502ff9f7898eebcf4e6762..1323badb5073735155e38751d954a514 /** * Gets the player's cooldown between picking up experience orbs. * -@@ -1222,8 +1231,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1224,8 +1233,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Gives the player the amount of experience specified. * * @param amount Exp amount to give diff --git a/patches/api/0091-Player.setPlayerProfile-API.patch b/patches/api/0091-Player.setPlayerProfile-API.patch index f6f0951664..27907fce3a 100644 --- a/patches/api/0091-Player.setPlayerProfile-API.patch +++ b/patches/api/0091-Player.setPlayerProfile-API.patch @@ -93,10 +93,10 @@ index 7f6400c58530d4827c197f3d1fbabfa34554010f..e4c85e67713c5ed4b8b1fcc3c4231327 /** diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 1323badb5073735155e38751d954a51448f8e47e..bcd059b4e52443431e6445d70b9f6a13761d96ad 100644 +index e8ebbba8973e1ea01366b7a6fee71163db7b39b7..1879756c8dc3fa86e2aa2f223eee03b5fe2380eb 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2486,6 +2486,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2488,6 +2488,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED} */ boolean hasResourcePack(); diff --git a/patches/api/0094-Add-openSign-method-to-HumanEntity.patch b/patches/api/0094-Add-openSign-method-to-HumanEntity.patch index 1e11a6b092..3ca07efce8 100644 --- a/patches/api/0094-Add-openSign-method-to-HumanEntity.patch +++ b/patches/api/0094-Add-openSign-method-to-HumanEntity.patch @@ -24,10 +24,10 @@ index abdca9fe5acc90f167219eb769ece66c35682bb1..9715a9d36187e2eecfeab1a05087d27c /** * Make the entity drop the item in their hand. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index bcd059b4e52443431e6445d70b9f6a13761d96ad..7509c7654df9f020686ee4a3d84d3380a540f9e2 100644 +index 1879756c8dc3fa86e2aa2f223eee03b5fe2380eb..20f0803c8712f31d47be2bc6aee74d8b90b429a7 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2331,7 +2331,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2333,7 +2333,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Open a Sign for editing by the Player. * diff --git a/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch index aae828e542..f0301872cd 100644 --- a/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch +++ b/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch @@ -74,7 +74,7 @@ index b1ded556a1ce4e1d3c873ab9d7f799b6edcc5118..6ab8f05be11f8101202d56bfebc7ec23 /** * Checks if this player is whitelisted or not diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 7509c7654df9f020686ee4a3d84d3380a540f9e2..f14212bbdc6a44509469cf985d3105041b6aafaa 100644 +index 20f0803c8712f31d47be2bc6aee74d8b90b429a7..a7d51c17c5c45d0deaee156ad44092eec271f01a 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -873,6 +873,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch index c6c2d720f3..5debbc86c7 100644 --- a/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch +++ b/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index f14212bbdc6a44509469cf985d3105041b6aafaa..71cd103ba699a6f7af5bdbbd2079991e4a2b4655 100644 +index a7d51c17c5c45d0deaee156ad44092eec271f01a..818ed56eb2c81bc93a6b866a0754870c2f37882d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2656,6 +2656,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2658,6 +2658,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param profile The new profile to use */ void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile); diff --git a/patches/api/0189-Add-Player-Client-Options-API.patch b/patches/api/0189-Add-Player-Client-Options-API.patch index 8c3102617d..8da1177bbd 100644 --- a/patches/api/0189-Add-Player-Client-Options-API.patch +++ b/patches/api/0189-Add-Player-Client-Options-API.patch @@ -229,10 +229,10 @@ index 0000000000000000000000000000000000000000..cf67dc7d465223710adbf2b798109f52 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 71cd103ba699a6f7af5bdbbd2079991e4a2b4655..8a011236b128fa52a0453b492eeb809f2fa77def 100644 +index 818ed56eb2c81bc93a6b866a0754870c2f37882d..7bf29927935ad4df16b89cc9db8605fb948f2511 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2676,6 +2676,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2678,6 +2678,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Reset the cooldown counter to 0, effectively starting the cooldown period. */ void resetCooldown(); diff --git a/patches/api/0206-Brand-support.patch b/patches/api/0206-Brand-support.patch index 7e3d714402..d6e32d871f 100644 --- a/patches/api/0206-Brand-support.patch +++ b/patches/api/0206-Brand-support.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Brand support diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 8a011236b128fa52a0453b492eeb809f2fa77def..712d391f4ce3ac5fd6293629ecd4e74e0d049b3a 100644 +index 7bf29927935ad4df16b89cc9db8605fb948f2511..df894504d4fd31186f44424b6a03fc17dd418690 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2808,6 +2808,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2787,6 +2787,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM // Paper end } diff --git a/patches/api/0218-Player-elytra-boost-API.patch b/patches/api/0218-Player-elytra-boost-API.patch index 4a519deb98..cef6551839 100644 --- a/patches/api/0218-Player-elytra-boost-API.patch +++ b/patches/api/0218-Player-elytra-boost-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player elytra boost API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 712d391f4ce3ac5fd6293629ecd4e74e0d049b3a..6d95bc0e7409e47b17f74eef9c0e0861a8834e51 100644 +index df894504d4fd31186f44424b6a03fc17dd418690..c7654e950d5a35dfae44dd7648cd6fe34048cc0e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2682,6 +2682,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2684,6 +2684,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ @NotNull T getClientOption(@NotNull com.destroystokyo.paper.ClientOption option); diff --git a/patches/api/0245-Add-sendOpLevel-API.patch b/patches/api/0245-Add-sendOpLevel-API.patch index 09029d2d76..35c865d54f 100644 --- a/patches/api/0245-Add-sendOpLevel-API.patch +++ b/patches/api/0245-Add-sendOpLevel-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 6d95bc0e7409e47b17f74eef9c0e0861a8834e51..f04ce165d18726aff8948fade18addae707fa747 100644 +index c7654e950d5a35dfae44dd7648cd6fe34048cc0e..3ee171a4dc48f6ed6cb5b672feeb2793f5ac598f 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2695,6 +2695,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2697,6 +2697,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ @Nullable Firework boostElytra(@NotNull ItemStack firework); diff --git a/patches/api/0293-Add-PlayerKickEvent-causes.patch b/patches/api/0293-Add-PlayerKickEvent-causes.patch index 19e92f5795..871c9967fc 100644 --- a/patches/api/0293-Add-PlayerKickEvent-causes.patch +++ b/patches/api/0293-Add-PlayerKickEvent-causes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index f04ce165d18726aff8948fade18addae707fa747..69cac7bcf53c968c00bffae7ae2a04600c9d5d18 100644 +index 3ee171a4dc48f6ed6cb5b672feeb2793f5ac598f..65188c33dbd1aa98c156495f8d0a0fc10062304c 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -252,6 +252,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0328-Add-player-health-update-API.patch b/patches/api/0328-Add-player-health-update-API.patch index 8316e6ed25..e3e31dd42b 100644 --- a/patches/api/0328-Add-player-health-update-API.patch +++ b/patches/api/0328-Add-player-health-update-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add player health update API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 69cac7bcf53c968c00bffae7ae2a04600c9d5d18..388af21e1dedbd08cb87aedb4fa9fffbbddedfaa 100644 +index 65188c33dbd1aa98c156495f8d0a0fc10062304c..cdd5e4adcd95c42d663089b527ca14ec2619a7ea 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2073,6 +2073,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2075,6 +2075,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public double getHealthScale(); diff --git a/patches/api/0343-Multi-Block-Change-API.patch b/patches/api/0343-Multi-Block-Change-API.patch index 52f4ffdece..7019e388f7 100644 --- a/patches/api/0343-Multi-Block-Change-API.patch +++ b/patches/api/0343-Multi-Block-Change-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Multi Block Change API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 388af21e1dedbd08cb87aedb4fa9fffbbddedfaa..5b2d4d394f14a1952e4da349cd091a98561cf280 100644 +index cdd5e4adcd95c42d663089b527ca14ec2619a7ea..56c291108b0cf9adeb81d87ab4310a48c785b776 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -672,6 +672,27 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0371-More-Teleport-API.patch b/patches/api/0371-More-Teleport-API.patch index e57ec2eaec..9eab7bc7a8 100644 --- a/patches/api/0371-More-Teleport-API.patch +++ b/patches/api/0371-More-Teleport-API.patch @@ -165,10 +165,10 @@ index ab0ceaba9ddcbe20a8b8a1fc3ed19cb3c64ecd3d..97f0bc6573c8ba09de77061b6312b91c * Teleports this entity to the given location. If this entity is riding a * vehicle, it will be dismounted prior to teleportation. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 5b2d4d394f14a1952e4da349cd091a98561cf280..17c2136e2b58c5f8bd45005688239f74dd474b60 100644 +index 56c291108b0cf9adeb81d87ab4310a48c785b776..643e0d4ad70f847c6b97ac6d1bb6fe67cc85ce2f 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2896,6 +2896,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2875,6 +2875,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM String getClientBrandName(); // Paper end diff --git a/patches/api/0373-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0373-Custom-Chat-Completion-Suggestions-API.patch index adc3071594..ed8a8a26f9 100644 --- a/patches/api/0373-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/api/0373-Custom-Chat-Completion-Suggestions-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 17c2136e2b58c5f8bd45005688239f74dd474b60..dbd27bbb4fb6ac1b7054808159338054ff1b9a05 100644 +index 643e0d4ad70f847c6b97ac6d1bb6fe67cc85ce2f..b9e1d6e579de10b2ce72fd913f4e123a22ac5e7f 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2760,6 +2760,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2762,6 +2762,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException If the level is negative or greater than {@code 4} (i.e. not within {@code [0, 4]}). */ void sendOpLevel(byte level); diff --git a/patches/api/0383-Elder-Guardian-appearance-API.patch b/patches/api/0383-Elder-Guardian-appearance-API.patch index cc6ca0b4b4..91ed6ce360 100644 --- a/patches/api/0383-Elder-Guardian-appearance-API.patch +++ b/patches/api/0383-Elder-Guardian-appearance-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Elder Guardian appearance API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index dbd27bbb4fb6ac1b7054808159338054ff1b9a05..9f196a6cec6c03f05e06b2e148cc5417a02ec98d 100644 +index b9e1d6e579de10b2ce72fd913f4e123a22ac5e7f..125aa48bd1eacf297a80319566cef31968c4bd4a 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2958,6 +2958,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2937,6 +2937,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM void lookAt(@NotNull org.bukkit.entity.Entity entity, @NotNull io.papermc.paper.entity.LookAnchor playerAnchor, @NotNull io.papermc.paper.entity.LookAnchor entityAnchor); // Paper end - Teleport API diff --git a/patches/api/0391-Add-Player-Warden-Warning-API.patch b/patches/api/0391-Add-Player-Warden-Warning-API.patch index a136ed4dae..8d7e250b3f 100644 --- a/patches/api/0391-Add-Player-Warden-Warning-API.patch +++ b/patches/api/0391-Add-Player-Warden-Warning-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Player Warden Warning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9f196a6cec6c03f05e06b2e148cc5417a02ec98d..cb601a1558189e015a0447e1265bd8261cdf1d3f 100644 +index 125aa48bd1eacf297a80319566cef31968c4bd4a..28421ff3d325314aac973bb5ac0e236c014a9779 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2974,6 +2974,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2953,6 +2953,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param silent whether sound should be silenced */ void showElderGuardian(boolean silent); diff --git a/patches/api/0399-fix-Instruments.patch b/patches/api/0399-fix-Instruments.patch index 6c1d815b5b..8bee77863f 100644 --- a/patches/api/0399-fix-Instruments.patch +++ b/patches/api/0399-fix-Instruments.patch @@ -98,7 +98,7 @@ index de976be7132d05506fde7a839cac3954b0dd8da4..642feb8b4578e6dbd2bf78d859283d20 public static Instrument getByType(final byte type) { return BY_DATA.get(type); diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index cb601a1558189e015a0447e1265bd8261cdf1d3f..d29df91c63ea83ee2e26bf1ba7639927eda19318 100644 +index 28421ff3d325314aac973bb5ac0e236c014a9779..51e2c719f8545fdb91c551ad3cc3ed32104c3a76 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -393,9 +393,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0401-Add-Sneaking-API-for-Entities.patch b/patches/api/0401-Add-Sneaking-API-for-Entities.patch index ce44f889a6..1594709a27 100644 --- a/patches/api/0401-Add-Sneaking-API-for-Entities.patch +++ b/patches/api/0401-Add-Sneaking-API-for-Entities.patch @@ -35,7 +35,7 @@ index 3f3ea5bb6b3ea6f55b5cd699f1c01ac159619add..a2a423d4e4c2702ba5967223cab0432d * Get the category of spawn to which this entity belongs. * diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index d29df91c63ea83ee2e26bf1ba7639927eda19318..63558eb98a970c4a59ae78daba9d6c9a61965797 100644 +index 51e2c719f8545fdb91c551ad3cc3ed32104c3a76..91624e1ff22741beaff4e6b1f29a344f996dd53d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -296,6 +296,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0404-Flying-Fall-Damage-API.patch b/patches/api/0404-Flying-Fall-Damage-API.patch index dfbeb96208..4ae74b1f2a 100644 --- a/patches/api/0404-Flying-Fall-Damage-API.patch +++ b/patches/api/0404-Flying-Fall-Damage-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 63558eb98a970c4a59ae78daba9d6c9a61965797..b0f863b34ba169a09df2a80beef6583b0bebe1e9 100644 +index 91624e1ff22741beaff4e6b1f29a344f996dd53d..4305e22893575992a22cba5ca997cceffcec40cb 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1532,6 +1532,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1534,6 +1534,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void setAllowFlight(boolean flight); diff --git a/patches/api/0407-Win-Screen-API.patch b/patches/api/0407-Win-Screen-API.patch index d6db6a7502..ef90e6464e 100644 --- a/patches/api/0407-Win-Screen-API.patch +++ b/patches/api/0407-Win-Screen-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Win Screen API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index b0f863b34ba169a09df2a80beef6583b0bebe1e9..def31cdbe5765f5d05386753868e51c424cbfe9e 100644 +index 4305e22893575992a22cba5ca997cceffcec40cb..7a68c0d152fc0a5092412a5843ff6d1869cf6c17 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -901,6 +901,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index ec77b27ddd..f399f66b1d 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -171,7 +171,7 @@ index 0000000000000000000000000000000000000000..b663ef66dfe3f19a58f265de866d002d +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index e1dfaf1e4cbe0ad18ba41c5eb5e465de0529090a..0000000000000000000000000000000000000000 +index 53123c08cf84a56fdc21929f3006829ea362a31c..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null @@ -1,587 +0,0 @@ @@ -578,7 +578,7 @@ index e1dfaf1e4cbe0ad18ba41c5eb5e465de0529090a..00000000000000000000000000000000 - - net.md-5 - specialsource-maven-plugin -- 1.2.5 +- 1.2.4 - - - package diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch index 377111c6a8..07be511340 100644 --- a/patches/server/0009-MC-Utils.patch +++ b/patches/server/0009-MC-Utils.patch @@ -6689,7 +6689,7 @@ index a0b5895abc88d297045e05f25bb09527991d43f0..6e0bd0eab0b06a4ac3042496bbb91292 super(type, world); this.xpReward = 5; diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 3aa6636aec62b031e2449db7b1b844d2ee5e9a8d..70e663baefe90c06eca2033f07e7e85c6f27c97f 100644 +index 6375dfa336d232c7876e184690a1cb5c9bc2c495..2e948330c4951e3df7091fa870573f163d2af286 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -788,6 +788,25 @@ public final class ItemStack { @@ -7290,7 +7290,7 @@ index 25156be63f91a1c41ef41154f675d04eb97459a8..47bab513feec217d875192afef61f3af return false; } else { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e729db7818024842925dcf28cca063098a393984..c8a035d396a56e3f4c437c5524e8e67a946b1674 100644 +index 46d6f5b9f31e15ab286df344bc436b2762d329e5..29ef66be12ec2a2765a76eb3d419c337846c75ac 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -243,8 +243,8 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch index dad6285fd2..1ddd987ede 100644 --- a/patches/server/0010-Adventure.patch +++ b/patches/server/0010-Adventure.patch @@ -2793,37 +2793,35 @@ index 4c62df5a3781ec9df4a5c5f1b528649e6e8a62d1..affd1b8c7589ba59330dc0b6fc803cce } diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -index 8e35fecb84fb9ed61cb31d218f8a21bb7cabeb48..584feb744bd2aa34f788de17d43c16a04c33a2c6 100644 +index f18a05566b8bbb1f481dcee0d2c53ddda68dae9e..a778d53bba0f9678a47ce6c3d94449ae7cd1c527 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -@@ -208,20 +208,22 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C +@@ -211,19 +211,20 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C - // CraftBukkit start - Player player1 = ((ServerPlayer) player).getBukkitEntity(); -- String[] lines = new String[4]; -+ // Paper start -+ List lines = new java.util.ArrayList<>(); + // CraftBukkit start + Player player = ((ServerPlayer) entityhuman).getBukkitEntity(); +- String[] lines = new String[4]; ++ List lines = new java.util.ArrayList<>(); // Paper - adventure - for (int j = 0; j < messages.size(); ++j) { -- lines[j] = CraftChatMessage.fromComponent(text.getMessage(j, player.isTextFilteringEnabled())); -+ lines.add(io.papermc.paper.adventure.PaperAdventure.asAdventure(text.getMessage(j, player.isTextFilteringEnabled()))); - } - - SignChangeEvent event = new SignChangeEvent(CraftBlock.at(this.level, this.worldPosition), player1, lines); - player.level().getCraftServer().getPluginManager().callEvent(event); - - if (!event.isCancelled()) { -- Component[] components = org.bukkit.craftbukkit.block.CraftSign.sanitizeLines(event.getLines()); -- for (int j = 0; j < components.length; j++) { -- text = text.setMessage(j, components[j]); -+ // Paper start -+ for (int j = 0; j < 4; j++) { -+ text = text.setMessage(j, io.papermc.paper.adventure.PaperAdventure.asVanilla(lines.get(j))); - } -+ // Paper end - } - // CraftBukkit end + for (int j = 0; j < list.size(); ++j) { +- lines[j] = CraftChatMessage.fromComponent(signtext.getMessage(j, entityhuman.isTextFilteringEnabled())); ++ lines.add(io.papermc.paper.adventure.PaperAdventure.asAdventure(signtext.getMessage(j, entityhuman.isTextFilteringEnabled()))); // Paper - adventure } + + SignChangeEvent event = new SignChangeEvent(CraftBlock.at(this.level, this.worldPosition), player, lines, (front) ? Side.FRONT : Side.BACK); + entityhuman.level().getCraftServer().getPluginManager().callEvent(event); + + if (!event.isCancelled()) { +- Component[] components = org.bukkit.craftbukkit.block.CraftSign.sanitizeLines(event.getLines()); +- for (int j = 0; j < components.length; j++) { +- signtext = signtext.setMessage(j, components[j]); ++ // Paper start - adventure ++ for (int j = 0; j < 4; j++) { ++ signtext = signtext.setMessage(j, io.papermc.paper.adventure.PaperAdventure.asVanilla(lines.get(j))); ++ // Paper end - adventure + } + } else { + signtext = originalText; diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java index 614e567eb1ef10ac7514909a8425e29ac3627d3d..60596c4ac2ebb8caf19d65591624275ba63b0199 100644 --- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java @@ -3026,7 +3024,7 @@ index 9874d0d3ae16e79f2598d9c1f93a9b7cc40f56b0..7d95f4e919f46fd415a3cf88b1bb7c16 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index c8a035d396a56e3f4c437c5524e8e67a946b1674..1440b6b8b71ece71b076601752b06bdcff45542f 100644 +index 29ef66be12ec2a2765a76eb3d419c337846c75ac..711dbf6e5cf9b4ffabaab2bcf10f13711683a61e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -153,6 +153,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -3207,7 +3205,7 @@ index 0beb96dc896f63003e1b1ae458b73902bdbe648a..102eb86bad3000f258775ac06ecd1a6d public String getCustomName() { EnchantmentTableBlockEntity enchant = this.getSnapshot(); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java -index 0d5ea9d065f0b471a97b84ffc80fadc9e7953d04..1a49daed4fe43d4513561e03937374c312d09efb 100644 +index b22009c0b068f1bc2c59861c4be593ea764248c6..cc6aab5341365f9b4ec3cb23e2a4f5006aa75cd7 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java @@ -25,6 +25,23 @@ public class CraftSign extends CraftBlockEntityState< @@ -3234,8 +3232,8 @@ index 0d5ea9d065f0b471a97b84ffc80fadc9e7953d04..1a49daed4fe43d4513561e03937374c3 @Override public String[] getLines() { return this.front.getLines(); -@@ -103,6 +120,20 @@ public class CraftSign extends CraftBlockEntityState< - ((CraftPlayer) player).getHandle().openTextEdit(handle, true); +@@ -104,6 +121,20 @@ public class CraftSign extends CraftBlockEntityState< + ((CraftPlayer) player).getHandle().openTextEdit(handle, Side.FRONT == side); } + // Paper start @@ -3256,7 +3254,7 @@ index 0d5ea9d065f0b471a97b84ffc80fadc9e7953d04..1a49daed4fe43d4513561e03937374c3 Component[] components = new Component[4]; diff --git a/src/main/java/org/bukkit/craftbukkit/block/sign/CraftSignSide.java b/src/main/java/org/bukkit/craftbukkit/block/sign/CraftSignSide.java -index d9cc425919d3c07607e36557a5b109e0212483c7..0c3716e5e91a9791b28f4d308d99dbac90e7f34b 100644 +index 43f6ac44525048faf0b0cd2c11f9bc36fa0cab5d..1317cdd48c1c27c9e5152da5403237b1bb15ac52 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/sign/CraftSignSide.java +++ b/src/main/java/org/bukkit/craftbukkit/block/sign/CraftSignSide.java @@ -12,37 +12,69 @@ import org.jetbrains.annotations.Nullable; @@ -3269,7 +3267,7 @@ index d9cc425919d3c07607e36557a5b109e0212483c7..0c3716e5e91a9791b28f4d308d99dbac + private java.util.ArrayList originalLines = null; // ArrayList for RandomAccess + private java.util.ArrayList lines = null; // ArrayList for RandomAccess + // Paper end - private final SignText signText; + private SignText signText; public CraftSignSide(SignText signText) { this.signText = signText; @@ -3344,7 +3342,7 @@ index d9cc425919d3c07607e36557a5b109e0212483c7..0c3716e5e91a9791b28f4d308d99dbac @Override @@ -68,13 +100,16 @@ public class CraftSignSide implements SignSide { - public void applyLegacyStringToSignSide() { + public SignText applyLegacyStringToSignSide() { if (this.lines != null) { - for (int i = 0; i < lines.length; i++) { - String line = (this.lines[i] == null) ? "" : this.lines[i]; @@ -3356,13 +3354,13 @@ index d9cc425919d3c07607e36557a5b109e0212483c7..0c3716e5e91a9791b28f4d308d99dbac + if (component.equals(origComp)) { continue; // The line contents are still the same, skip. } -- this.signText.setMessage(i, CraftChatMessage.fromString(line)[0]); -+ this.signText.setMessage(i, io.papermc.paper.adventure.PaperAdventure.asVanilla(component)); +- this.signText = this.signText.setMessage(i, CraftChatMessage.fromString(line)[0]); ++ this.signText = this.signText.setMessage(i, io.papermc.paper.adventure.PaperAdventure.asVanilla(component)); } + // Paper end } - } - } + + return this.signText; diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftBlockCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/CraftBlockCommandSender.java index 3de88112bdb08d6bd0d28f20582c4090bfd8dbfe..87f2cea36d852c81fdb0a1bc21162d41377ab2e7 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftBlockCommandSender.java @@ -3616,7 +3614,7 @@ index 446fdca49a5a6999626a7ee3a1d5c168b15a09dd..f9863e138994f6c7a7975a852f106faa public boolean isOp() { return true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a3a8c94b576c917428ac5c8fcab3f75b6e28880b..8beafda74a1e1c274906ba91a6f93ac8b5c85437 100644 +index 242b6cb2ac775b4fc687a5a62011b53ab7bde7f6..d1e6cfe6009a31e109b4061ac3cba48947404f44 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -285,14 +285,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -4513,10 +4511,10 @@ index 507fa96a3fb904b74429df5756c9a6378ec8c5b7..abb9e88abc74135284b941e040d40586 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 3b62ffe4f531e62da9e49050a0b944d8887f43f2..7500684057dca1bfe615e64da55ef521abb4ed9a 100644 +index 5fab8014b0ae3d56610aeaaa21a8c1ba6f7f1bfd..16dd61b832d7b6519786072e41cdde9df3ab8e7f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -@@ -749,6 +749,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -750,6 +750,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { return !(this.hasDisplayName() || this.hasLocalizedName() || this.hasEnchants() || (this.lore != null) || this.hasCustomModelData() || this.hasBlockData() || this.hasRepairCost() || !this.unhandledTags.isEmpty() || !this.persistentDataContainer.isEmpty() || this.hideFlag != 0 || this.isUnbreakable() || this.hasDamage() || this.hasAttributeModifiers()); } @@ -4535,7 +4533,7 @@ index 3b62ffe4f531e62da9e49050a0b944d8887f43f2..7500684057dca1bfe615e64da55ef521 @Override public String getDisplayName() { return CraftChatMessage.fromJSONComponent(displayName); -@@ -784,6 +796,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -785,6 +797,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { return this.lore != null && !this.lore.isEmpty(); } diff --git a/patches/server/0014-Timings-v2.patch b/patches/server/0014-Timings-v2.patch index 00646a8250..a775ec1d36 100644 --- a/patches/server/0014-Timings-v2.patch +++ b/patches/server/0014-Timings-v2.patch @@ -1846,10 +1846,10 @@ index b0ffa23faf62629043dfd613315eaf9c5fcc2cfe..00000000000000000000000000000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8beafda74a1e1c274906ba91a6f93ac8b5c85437..5afdada0d56c2f9af431ea6485faa277229befa9 100644 +index d1e6cfe6009a31e109b4061ac3cba48947404f44..11aebe27875a30dfc6bd82d486d0d79bfe2e77a1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2522,6 +2522,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2512,6 +2512,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { CraftPlayer.this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundSystemChatPacket(components, position == net.md_5.bungee.api.ChatMessageType.ACTION_BAR)); } diff --git a/patches/server/0019-Rewrite-chunk-system.patch b/patches/server/0019-Rewrite-chunk-system.patch index 37fac792c1..a51942bebb 100644 --- a/patches/server/0019-Rewrite-chunk-system.patch +++ b/patches/server/0019-Rewrite-chunk-system.patch @@ -19291,7 +19291,7 @@ index d87f02c748fe2e5b4ea251f6691e8907a152cb6d..5988c0847af4e8f0094328e91f736f25 + // Paper end } diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -index 8bb14230beb4b012f38997eec70934b96bae4db5..5ca3987683f7cecbce24bac434dc387bb5e9bf08 100644 +index f739a175e26f250c652c73b8985158fe37c2823a..a70b68cdff1e5a793b8b3a214cb8ea0ed3ff2e4b 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java @@ -114,7 +114,7 @@ public abstract class ChunkGenerator { @@ -20559,7 +20559,7 @@ index 7912cf0e4cab7d6c99106d43b2cdc4f4e80aebac..0a4b2529034b85609b2f8d3f3f633e8f // Paper start diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1440b6b8b71ece71b076601752b06bdcff45542f..7c4d43096031a3c93d5f835922b19d5643005128 100644 +index 711dbf6e5cf9b4ffabaab2bcf10f13711683a61e..7b6673c18d77dc03038924008775f73bf8261658 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -323,10 +323,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -20678,7 +20678,7 @@ index 1440b6b8b71ece71b076601752b06bdcff45542f..7c4d43096031a3c93d5f835922b19d56 // Spigot start private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5afdada0d56c2f9af431ea6485faa277229befa9..976eadd8200b2f4811d57b3c7fbd68cff1333924 100644 +index 11aebe27875a30dfc6bd82d486d0d79bfe2e77a1..977011bd42a5b2ffe4cd6567c058860a7f3fd48b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -184,6 +184,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0030-Player-affects-spawning-API.patch b/patches/server/0030-Player-affects-spawning-API.patch index 7d0d428149..d1da9f1a88 100644 --- a/patches/server/0030-Player-affects-spawning-API.patch +++ b/patches/server/0030-Player-affects-spawning-API.patch @@ -137,7 +137,7 @@ index be6e3e21ad62da01e5e2dd78e300cbc8efdbeb42..ea98625fe7c00743b8df74a24e6d4b75 for(Player player : this.players()) { if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 976eadd8200b2f4811d57b3c7fbd68cff1333924..dd65045f52da395bd3d106065b7390d3925bf96f 100644 +index 977011bd42a5b2ffe4cd6567c058860a7f3fd48b..5a013bb490b4948efd12dc2a52c4bed43508ceb8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2211,8 +2211,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0032-Only-refresh-abilities-if-needed.patch b/patches/server/0032-Only-refresh-abilities-if-needed.patch index 7f830477f3..33487acc93 100644 --- a/patches/server/0032-Only-refresh-abilities-if-needed.patch +++ b/patches/server/0032-Only-refresh-abilities-if-needed.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Only refresh abilities if needed diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index dd65045f52da395bd3d106065b7390d3925bf96f..65d13b47b3af69e2256f7000b4634e8c688e22d8 100644 +index 5a013bb490b4948efd12dc2a52c4bed43508ceb8..9255127fdf9cad0f44002064d0a28bcfe59f6a0a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1880,12 +1880,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch index a183a7578b..39a5e23d2f 100644 --- a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch +++ b/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch @@ -30,7 +30,7 @@ index e42c07dfba3c18464f1f8e35fbd764812d8c4e50..ee422a97a63749172f9f9643513ae9ab this.locale = packet.language; // Paper start diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 65d13b47b3af69e2256f7000b4634e8c688e22d8..4061b68edb8f501eea71ba009214ac3808506ec7 100644 +index 9255127fdf9cad0f44002064d0a28bcfe59f6a0a..f18fa546bf9a045f7b10e8eb898339b2adf8d4a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2211,8 +2211,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0052-Ensure-commands-are-not-ran-async.patch b/patches/server/0052-Ensure-commands-are-not-ran-async.patch index 89cb357636..5269aa8eea 100644 --- a/patches/server/0052-Ensure-commands-are-not-ran-async.patch +++ b/patches/server/0052-Ensure-commands-are-not-ran-async.patch @@ -107,7 +107,7 @@ index fb6ea46609489d802ed4b76b4074734dd3e3886f..dd3935eeceba456b37a5fbcb874c1073 return true; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4061b68edb8f501eea71ba009214ac3808506ec7..37ffadacbfd49743dac8739b74def818a351e563 100644 +index f18fa546bf9a045f7b10e8eb898339b2adf8d4a0..15c6c3a6e9d4e371425604667af7cc2b24fae021 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -479,7 +479,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch b/patches/server/0056-Player-Tab-List-and-Title-APIs.patch index 7292c0742f..48800a1b12 100644 --- a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch +++ b/patches/server/0056-Player-Tab-List-and-Title-APIs.patch @@ -63,7 +63,7 @@ index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a4 // Paper end buf.writeComponent(this.text); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 37ffadacbfd49743dac8739b74def818a351e563..c6ceb5044e3dcf5f512dc1efc04e0785b1caadb0 100644 +index 15c6c3a6e9d4e371425604667af7cc2b24fae021..73dfea8999a0536e9319a9bfe8d5940dad760709 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch b/patches/server/0059-Configurable-inter-world-teleportation-safety.patch index 39510f02c9..b68e131508 100644 --- a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch +++ b/patches/server/0059-Configurable-inter-world-teleportation-safety.patch @@ -16,7 +16,7 @@ The wanted destination was on top of the emerald block however the player ended This only is the case if the player is teleporting between worlds. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c6ceb5044e3dcf5f512dc1efc04e0785b1caadb0..8f5d6d4ea4a8a7de95c755594ba5ec3fd3902158 100644 +index 73dfea8999a0536e9319a9bfe8d5940dad760709..2a7a7c5e1490c2922c01c5c397793aa03364bbaf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1182,7 +1182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0065-Complete-resource-pack-API.patch b/patches/server/0065-Complete-resource-pack-API.patch index 8e5c9d35e4..30a9942957 100644 --- a/patches/server/0065-Complete-resource-pack-API.patch +++ b/patches/server/0065-Complete-resource-pack-API.patch @@ -23,7 +23,7 @@ index ddd437906801973e11386294e7e3f6846cc11cbc..a91cc53f9d601bbc51988b2b7855c6eb @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8f5d6d4ea4a8a7de95c755594ba5ec3fd3902158..f6006f696550126d1ba78fdc49821e20cd19b1f3 100644 +index 2a7a7c5e1490c2922c01c5c397793aa03364bbaf..0fdc0ecbaeff775359fd192f4be7e20c8c1339f9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -178,6 +178,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch index d5e2ef652b..8e3b84a6df 100644 --- a/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch +++ b/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch @@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the ItemMeta API equivalents, and should deprecate the old API's. diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 70e663baefe90c06eca2033f07e7e85c6f27c97f..0db25566c47eb5b7e970dafea0ed186592fea38c 100644 +index 2e948330c4951e3df7091fa870573f163d2af286..4b19057fba6c6645dc79f6572a3fb01cb2c4c26c 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -156,6 +156,23 @@ public final class ItemStack { @@ -184,7 +184,7 @@ index ae55364f6c33687361c053d90ad47c6192a1e62b..bdfce4a49cc6fed46de5864d1c443038 static Map getEnchantments(net.minecraft.world.item.ItemStack item) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 7500684057dca1bfe615e64da55ef521abb4ed9a..0f8bb870925158199b216421feb328e5b0b55270 100644 +index 16dd61b832d7b6519786072e41cdde9df3ab8e7f..5d892f76f42486ce1890fe0507b19b2f02693fee 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableList; @@ -211,7 +211,7 @@ index 7500684057dca1bfe615e64da55ef521abb4ed9a..0f8bb870925158199b216421feb328e5 import java.util.logging.Level; import java.util.logging.Logger; import javax.annotation.Nonnull; -@@ -275,7 +278,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -276,7 +279,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { private List lore; // null and empty are two different states internally private Integer customModelData; private CompoundTag blockData; @@ -220,7 +220,7 @@ index 7500684057dca1bfe615e64da55ef521abb4ed9a..0f8bb870925158199b216421feb328e5 private Multimap attributeModifiers; private int repairCost; private int hideFlag; -@@ -286,7 +289,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -287,7 +290,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry(); private CompoundTag internalTag; @@ -229,7 +229,7 @@ index 7500684057dca1bfe615e64da55ef521abb4ed9a..0f8bb870925158199b216421feb328e5 private CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftMetaItem.DATA_TYPE_REGISTRY); private int version = CraftMagicNumbers.INSTANCE.getDataVersion(); // Internal use only -@@ -307,7 +310,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -308,7 +311,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { this.blockData = meta.blockData; if (meta.enchantments != null) { // Spigot @@ -238,7 +238,7 @@ index 7500684057dca1bfe615e64da55ef521abb4ed9a..0f8bb870925158199b216421feb328e5 } if (meta.hasAttributeModifiers()) { -@@ -390,13 +393,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -391,13 +394,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { } } @@ -254,7 +254,7 @@ index 7500684057dca1bfe615e64da55ef521abb4ed9a..0f8bb870925158199b216421feb328e5 for (int i = 0; i < ench.size(); i++) { String id = ((CompoundTag) ench.get(i)).getString(ENCHANTMENTS_ID.NBT); -@@ -549,13 +552,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -550,13 +553,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { } } @@ -270,7 +270,7 @@ index 7500684057dca1bfe615e64da55ef521abb4ed9a..0f8bb870925158199b216421feb328e5 for (Map.Entry entry : ench.entrySet()) { // Doctor older enchants String enchantKey = entry.getKey().toString(); -@@ -831,14 +834,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -832,14 +835,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { @Override public Map getEnchants() { @@ -287,7 +287,7 @@ index 7500684057dca1bfe615e64da55ef521abb4ed9a..0f8bb870925158199b216421feb328e5 } if (ignoreRestrictions || level >= ench.getStartLevel() && level <= ench.getMaxLevel()) { -@@ -1226,7 +1229,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1228,7 +1231,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { clone.customModelData = this.customModelData; clone.blockData = this.blockData; if (this.enchantments != null) { @@ -296,7 +296,7 @@ index 7500684057dca1bfe615e64da55ef521abb4ed9a..0f8bb870925158199b216421feb328e5 } if (this.hasAttributeModifiers()) { clone.attributeModifiers = LinkedHashMultimap.create(this.attributeModifiers); -@@ -1465,4 +1468,22 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1467,4 +1470,22 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { return CraftMetaItem.HANDLED_TAGS; } } diff --git a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch index de6a37eea2..3fc589185e 100644 --- a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -44,7 +44,7 @@ index 1238da8b035a0b0dd3d00557ca0de7a82f5fdf53..5e40ee2695b7ed50fddc0e8226f0b1b4 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f6006f696550126d1ba78fdc49821e20cd19b1f3..af7f97b605b81a0b2dd812f491b6e324660fe260 100644 +index 0fdc0ecbaeff775359fd192f4be7e20c8c1339f9..a47334fbef1056f644b588453666039f4daa3e33 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2138,6 +2138,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch index ebccf361c8..3b7f0e0fa4 100644 --- a/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch +++ b/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch @@ -34,7 +34,7 @@ index 52325a99ea38530ad69a39ac0215233139f35268..dd74e8a034022fe72a1652f92712182b return (double) pos.getMaxBlockX() > this.getMinX() && (double) pos.getMinBlockX() < this.getMaxX() && (double) pos.getMaxBlockZ() > this.getMinZ() && (double) pos.getMinBlockZ() < this.getMaxZ(); } diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -index 5ca3987683f7cecbce24bac434dc387bb5e9bf08..56033c41c2be567d6787420d319d4603fc0a1d10 100644 +index a70b68cdff1e5a793b8b3a214cb8ea0ed3ff2e4b..9347d321eaba21e0ef9662ebcacae64c19149e1d 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java @@ -217,6 +217,7 @@ public abstract class ChunkGenerator { diff --git a/patches/server/0120-String-based-Action-Bar-API.patch b/patches/server/0120-String-based-Action-Bar-API.patch index 9fdf744ebd..1f3b7876cf 100644 --- a/patches/server/0120-String-based-Action-Bar-API.patch +++ b/patches/server/0120-String-based-Action-Bar-API.patch @@ -26,7 +26,7 @@ index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad // Paper end buf.writeComponent(this.text); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index af7f97b605b81a0b2dd812f491b6e324660fe260..e1c8a559644d84a6787c44431e65d7eee4dfc29a 100644 +index a47334fbef1056f644b588453666039f4daa3e33..6de07ae1c6d2130eb7feef6f169a288d0fdfd77b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -331,6 +331,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch index 1003420918..169a5c7b52 100644 --- a/patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch @@ -20,7 +20,7 @@ index 0a419c98db5f6bb6935e88b640f74c6ec0c5503c..92aa1428e723b377c12bfd20cd1e6b42 private final List pendingBlockEntityTickers = Lists.newArrayList(); private boolean tickingBlockEntities; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 7c4d43096031a3c93d5f835922b19d5643005128..05cc2e071f621bc7067593d75ba3a5f0eb7650c4 100644 +index 7b6673c18d77dc03038924008775f73bf8261658..f7938024605e61cdeee5668190abbf336611f425 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -155,6 +155,56 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 5f5bb9679b..0f1eccb9a7 100644 --- a/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -145,15 +145,15 @@ index 323b3a561060eacaad37832f44d0cdb9e4a1a2dc..565d0349328b7ae5fcbdf1682dcedff9 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/world/entity/animal/Animal.java b/src/main/java/net/minecraft/world/entity/animal/Animal.java -index fb207550efc5a387ea3346664998882b89e5cdae..8b5e0b9624bdecc3e158d9fc4b2c78f526c6bdeb 100644 +index 18f560b8ea74b6b072264754708e9f67a178f99c..80598d4e679999138f6aca9f6f847e9509fa68da 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Animal.java +++ b/src/main/java/net/minecraft/world/entity/animal/Animal.java -@@ -264,7 +264,7 @@ public abstract class Animal extends AgeableMob { - if (world.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { +@@ -272,7 +272,7 @@ public abstract class Animal extends AgeableMob { + if (worldserver.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { // CraftBukkit start - use event experience if (experience > 0) { -- world.addFreshEntity(new ExperienceOrb(world, this.getX(), this.getY(), this.getZ(), experience)); -+ world.addFreshEntity(new ExperienceOrb(world, this.getX(), this.getY(), this.getZ(), experience, org.bukkit.entity.ExperienceOrb.SpawnReason.BREED, null)); // Paper //TODO trigger +- worldserver.addFreshEntity(new ExperienceOrb(worldserver, this.getX(), this.getY(), this.getZ(), experience)); ++ worldserver.addFreshEntity(new ExperienceOrb(worldserver, this.getX(), this.getY(), this.getZ(), experience, org.bukkit.entity.ExperienceOrb.SpawnReason.BREED, null)); // Paper //TODO trigger } // CraftBukkit end } diff --git a/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch index 70bfdb15f2..c50124bbc4 100644 --- a/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch +++ b/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch @@ -90,7 +90,7 @@ index 77d7f070cce1a47e41b5d4f5a1cc8c778352a126..a3b610cb1ed97a635677bc46ccdf0463 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e1c8a559644d84a6787c44431e65d7eee4dfc29a..46b486fb069eeed8ca30d2c2b3a6dca6ad9e26c5 100644 +index 6de07ae1c6d2130eb7feef6f169a288d0fdfd77b..bc920ff2bfcdb7ecad3b57ebca6d3ed94771a55a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -275,6 +275,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch index 7dded97619..8adaef1d34 100644 --- a/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch +++ b/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch @@ -14,7 +14,7 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 46b486fb069eeed8ca30d2c2b3a6dca6ad9e26c5..e87f6e4ecb23b2147af1419e6c40f96f8b38c0fc 100644 +index bc920ff2bfcdb7ecad3b57ebca6d3ed94771a55a..fd7e9909875961a1a7288f235ef73de518467f25 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1509,7 +1509,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0175-Add-ArmorStand-Item-Meta.patch b/patches/server/0175-Add-ArmorStand-Item-Meta.patch index 269523a382..3745b7372a 100644 --- a/patches/server/0175-Add-ArmorStand-Item-Meta.patch +++ b/patches/server/0175-Add-ArmorStand-Item-Meta.patch @@ -255,10 +255,10 @@ index 4017933f2244fca32cf9d39444f3a4f550e8af01..e721517ce7b52a1aa10d039aa9f309eb + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 0f8bb870925158199b216421feb328e5b0b55270..fb224f9049d023c44138720c9094283044d11220 100644 +index 5d892f76f42486ce1890fe0507b19b2f02693fee..134c91f69f5b532ed67428c097d93b38a83df01a 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -@@ -1458,6 +1458,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1460,6 +1460,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { CraftMetaCrossbow.CHARGED.NBT, CraftMetaCrossbow.CHARGED_PROJECTILES.NBT, CraftMetaSuspiciousStew.EFFECTS.NBT, diff --git a/patches/server/0182-Player.setPlayerProfile-API.patch b/patches/server/0182-Player.setPlayerProfile-API.patch index dec56f551e..afbe26ce74 100644 --- a/patches/server/0182-Player.setPlayerProfile-API.patch +++ b/patches/server/0182-Player.setPlayerProfile-API.patch @@ -55,7 +55,7 @@ index e7442952ef1f03969949014492a7ddc6d0796ba5..69a1852905dd4724c30ac8ab88c14251 public Server getServer() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e87f6e4ecb23b2147af1419e6c40f96f8b38c0fc..1fc7db9b32956c23a2e7c9fcd07aad93b5a6a024 100644 +index fd7e9909875961a1a7288f235ef73de518467f25..26e89e7c9d648b9b1ce33714da8503122f100a9f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -82,6 +82,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes; diff --git a/patches/server/0187-Flag-to-disable-the-channel-limit.patch b/patches/server/0187-Flag-to-disable-the-channel-limit.patch index 411c13ac6b..a46d383e60 100644 --- a/patches/server/0187-Flag-to-disable-the-channel-limit.patch +++ b/patches/server/0187-Flag-to-disable-the-channel-limit.patch @@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs. provide an optional flag to disable this check, at your own risk. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1fc7db9b32956c23a2e7c9fcd07aad93b5a6a024..baa4d605b15d89f15b7012720dc792d51493d5fb 100644 +index 26e89e7c9d648b9b1ce33714da8503122f100a9f..529812295ee99b4425ef95d0c5a972ba27c6f2b1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -182,6 +182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0188-Add-openSign-method-to-HumanEntity.patch b/patches/server/0188-Add-openSign-method-to-HumanEntity.patch index 61e273b325..1e67f7f8d2 100644 --- a/patches/server/0188-Add-openSign-method-to-HumanEntity.patch +++ b/patches/server/0188-Add-openSign-method-to-HumanEntity.patch @@ -5,24 +5,25 @@ Subject: [PATCH] Add openSign method to HumanEntity diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java -index 1a49daed4fe43d4513561e03937374c312d09efb..97028a14830384f06f4f1de36abfbc6bc1b90a19 100644 +index cc6aab5341365f9b4ec3cb23e2a4f5006aa75cd7..79d65cd38fea160cf8c3b4b8c32bb62740f18c9a 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java -@@ -110,14 +110,14 @@ public class CraftSign extends CraftBlockEntityState< +@@ -110,15 +110,15 @@ public class CraftSign extends CraftBlockEntityState< super.applyTo(sign); } -- public static void openSign(Sign sign, Player player) { -+ public static void openSign(Sign sign, org.bukkit.entity.HumanEntity player) { // Paper - change move open sign to HumanEntity +- public static void openSign(Sign sign, Player player, Side side) { ++ public static void openSign(Sign sign, org.bukkit.entity.HumanEntity player, Side side) { // Paper - change move open sign to HumanEntity Preconditions.checkArgument(sign != null, "sign == null"); + Preconditions.checkArgument(side != null, "side == null"); - Preconditions.checkArgument(sign.isPlaced(), "Sign must be placed"); + // Preconditions.checkArgument(sign.isPlaced(), "Sign must be placed"); // Paper - don't require placed Preconditions.checkArgument(sign.getWorld() == player.getWorld(), "Sign must be in same world as Player"); SignBlockEntity handle = ((CraftSign) sign).getTileEntity(); -- ((CraftPlayer) player).getHandle().openTextEdit(handle, true); -+ ((org.bukkit.craftbukkit.entity.CraftHumanEntity) player).getHandle().openTextEdit(handle, true); // Paper - change move open sign to HumanEntity +- ((CraftPlayer) player).getHandle().openTextEdit(handle, Side.FRONT == side); ++ ((org.bukkit.craftbukkit.entity.CraftHumanEntity) player).getHandle().openTextEdit(handle, Side.FRONT == side); // Paper - change move open sign to HumanEntity } // Paper start diff --git a/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch index e983e56e0f..479a9d9307 100644 --- a/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -34,7 +34,7 @@ index 317ba116e52c193fbd0a9cd853bc03ed640cc70f..68d32251091d103cb2d5afca8f446163 if (this.sendParticles(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 05cc2e071f621bc7067593d75ba3a5f0eb7650c4..bb2050bc39287a78f9b51a38b358ea4b5eff1e02 100644 +index f7938024605e61cdeee5668190abbf336611f425..fbbabae86ebca984c975b64a78a05354697b658f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1856,11 +1856,17 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index 4fc54451ea..dc608a7233 100644 --- a/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -4,19 +4,32 @@ Date: Thu, 26 Apr 2018 04:41:11 -0400 Subject: [PATCH] Fix exploit that allowed colored signs to be created +diff --git a/build.gradle.kts b/build.gradle.kts +index 967b675eb600282b881d966f95c9d3cde3edc4e8..97f1a5bafdd1f520fee5f31fda87b4c251aea33f 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -38,7 +38,7 @@ dependencies { + implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty + } + +-val craftbukkitPackageVersion = "1_19_R3" // Paper ++val craftbukkitPackageVersion = "1_20_R1" // Paper + tasks.jar { + archiveClassifier.set("dev") + diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -index 584feb744bd2aa34f788de17d43c16a04c33a2c6..13705a9e42c6ffc0e403de5fb56232845169d198 100644 +index a778d53bba0f9678a47ce6c3d94449ae7cd1c527..41861cb1e303213b2963e90fac6b4cbbfbbe36f7 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -@@ -201,9 +201,9 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C - Style chatmodifier = text.getMessage(i, player.isTextFilteringEnabled()).getStyle(); +@@ -203,9 +203,9 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C + Style chatmodifier = signtext.getMessage(i, entityhuman.isTextFilteringEnabled()).getStyle(); - if (player.isTextFilteringEnabled()) { -- text = text.setMessage(i, Component.literal(filteredtext.filteredOrEmpty()).setStyle(chatmodifier)); -+ text = text.setMessage(i, Component.literal(net.minecraft.SharedConstants.filterText(filteredtext.filteredOrEmpty())).setStyle(chatmodifier)); // Paper - filter sign text to chat only + if (entityhuman.isTextFilteringEnabled()) { +- signtext = signtext.setMessage(i, Component.literal(filteredtext.filteredOrEmpty()).setStyle(chatmodifier)); ++ signtext = signtext.setMessage(i, Component.literal(net.minecraft.SharedConstants.filterText(filteredtext.filteredOrEmpty())).setStyle(chatmodifier)); // Paper - filter sign text to chat only } else { -- text = text.setMessage(i, Component.literal(filteredtext.raw()).setStyle(chatmodifier), Component.literal(filteredtext.filteredOrEmpty()).setStyle(chatmodifier)); -+ text = text.setMessage(i, Component.literal(net.minecraft.SharedConstants.filterText(filteredtext.raw())).setStyle(chatmodifier), Component.literal(net.minecraft.SharedConstants.filterText(filteredtext.filteredOrEmpty())).setStyle(chatmodifier)); // Paper - filter sign text to chat only +- signtext = signtext.setMessage(i, Component.literal(filteredtext.raw()).setStyle(chatmodifier), Component.literal(filteredtext.filteredOrEmpty()).setStyle(chatmodifier)); ++ signtext = signtext.setMessage(i, Component.literal(net.minecraft.SharedConstants.filterText(filteredtext.raw())).setStyle(chatmodifier), Component.literal(net.minecraft.SharedConstants.filterText(filteredtext.filteredOrEmpty())).setStyle(chatmodifier)); // Paper - filter sign text to chat only } + } - // CraftBukkit start diff --git a/patches/server/0211-Expand-Explosions-API.patch b/patches/server/0211-Expand-Explosions-API.patch index 58d1518a12..77911f2f86 100644 --- a/patches/server/0211-Expand-Explosions-API.patch +++ b/patches/server/0211-Expand-Explosions-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API Add Entity as a Source capability, and add more API choices, and on Location. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index bb2050bc39287a78f9b51a38b358ea4b5eff1e02..99e26e62fbf50f6ae0e8667ddc33004bbae14d55 100644 +index fbbabae86ebca984c975b64a78a05354697b658f..1e4c89c1e0a01650711986310314ef342a2afbb4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -711,6 +711,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0215-Implement-World.getEntity-UUID-API.patch b/patches/server/0215-Implement-World.getEntity-UUID-API.patch index 9048f6f49f..f13d5bbabe 100644 --- a/patches/server/0215-Implement-World.getEntity-UUID-API.patch +++ b/patches/server/0215-Implement-World.getEntity-UUID-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement World.getEntity(UUID) API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 99e26e62fbf50f6ae0e8667ddc33004bbae14d55..4ce48861cc4fd0aaef08ab5806b52f204a6b6696 100644 +index 1e4c89c1e0a01650711986310314ef342a2afbb4..3e14eb63d57d8a9801185549deeafc6c5e09b50c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1035,6 +1035,15 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0216-InventoryCloseEvent-Reason-API.patch b/patches/server/0216-InventoryCloseEvent-Reason-API.patch index 23e4b1b715..92ebaa4132 100644 --- a/patches/server/0216-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0216-InventoryCloseEvent-Reason-API.patch @@ -173,7 +173,7 @@ index db27f88cc2fcb2835a5ef03519c75a176426b9fa..20aa0ad8e056ebb8d352c69da2a2ed04 @Override public boolean isBlocking() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index baa4d605b15d89f15b7012720dc792d51493d5fb..32e9d36134aa8618b067b148581001f0db7c0697 100644 +index 529812295ee99b4425ef95d0c5a972ba27c6f2b1..8c31faad675edffedf8abfa0bc383ecb2fe6ddad 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1212,7 +1212,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch index f378ab2174..e7ee569d1e 100644 --- a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch +++ b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread diff --git a/build.gradle.kts b/build.gradle.kts -index 967b675eb600282b881d966f95c9d3cde3edc4e8..89bdaf0da412eb13c33039599df90b9ac86b02bf 100644 +index 97f1a5bafdd1f520fee5f31fda87b4c251aea33f..41485437cdf438cfb837a9fcd276c2dd70b84b42 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,6 +27,7 @@ dependencies { diff --git a/patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch index eedaf29268..3f1c15ddd6 100644 --- a/patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch +++ b/patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4ce48861cc4fd0aaef08ab5806b52f204a6b6696..ceb9618180cb740ff0626560d5fa3343b917dfb7 100644 +index 3e14eb63d57d8a9801185549deeafc6c5e09b50c..c5209c25602d32003b0681d55f9b2a428e1a8e2e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -401,7 +401,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch index 22ce067a54..320fcadd53 100644 --- a/patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch +++ b/patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 32e9d36134aa8618b067b148581001f0db7c0697..090725321690d22db7d714a794b698930b126ae1 100644 +index 8c31faad675edffedf8abfa0bc383ecb2fe6ddad..a825805c4c1506628550864b8d1566727b15a10c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2774,6 +2774,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0253-Improve-death-events.patch b/patches/server/0253-Improve-death-events.patch index 1bb7e1ae5c..b28258c0b8 100644 --- a/patches/server/0253-Improve-death-events.patch +++ b/patches/server/0253-Improve-death-events.patch @@ -354,7 +354,7 @@ index 719f68f96e58ddcdd3592131c691d21263c81915..4413b609f1250cf9477fcb3fecd7b67a this.gameEvent(GameEvent.ENTITY_DIE); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 090725321690d22db7d714a794b698930b126ae1..5ce7e05e6103239b733e5d67126316f487fe10e8 100644 +index a825805c4c1506628550864b8d1566727b15a10c..d5631eaed68b6745d8ee43751f6953094adc2c5e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2294,7 +2294,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch index de907aac39..cb39a02032 100644 --- a/patches/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch +++ b/patches/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow chests to be placed with NBT data diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 0db25566c47eb5b7e970dafea0ed186592fea38c..441fbeb3226b698648788de5ad58b94a66499a41 100644 +index 4b19057fba6c6645dc79f6572a3fb01cb2c4c26c..cbda9f0fd0b14062c5b0290b2da571cff2df13e5 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -376,6 +376,7 @@ public final class ItemStack { diff --git a/patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch index a93ea72ff4..826206d16e 100644 --- a/patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch +++ b/patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index fb224f9049d023c44138720c9094283044d11220..ad749401f8b473b3c7c239fea3af772014a29357 100644 +index 134c91f69f5b532ed67428c097d93b38a83df01a..7dfe2e229dd8498a32a74dbfca5c078852b251d3 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -@@ -83,6 +83,12 @@ import org.bukkit.persistence.PersistentDataContainer; +@@ -84,6 +84,12 @@ import org.bukkit.persistence.PersistentDataContainer; import static org.spigotmc.ValidateUtils.*; // Spigot end @@ -21,7 +21,7 @@ index fb224f9049d023c44138720c9094283044d11220..ad749401f8b473b3c7c239fea3af7720 /** * Children must include the following: * -@@ -271,6 +277,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -272,6 +278,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { @Specific(Specific.To.NBT) static final ItemMetaKey BLOCK_DATA = new ItemMetaKey("BlockStateTag"); static final ItemMetaKey BUKKIT_CUSTOM_TAG = new ItemMetaKey("PublicBukkitValues"); @@ -32,7 +32,7 @@ index fb224f9049d023c44138720c9094283044d11220..ad749401f8b473b3c7c239fea3af7720 // We store the raw original JSON representation of all text data. See SPIGOT-5063, SPIGOT-5656, SPIGOT-5304 private String displayName; -@@ -284,6 +294,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -285,6 +295,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { private int hideFlag; private boolean unbreakable; private int damage; @@ -43,7 +43,7 @@ index fb224f9049d023c44138720c9094283044d11220..ad749401f8b473b3c7c239fea3af7720 private static final Set HANDLED_TAGS = Sets.newHashSet(); private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry(); -@@ -321,6 +335,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -322,6 +336,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { this.hideFlag = meta.hideFlag; this.unbreakable = meta.unbreakable; this.damage = meta.damage; @@ -59,7 +59,7 @@ index fb224f9049d023c44138720c9094283044d11220..ad749401f8b473b3c7c239fea3af7720 this.unhandledTags.putAll(meta.unhandledTags); this.persistentDataContainer.putAll(meta.persistentDataContainer.getRaw()); -@@ -384,6 +407,31 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -385,6 +408,31 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { this.persistentDataContainer.put(key, compound.get(key).copy()); } } @@ -91,7 +91,7 @@ index fb224f9049d023c44138720c9094283044d11220..ad749401f8b473b3c7c239fea3af7720 Set keys = tag.getAllKeys(); for (String key : keys) { -@@ -522,6 +570,34 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -523,6 +571,34 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { this.setDamage(damage); } @@ -126,7 +126,7 @@ index fb224f9049d023c44138720c9094283044d11220..ad749401f8b473b3c7c239fea3af7720 String internal = SerializableMeta.getString(map, "internal", true); if (internal != null) { ByteArrayInputStream buf = new ByteArrayInputStream(Base64.getDecoder().decode(internal)); -@@ -650,6 +726,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -651,6 +727,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { if (this.hasDamage()) { itemTag.putInt(DAMAGE.NBT, damage); } @@ -150,7 +150,7 @@ index fb224f9049d023c44138720c9094283044d11220..ad749401f8b473b3c7c239fea3af7720 for (Map.Entry e : this.unhandledTags.entrySet()) { itemTag.put(e.getKey(), e.getValue()); -@@ -666,6 +759,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -667,6 +760,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { } } @@ -172,7 +172,7 @@ index fb224f9049d023c44138720c9094283044d11220..ad749401f8b473b3c7c239fea3af7720 ListTag createStringList(List list) { if (list == null) { return null; -@@ -749,7 +857,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -750,7 +858,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { @Overridden boolean isEmpty() { @@ -181,7 +181,7 @@ index fb224f9049d023c44138720c9094283044d11220..ad749401f8b473b3c7c239fea3af7720 } // Paper start -@@ -1180,7 +1288,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1182,7 +1290,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { && (this.hideFlag == that.hideFlag) && (this.isUnbreakable() == that.isUnbreakable()) && (this.hasDamage() ? that.hasDamage() && this.damage == that.damage : !that.hasDamage()) @@ -194,7 +194,7 @@ index fb224f9049d023c44138720c9094283044d11220..ad749401f8b473b3c7c239fea3af7720 } /** -@@ -1215,6 +1327,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1217,6 +1329,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { hash = 61 * hash + (this.hasDamage() ? this.damage : 0); hash = 61 * hash + (this.hasAttributeModifiers() ? this.attributeModifiers.hashCode() : 0); hash = 61 * hash + this.version; @@ -205,7 +205,7 @@ index fb224f9049d023c44138720c9094283044d11220..ad749401f8b473b3c7c239fea3af7720 return hash; } -@@ -1239,6 +1355,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1241,6 +1357,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { clone.unbreakable = this.unbreakable; clone.damage = this.damage; clone.version = this.version; @@ -220,7 +220,7 @@ index fb224f9049d023c44138720c9094283044d11220..ad749401f8b473b3c7c239fea3af7720 return clone; } catch (CloneNotSupportedException e) { throw new Error(e); -@@ -1296,6 +1420,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1298,6 +1422,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { builder.put(DAMAGE.BUKKIT, damage); } @@ -244,7 +244,7 @@ index fb224f9049d023c44138720c9094283044d11220..ad749401f8b473b3c7c239fea3af7720 final Map internalTags = new HashMap(this.unhandledTags); this.serializeInternal(internalTags); if (!internalTags.isEmpty()) { -@@ -1465,6 +1606,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1467,6 +1608,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { CraftMetaArmorStand.SHOW_ARMS.NBT, CraftMetaArmorStand.SMALL.NBT, CraftMetaArmorStand.MARKER.NBT, @@ -253,7 +253,7 @@ index fb224f9049d023c44138720c9094283044d11220..ad749401f8b473b3c7c239fea3af7720 // Paper end CraftMetaCompass.LODESTONE_DIMENSION.NBT, CraftMetaCompass.LODESTONE_POS.NBT, -@@ -1494,4 +1637,146 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1496,4 +1639,146 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { } // Paper end diff --git a/patches/server/0266-Add-sun-related-API.patch b/patches/server/0266-Add-sun-related-API.patch index 2986fc8dda..da9ff3dfbd 100644 --- a/patches/server/0266-Add-sun-related-API.patch +++ b/patches/server/0266-Add-sun-related-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Add sun related API public net.minecraft.world.entity.Mob isSunBurnTick()Z diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index ceb9618180cb740ff0626560d5fa3343b917dfb7..5024887e3672653f870372c25f20bfd63466d6c9 100644 +index c5209c25602d32003b0681d55f9b2a428e1a8e2e..81a2f407673eba0943bd7c514561d452197ec85f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -687,6 +687,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index b2cd63c19f..d66533d498 100644 --- a/patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -106,7 +106,7 @@ index 69a1852905dd4724c30ac8ab88c14251eee2c371..17b3d5de58a9ef3acc67624c46cd6bbd public Location getLastDeathLocation() { if (this.getData().contains("LastDeathLocation", 10)) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5ce7e05e6103239b733e5d67126316f487fe10e8..c2618c5a3f0cdff8a4d8bb13e4e19dfb0fa14f59 100644 +index d5631eaed68b6745d8ee43751f6953094adc2c5e..30047bdd26f642279f7d438d1e5f4758726b785c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -183,6 +183,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch index cb224776b7..54ee38a298 100644 --- a/patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch +++ b/patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch @@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to be unintentional in the few cases we've seen so far. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c2618c5a3f0cdff8a4d8bb13e4e19dfb0fa14f59..b11babe7217405c5cfce477bcb30fb3f7e23ee28 100644 +index 30047bdd26f642279f7d438d1e5f4758726b785c..062d2c8e7c28e221fd6cccdef49d8bdce10c3c59 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2821,6 +2821,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0295-Implement-Brigadier-Mojang-API.patch b/patches/server/0295-Implement-Brigadier-Mojang-API.patch index bb62338749..4e67cc59ae 100644 --- a/patches/server/0295-Implement-Brigadier-Mojang-API.patch +++ b/patches/server/0295-Implement-Brigadier-Mojang-API.patch @@ -10,7 +10,7 @@ Adds CommandRegisteredEvent - Allows manipulating the CommandNode to add more children/metadata for the client diff --git a/build.gradle.kts b/build.gradle.kts -index 89bdaf0da412eb13c33039599df90b9ac86b02bf..d86a4eebb4fd4144d762407aaccc7de497d0a5c1 100644 +index 41485437cdf438cfb837a9fcd276c2dd70b84b42..9617477e8ef0ef5b1af4733ce4e87ddd796a7be2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,6 +8,7 @@ plugins { diff --git a/patches/server/0307-Add-Heightmap-API.patch b/patches/server/0307-Add-Heightmap-API.patch index 1700480b23..278d8bae25 100644 --- a/patches/server/0307-Add-Heightmap-API.patch +++ b/patches/server/0307-Add-Heightmap-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Heightmap API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 5024887e3672653f870372c25f20bfd63466d6c9..58a75fe902d49437e6a52b3123a4597f439478e4 100644 +index 81a2f407673eba0943bd7c514561d452197ec85f..b4875061e0165957a7d436550f9a74df6a08c9f8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -220,6 +220,29 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 7f81622f7b..7d248a8ab3 100644 --- a/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -191,7 +191,7 @@ index 4d2348df25410a0b5364eec066880326d6667dad..286aad3205ef8a9e21a47ef07893844f this.maxCount = i * i; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 58a75fe902d49437e6a52b3123a4597f439478e4..7862e3695a630db59afcb70bd02bd4d929099202 100644 +index b4875061e0165957a7d436550f9a74df6a08c9f8..a248b738de3936d73b80600687a9b88b425a494c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1344,15 +1344,21 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0315-Fix-World-isChunkGenerated-calls.patch b/patches/server/0315-Fix-World-isChunkGenerated-calls.patch index 6569fb2d7d..9a1cc5ead6 100644 --- a/patches/server/0315-Fix-World-isChunkGenerated-calls.patch +++ b/patches/server/0315-Fix-World-isChunkGenerated-calls.patch @@ -156,7 +156,7 @@ index 96f129cb13642dc9667464b58c025fa0ed700cfd..29da08c58200c24fd03003937d30eb41 } catch (Throwable throwable) { if (dataoutputstream != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 7862e3695a630db59afcb70bd02bd4d929099202..024e331b1d9034efc0d1bf60c44db8094c7f5888 100644 +index a248b738de3936d73b80600687a9b88b425a494c..f16ab24c0ff5b51432a8cbf9b5e7274c6b99ede6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -308,9 +308,23 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0322-Dont-send-unnecessary-sign-update.patch b/patches/server/0322-Dont-send-unnecessary-sign-update.patch index 9102420b62..8166668d42 100644 --- a/patches/server/0322-Dont-send-unnecessary-sign-update.patch +++ b/patches/server/0322-Dont-send-unnecessary-sign-update.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Dont send unnecessary sign update diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -index 13705a9e42c6ffc0e403de5fb56232845169d198..eeacbf1e1fe206256944675667d0ea61c2fbe494 100644 +index 41861cb1e303213b2963e90fac6b4cbbfbbe36f7..4fe156701cf0664d0ab9472f5599fd87ee4ddeb2 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -@@ -185,6 +185,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C +@@ -186,6 +186,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C this.level.sendBlockUpdated(this.getBlockPos(), this.getBlockState(), this.getBlockState(), 3); } else { SignBlockEntity.LOGGER.warn("Player {} just tried to change non-editable sign", player.getName().getString()); diff --git a/patches/server/0373-Implement-Player-Client-Options-API.patch b/patches/server/0373-Implement-Player-Client-Options-API.patch index 31816ee9a0..a3cf730863 100644 --- a/patches/server/0373-Implement-Player-Client-Options-API.patch +++ b/patches/server/0373-Implement-Player-Client-Options-API.patch @@ -116,7 +116,7 @@ index 0a9e30d64a9e8007b12da6611fde017d5c53fa05..cc3ebc15e25e132870bbc336e6821645 if (getMainArm() != packet.mainHand()) { PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b11babe7217405c5cfce477bcb30fb3f7e23ee28..85622551448f34573cb346715e5a85c87a59e182 100644 +index 062d2c8e7c28e221fd6cccdef49d8bdce10c3c59..7bed46c9bc305cbb67e145c9ea62de06708a1f00 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -594,6 +594,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch index 9e6f994183..9ce564d681 100644 --- a/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and diff --git a/build.gradle.kts b/build.gradle.kts -index d86a4eebb4fd4144d762407aaccc7de497d0a5c1..16739eb5fc89fce4a77ad84387c785a5d41a9df2 100644 +index 9617477e8ef0ef5b1af4733ce4e87ddd796a7be2..e6731ada5a7f0f66322fd958f6244b3d5b8887bf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,6 +19,7 @@ dependencies { diff --git a/patches/server/0389-Implement-Mob-Goal-API.patch b/patches/server/0389-Implement-Mob-Goal-API.patch index f7ab7212f2..150d041b4b 100644 --- a/patches/server/0389-Implement-Mob-Goal-API.patch +++ b/patches/server/0389-Implement-Mob-Goal-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API diff --git a/build.gradle.kts b/build.gradle.kts -index 16739eb5fc89fce4a77ad84387c785a5d41a9df2..bc71323234b69a07ac84703c04734711ca0dd113 100644 +index e6731ada5a7f0f66322fd958f6244b3d5b8887bf..f57bd7863e90afb461158ab54ce4e3bcd6deb6cf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,6 +36,7 @@ dependencies { diff --git a/patches/server/0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index eab1b85b26..a55e23394c 100644 --- a/patches/server/0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/server/0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -117,7 +117,7 @@ index 7181e0df497d09e8d3d7a336e50a99506af4eb53..639babbdaf9bf00edfa9d835f845cd3a for (SpawnCategory spawnCategory : SpawnCategory.values()) { if (CraftSpawnCategory.isValidForLimits(spawnCategory)) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 024e331b1d9034efc0d1bf60c44db8094c7f5888..1935ec798dce41821436b3bad1d8e09bb89eae28 100644 +index f16ab24c0ff5b51432a8cbf9b5e7274c6b99ede6..58c9fa9fa6fab3eddb232b48602463d9d67701fc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1140,7 +1140,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0420-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0420-Add-Plugin-Tickets-to-API-Chunk-Methods.patch index 62c20e4721..a42c3b857a 100644 --- a/patches/server/0420-Add-Plugin-Tickets-to-API-Chunk-Methods.patch +++ b/patches/server/0420-Add-Plugin-Tickets-to-API-Chunk-Methods.patch @@ -44,7 +44,7 @@ index 639babbdaf9bf00edfa9d835f845cd3a0d95c088..a71b5269354fcf5074aa2b018abf9e17 this.printSaveWarning = false; console.autosavePeriod = this.configuration.getInt("ticks-per.autosave"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1935ec798dce41821436b3bad1d8e09bb89eae28..efbd169aad2a821dc66ec7312d1938faeffb4400 100644 +index 58c9fa9fa6fab3eddb232b48602463d9d67701fc..5200c13f33761b4e6a072b324d804d6766bad80b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -280,7 +280,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0424-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0424-Convert-legacy-attributes-in-Item-Meta.patch index e582cd59d9..88a4ffd540 100644 --- a/patches/server/0424-Convert-legacy-attributes-in-Item-Meta.patch +++ b/patches/server/0424-Convert-legacy-attributes-in-Item-Meta.patch @@ -30,10 +30,10 @@ index fac4097be2ee3d0bffbc92fb217f98831e78d6b3..233e372ba5d785352c9ac12dac37395b public CraftAttributeMap(AttributeMap handle) { this.handle = handle; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index ad749401f8b473b3c7c239fea3af772014a29357..67d5a3f758eac50111c75ff3cd432f875cbe4ced 100644 +index 7dfe2e229dd8498a32a74dbfca5c078852b251d3..bad63f59d9082ef9e50f0b43a4cce9bba19018f2 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -@@ -483,7 +483,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -484,7 +484,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { AttributeModifier attribMod = CraftAttributeInstance.convert(nmsModifier); diff --git a/patches/server/0427-Support-components-in-ItemMeta.patch b/patches/server/0427-Support-components-in-ItemMeta.patch index 7645c0cd14..17d8cae3d6 100644 --- a/patches/server/0427-Support-components-in-ItemMeta.patch +++ b/patches/server/0427-Support-components-in-ItemMeta.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Support components in ItemMeta diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 67d5a3f758eac50111c75ff3cd432f875cbe4ced..ad202473abbe4b302b825d9dd9dd75402190e824 100644 +index bad63f59d9082ef9e50f0b43a4cce9bba19018f2..93d40df438a0d95b32def9a6c206b98ca6168cb3 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -@@ -877,11 +877,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -878,11 +878,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { return CraftChatMessage.fromJSONComponent(displayName); } @@ -32,7 +32,7 @@ index 67d5a3f758eac50111c75ff3cd432f875cbe4ced..ad202473abbe4b302b825d9dd9dd7540 @Override public boolean hasDisplayName() { return this.displayName != null; -@@ -1024,6 +1036,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1025,6 +1037,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { return this.lore == null ? null : new ArrayList(Lists.transform(this.lore, CraftChatMessage::fromJSONComponent)); } @@ -47,7 +47,7 @@ index 67d5a3f758eac50111c75ff3cd432f875cbe4ced..ad202473abbe4b302b825d9dd9dd7540 @Override public void setLore(List lore) { if (lore == null || lore.isEmpty()) { -@@ -1038,6 +1058,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1039,6 +1059,21 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { } } @@ -69,7 +69,7 @@ index 67d5a3f758eac50111c75ff3cd432f875cbe4ced..ad202473abbe4b302b825d9dd9dd7540 @Override public boolean hasCustomModelData() { return this.customModelData != null; -@@ -1505,6 +1540,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1507,6 +1542,11 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { } for (Object object : addFrom) { diff --git a/patches/server/0430-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0430-Update-itemstack-legacy-name-and-lore.patch index a9cf3a4f64..c8f81c40b4 100644 --- a/patches/server/0430-Update-itemstack-legacy-name-and-lore.patch +++ b/patches/server/0430-Update-itemstack-legacy-name-and-lore.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Update itemstack legacy name and lore diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 441fbeb3226b698648788de5ad58b94a66499a41..020737fba27b6615905da4ac1724bbac8ec0bf4f 100644 +index cbda9f0fd0b14062c5b0290b2da571cff2df13e5..22bc138601247d4f14d84b54771020143920fc38 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -171,6 +171,44 @@ public final class ItemStack { diff --git a/patches/server/0444-Brand-support.patch b/patches/server/0444-Brand-support.patch index 2e3f320e49..edcacafae4 100644 --- a/patches/server/0444-Brand-support.patch +++ b/patches/server/0444-Brand-support.patch @@ -56,10 +56,10 @@ index e9ddcc6b1c30c4f6663c926821d7e8f58b46d3bd..600758b91ed8197ef615368e1ef5315d return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 85622551448f34573cb346715e5a85c87a59e182..4602a6a18ae8e343b9afb92760d05e456c5d1c2f 100644 +index 7bed46c9bc305cbb67e145c9ea62de06708a1f00..ad0b59e750f453aaf151fec8bce72b4e7f690266 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2948,6 +2948,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2938,6 +2938,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { // Paper end }; diff --git a/patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index f8c4cb289a..8be44d1ac2 100644 --- a/patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -21,7 +21,7 @@ index e1535ad949ead050ebb1813b3f4cd38597e1924c..e0574ad1e5d07f58649cb580a9b4f4d1 // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add this.removeTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, prevSpawn); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index efbd169aad2a821dc66ec7312d1938faeffb4400..f7f2bf28826152b8c0c0fd20d85ef8a34a443237 100644 +index 5200c13f33761b4e6a072b324d804d6766bad80b..32e86de4fc083d8d160892144705c46558c31c67 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -260,12 +260,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch index ee7f9c7e3a..0a2a329a6d 100644 --- a/patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch +++ b/patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PortalCreateEvent needs to know its entity diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 020737fba27b6615905da4ac1724bbac8ec0bf4f..12c0e0096153d1c7166829d6f7417d54d364df67 100644 +index 22bc138601247d4f14d84b54771020143920fc38..a236d2826b6a2dff8b3e63e7c59cce2602393e62 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -447,7 +447,7 @@ public final class ItemStack { diff --git a/patches/server/0478-Player-elytra-boost-API.patch b/patches/server/0478-Player-elytra-boost-API.patch index 7f60211618..dc24908669 100644 --- a/patches/server/0478-Player-elytra-boost-API.patch +++ b/patches/server/0478-Player-elytra-boost-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4602a6a18ae8e343b9afb92760d05e456c5d1c2f..5fbc224cc2d48840b9d036249a27c6d3c7a0a86a 100644 +index ad0b59e750f453aaf151fec8bce72b4e7f690266..7ed8b5accb01973a5e6aea20c40522da16fe6d59 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -616,6 +616,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch index 2a485b8883..343d62a18d 100644 --- a/patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch +++ b/patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5fbc224cc2d48840b9d036249a27c6d3c7a0a86a..4655b2abf541d1b5c5a8f42f0e23600590d15247 100644 +index 7ed8b5accb01973a5e6aea20c40522da16fe6d59..aa1be644a7fddee56310be9f94a25c97bfd46302 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2487,7 +2487,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0522-Added-WorldGameRuleChangeEvent.patch b/patches/server/0522-Added-WorldGameRuleChangeEvent.patch index 26c82fb1a8..7f1ff95a5a 100644 --- a/patches/server/0522-Added-WorldGameRuleChangeEvent.patch +++ b/patches/server/0522-Added-WorldGameRuleChangeEvent.patch @@ -64,7 +64,7 @@ index 4a0321f56ef80aa4991e61f586ddd3f6b45e499b..de713f1ca1d61a6b1fca2b66de916255 public int get() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index f7f2bf28826152b8c0c0fd20d85ef8a34a443237..3d5a1f0528f33779c67417619b4677fc3dfd1290 100644 +index 32e86de4fc083d8d160892144705c46558c31c67..08137e8c55048eedadcf1a583d04a752ea0f8da6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1834,8 +1834,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0533-Add-sendOpLevel-API.patch b/patches/server/0533-Add-sendOpLevel-API.patch index de60414395..d0dc68659b 100644 --- a/patches/server/0533-Add-sendOpLevel-API.patch +++ b/patches/server/0533-Add-sendOpLevel-API.patch @@ -32,7 +32,7 @@ index f5dcbcb46de49dfaad4923dc71a5406122fd092a..07912867c64cf9586afbcc03648562ee public boolean isWhiteListed(GameProfile profile) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4655b2abf541d1b5c5a8f42f0e23600590d15247..e4b106d4d5b4659770a40c774c1bab44313daa92 100644 +index aa1be644a7fddee56310be9f94a25c97bfd46302..a193b78ae1f43b1d8a48467fb082ee3bcb61831b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -630,6 +630,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0534-TODO-Registry-Modification-API.patch b/patches/server/0534-TODO-Registry-Modification-API.patch index 9206b252a1..54b86b44e7 100644 --- a/patches/server/0534-TODO-Registry-Modification-API.patch +++ b/patches/server/0534-TODO-Registry-Modification-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] TODO Registry Modification API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java -index ffc6d04135da7ce09ea5f4fdd5ad47a135f4853a..73dcaeed6de3ddbc5d8f34b667a6588f38fc9879 100644 +index 8d392d16050e65de081753c1479d0738d3f021a0..8e1a6206eafdf4160aef280710f0912a0664536f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java @@ -36,6 +36,7 @@ public class CraftRegistry implements Registry { diff --git a/patches/server/0535-Add-StructuresLocateEvent.patch b/patches/server/0535-Add-StructuresLocateEvent.patch index 61c53d9c4c..a97cae57f4 100644 --- a/patches/server/0535-Add-StructuresLocateEvent.patch +++ b/patches/server/0535-Add-StructuresLocateEvent.patch @@ -47,7 +47,7 @@ index 0000000000000000000000000000000000000000..09837f6e6c6ab8a1df2aacdb86646993 + } +} diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -index 56033c41c2be567d6787420d319d4603fc0a1d10..354d386940b5ee7c92708390b83db51c281660f4 100644 +index 9347d321eaba21e0ef9662ebcacae64c19149e1d..21290261b547d0e395117b63cf7fa294d0640f2d 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java @@ -121,6 +121,24 @@ public abstract class ChunkGenerator { @@ -76,7 +76,7 @@ index 56033c41c2be567d6787420d319d4603fc0a1d10..354d386940b5ee7c92708390b83db51c Map>> map = new Object2ObjectArrayMap(); Iterator iterator = structures.iterator(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java -index 73dcaeed6de3ddbc5d8f34b667a6588f38fc9879..220686d21f57e4b11b4e8b93599e511019fda702 100644 +index 8e1a6206eafdf4160aef280710f0912a0664536f..15abd319ac51a97cdb07da85e815ea93ff45431a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java @@ -37,6 +37,11 @@ public class CraftRegistry implements Registry { diff --git a/patches/server/0585-More-World-API.patch b/patches/server/0585-More-World-API.patch index 2a6046ec06..8b87146b11 100644 --- a/patches/server/0585-More-World-API.patch +++ b/patches/server/0585-More-World-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] More World API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 3d5a1f0528f33779c67417619b4677fc3dfd1290..b79b101ff19b0512d9718611cd5036f175e2c948 100644 +index 08137e8c55048eedadcf1a583d04a752ea0f8da6..4176671381862d45eb004c6738ae9663bf8dd1b6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2076,6 +2076,69 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0602-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0602-additions-to-PlayerGameModeChangeEvent.patch index a653f88a77..00407cd577 100644 --- a/patches/server/0602-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0602-additions-to-PlayerGameModeChangeEvent.patch @@ -144,7 +144,7 @@ index 8c98b01b3bf1e53ae849f19e7cec9f8f42af6883..e51527e1ecf49160130434ffdf97a9a0 } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e4b106d4d5b4659770a40c774c1bab44313daa92..c426217ffd02bc091a18094167f9cb4251037788 100644 +index a193b78ae1f43b1d8a48467fb082ee3bcb61831b..b7cf7293c64bc9587c78a651791d07da0efe460a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1534,7 +1534,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0611-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0611-Add-cause-to-Weather-ThunderChangeEvents.patch index 4cd95f4b63..0321d262c6 100644 --- a/patches/server/0611-Add-cause-to-Weather-ThunderChangeEvents.patch +++ b/patches/server/0611-Add-cause-to-Weather-ThunderChangeEvents.patch @@ -95,7 +95,7 @@ index 626b861ef2f323a5fc50ab5178d3e108e0f9cc25..31c31a9138cb5f6e41de01a6210f84e7 if (weather.isCancelled()) { return; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b79b101ff19b0512d9718611cd5036f175e2c948..02e49e0228667fc88da8347ea6cdf477c13321b7 100644 +index 4176671381862d45eb004c6738ae9663bf8dd1b6..bdf431755aa44869f54f38240e4ec9c3b547eeb7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1176,7 +1176,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0614-Add-PlayerKickEvent-causes.patch b/patches/server/0614-Add-PlayerKickEvent-causes.patch index 31deacfa70..951c9ffe99 100644 --- a/patches/server/0614-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0614-Add-PlayerKickEvent-causes.patch @@ -484,7 +484,7 @@ index 984c288abf94d9fe47fada33722fea035b832f3b..addd20237b87c9a87bb09fd7addb101a } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c426217ffd02bc091a18094167f9cb4251037788..bed0e8813e7214f1ae84d41804b0e0271789d77c 100644 +index b7cf7293c64bc9587c78a651791d07da0efe460a..cd640331afe72cd181dcb862f993ba3e0b68fc98 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -576,7 +576,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0624-Make-item-validations-configurable.patch b/patches/server/0624-Make-item-validations-configurable.patch index f8a66d7e96..c25f67167d 100644 --- a/patches/server/0624-Make-item-validations-configurable.patch +++ b/patches/server/0624-Make-item-validations-configurable.patch @@ -32,10 +32,10 @@ index e8413ad360e9b6c4eef13edf9dd0095e7e64bce2..a5d7fae348b0b262a0a8a5e8e76f1bc7 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index ad202473abbe4b302b825d9dd9dd75402190e824..9fc74007bd887ab71dea9dcfdc1e3017036d0bfc 100644 +index 93d40df438a0d95b32def9a6c206b98ca6168cb3..4caf272f065a681bd7101d52fedf2642cc78d3bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -@@ -360,7 +360,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -361,7 +361,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { CompoundTag display = tag.getCompound(DISPLAY.NBT); if (display.contains(NAME.NBT)) { @@ -44,7 +44,7 @@ index ad202473abbe4b302b825d9dd9dd75402190e824..9fc74007bd887ab71dea9dcfdc1e3017 } if (display.contains(LOCNAME.NBT)) { -@@ -371,7 +371,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -372,7 +372,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { ListTag list = display.getList(LORE.NBT, CraftMagicNumbers.NBT.TAG_STRING); this.lore = new ArrayList(list.size()); for (int index = 0; index < list.size(); index++) { diff --git a/patches/server/0626-add-per-world-spawn-limits.patch b/patches/server/0626-add-per-world-spawn-limits.patch index e8f295e3f2..200eebd866 100644 --- a/patches/server/0626-add-per-world-spawn-limits.patch +++ b/patches/server/0626-add-per-world-spawn-limits.patch @@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits Taken from #2982. Credit to Chasewhip8 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 02e49e0228667fc88da8347ea6cdf477c13321b7..2d04be33b7450bd4d71c0f80c28efcbde6559142 100644 +index bdf431755aa44869f54f38240e4ec9c3b547eeb7..200c0125c009ce08b3381814568054b881651b96 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -213,6 +213,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0634-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0634-Fix-commands-from-signs-not-firing-command-events.patch index aaacd2adba..8e0574f4b6 100644 --- a/patches/server/0634-Fix-commands-from-signs-not-firing-command-events.patch +++ b/patches/server/0634-Fix-commands-from-signs-not-firing-command-events.patch @@ -58,10 +58,10 @@ index 0000000000000000000000000000000000000000..01a2bc1feec808790bb93618ce46adb9 + } +} diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -index eeacbf1e1fe206256944675667d0ea61c2fbe494..63c0018ed6b9571b85419cbdae26e846815a3ce5 100644 +index 4fe156701cf0664d0ab9472f5599fd87ee4ddeb2..80695b2698d2904cec2c54ebe0ef880d95ed9583 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -@@ -271,7 +271,17 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C +@@ -274,7 +274,17 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C ClickEvent chatclickable = chatmodifier.getClickEvent(); if (chatclickable != null && chatclickable.getAction() == ClickEvent.Action.RUN_COMMAND) { @@ -80,7 +80,7 @@ index eeacbf1e1fe206256944675667d0ea61c2fbe494..63c0018ed6b9571b85419cbdae26e846 flag1 = true; } } -@@ -308,8 +318,23 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C +@@ -311,8 +321,23 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C String s = player == null ? "Sign" : player.getName().getString(); Object object = player == null ? Component.literal("Sign") : player.getDisplayName(); diff --git a/patches/server/0649-Add-PlayerSetSpawnEvent.patch b/patches/server/0649-Add-PlayerSetSpawnEvent.patch index d974970928..0fe0d1b348 100644 --- a/patches/server/0649-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0649-Add-PlayerSetSpawnEvent.patch @@ -172,7 +172,7 @@ index 1a27b7faa22e6b3dc5fce329ed06425de56c4315..b9903c29bdea8d1e3b6fce0e97be6bd9 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index bed0e8813e7214f1ae84d41804b0e0271789d77c..7fedfc313be736255067d12d7524439d42575524 100644 +index cd640331afe72cd181dcb862f993ba3e0b68fc98..416c8e01d5cf8cb9725f882cc6dc30dfc0ca5494 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1344,9 +1344,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0653-Added-EntityDamageItemEvent.patch b/patches/server/0653-Added-EntityDamageItemEvent.patch index 51b6dcf767..7a458b966f 100644 --- a/patches/server/0653-Added-EntityDamageItemEvent.patch +++ b/patches/server/0653-Added-EntityDamageItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added EntityDamageItemEvent diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 12c0e0096153d1c7166829d6f7417d54d364df67..99be49b179b46ed1a9c3b3784dcd91f2fcc34ca9 100644 +index a236d2826b6a2dff8b3e63e7c59cce2602393e62..9e7357c65c36da9cad2f4492dacfc60af2a1af70 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -591,7 +591,7 @@ public final class ItemStack { diff --git a/patches/server/0664-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0664-Add-methods-to-find-targets-for-lightning-strikes.patch index 16d5c44904..cceedc1658 100644 --- a/patches/server/0664-Add-methods-to-find-targets-for-lightning-strikes.patch +++ b/patches/server/0664-Add-methods-to-find-targets-for-lightning-strikes.patch @@ -31,7 +31,7 @@ index d35de35f0a72bf9080b48028010379426d50c5bc..5795836844691ce4bcfaf3df8ae6dc28 blockposition1 = blockposition1.above(2); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 2d04be33b7450bd4d71c0f80c28efcbde6559142..99c38fd10d2b3c8f9ce3d535b68dc6d97647384d 100644 +index 200c0125c009ce08b3381814568054b881651b96..470f4f64dc5628de463e5da5083a5fbc6f2166f0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -688,6 +688,23 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0679-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0679-Add-paper-mobcaps-and-paper-playermobcaps.patch index b46ac5d1b0..de7beb426c 100644 --- a/patches/server/0679-Add-paper-mobcaps-and-paper-playermobcaps.patch +++ b/patches/server/0679-Add-paper-mobcaps-and-paper-playermobcaps.patch @@ -294,7 +294,7 @@ index 9558aa3cbca5ec5fb7ee0c0e107924b5f4da7ffd..ecd6d91ca1ddee0d0d3b6d41fb96f432 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 99c38fd10d2b3c8f9ce3d535b68dc6d97647384d..00a55f9303db17d7a3ff4905e080fb4e7fe9b1ee 100644 +index 470f4f64dc5628de463e5da5083a5fbc6f2166f0..34f15449a72b59ba7c466d2ba5aa46d49fbd8b63 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1693,9 +1693,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0704-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0704-Use-Velocity-compression-and-cipher-natives.patch index 1bf4795cff..7e8d4fdd66 100644 --- a/patches/server/0704-Use-Velocity-compression-and-cipher-natives.patch +++ b/patches/server/0704-Use-Velocity-compression-and-cipher-natives.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use Velocity compression and cipher natives diff --git a/build.gradle.kts b/build.gradle.kts -index bc71323234b69a07ac84703c04734711ca0dd113..e1e8f7c42f5e68da25b11c4cfadd67425395e558 100644 +index f57bd7863e90afb461158ab54ce4e3bcd6deb6cf..9b37c31b97a95faeb4b31ed2ead82c07cf3ce6d0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,6 +31,11 @@ dependencies { diff --git a/patches/server/0708-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0708-Check-requirement-before-suggesting-root-nodes.patch index d824c5f2af..4f135f41df 100644 --- a/patches/server/0708-Check-requirement-before-suggesting-root-nodes.patch +++ b/patches/server/0708-Check-requirement-before-suggesting-root-nodes.patch @@ -11,10 +11,10 @@ encountering a command node with ASK_SERVER suggestions, however a modified client can send this packet whenever it wants. diff --git a/src/main/java/com/mojang/brigadier/CommandDispatcher.java b/src/main/java/com/mojang/brigadier/CommandDispatcher.java -index e733a5657032d29e5a0d64375c9e36639360a7e0..b64c98c173e25055f4ff9d7124d0a3cb7ff6ab1d 100644 +index f3b93786f241d45c3f5b571cf8b7e5241c7b7edd..429a48cdbd30ac76046cd46a74309d4ece931802 100644 --- a/src/main/java/com/mojang/brigadier/CommandDispatcher.java +++ b/src/main/java/com/mojang/brigadier/CommandDispatcher.java -@@ -595,10 +595,14 @@ public class CommandDispatcher { +@@ -596,10 +596,14 @@ public class CommandDispatcher { int i = 0; for (final CommandNode node : parent.getChildren()) { CompletableFuture future = Suggestions.empty(); diff --git a/patches/server/0722-Configurable-feature-seeds.patch b/patches/server/0722-Configurable-feature-seeds.patch index 497babf5e8..e474ae73f5 100644 --- a/patches/server/0722-Configurable-feature-seeds.patch +++ b/patches/server/0722-Configurable-feature-seeds.patch @@ -19,7 +19,7 @@ index 1080e1f67afe5574baca0df50cdb1d029a7a586a..a2f71a6d1a9e98133dff6cd0f625da94 } final Object val = config.get(key); diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -index 354d386940b5ee7c92708390b83db51c281660f4..31955f62253feb111239247c4f8c2215b3080c1d 100644 +index 21290261b547d0e395117b63cf7fa294d0640f2d..4ff7fbf180136bbd4a27b8ac9e5acdcd2177fa93 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java @@ -431,7 +431,14 @@ public abstract class ChunkGenerator { diff --git a/patches/server/0735-Add-player-health-update-API.patch b/patches/server/0735-Add-player-health-update-API.patch index b42d2f295b..dc4c1becce 100644 --- a/patches/server/0735-Add-player-health-update-API.patch +++ b/patches/server/0735-Add-player-health-update-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add player health update API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7fedfc313be736255067d12d7524439d42575524..5f046c62a1764c13df3c11ecd4be0ecc9553e529 100644 +index 416c8e01d5cf8cb9725f882cc6dc30dfc0ca5494..59683479af9fa4058cab286caed2fa990c4bd293 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2366,9 +2366,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0757-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0757-Expose-vanilla-BiomeProvider-from-WorldInfo.patch index 84d5dc8606..31665dc946 100644 --- a/patches/server/0757-Expose-vanilla-BiomeProvider-from-WorldInfo.patch +++ b/patches/server/0757-Expose-vanilla-BiomeProvider-from-WorldInfo.patch @@ -31,7 +31,7 @@ index 9b2f05e6d1d8e52842abaa4c92b60f7558480c70..98a0069562be1abf2ddc38ee6bc01c31 biomeProvider = generator.getDefaultBiomeProvider(worldInfo); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 00a55f9303db17d7a3ff4905e080fb4e7fe9b1ee..826d3b20a10158f1022de33627039fd16e7197fc 100644 +index 34f15449a72b59ba7c466d2ba5aa46d49fbd8b63..d0f52da906d976fd7a6ddb5894bb4a33106d2b2c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -203,6 +203,30 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0766-Multi-Block-Change-API-Implementation.patch b/patches/server/0766-Multi-Block-Change-API-Implementation.patch index 2258e57986..df3c22576e 100644 --- a/patches/server/0766-Multi-Block-Change-API-Implementation.patch +++ b/patches/server/0766-Multi-Block-Change-API-Implementation.patch @@ -25,7 +25,7 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..45bfc2af4942c029537805fce2f14e15 public void write(FriendlyByteBuf buf) { buf.writeLong(this.sectionPos.asLong()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5f046c62a1764c13df3c11ecd4be0ecc9553e529..6b61a80407cc5ba580d7c95e5bf2146d177b1b4a 100644 +index 59683479af9fa4058cab286caed2fa990c4bd293..41784e46737a4a22aee53df4d4bdf170850b7a75 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -920,6 +920,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0773-Add-missing-structure-set-seed-configs.patch b/patches/server/0773-Add-missing-structure-set-seed-configs.patch index 113aa3c75e..b3fe3a09aa 100644 --- a/patches/server/0773-Add-missing-structure-set-seed-configs.patch +++ b/patches/server/0773-Add-missing-structure-set-seed-configs.patch @@ -20,7 +20,7 @@ seeds/salts to the frequency reducer which has a similar effect. Co-authored-by: William Blake Galbreath diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -index 31955f62253feb111239247c4f8c2215b3080c1d..42ecfc1237bfc724dc9134a6a8bae3670251449e 100644 +index 4ff7fbf180136bbd4a27b8ac9e5acdcd2177fa93..a2439cc0c0c39dd63a8f5237ac78e1a662885a56 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java @@ -568,7 +568,7 @@ public abstract class ChunkGenerator { diff --git a/patches/server/0774-Implement-regenerateChunk.patch b/patches/server/0774-Implement-regenerateChunk.patch index b9821861b4..1ae4d721dc 100644 --- a/patches/server/0774-Implement-regenerateChunk.patch +++ b/patches/server/0774-Implement-regenerateChunk.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com> diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 826d3b20a10158f1022de33627039fd16e7197fc..4a19f5b1bada47f91516312db12245e11bf88e7d 100644 +index d0f52da906d976fd7a6ddb5894bb4a33106d2b2c..5c59bc81676b9d53961058fd324990633086326d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -142,6 +142,7 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/server/0775-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0775-Fix-cancelled-powdered-snow-bucket-placement.patch index 6847809a62..cd73c1c14d 100644 --- a/patches/server/0775-Fix-cancelled-powdered-snow-bucket-placement.patch +++ b/patches/server/0775-Fix-cancelled-powdered-snow-bucket-placement.patch @@ -20,7 +20,7 @@ index e581dc10f3c805f7f8b6e4c842092609e7e1a0f8..b0204af850ee182773ad458208cccd94 } return InteractionResult.FAIL; diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 99be49b179b46ed1a9c3b3784dcd91f2fcc34ca9..3bd5338e66ee52d2ba5b89d050dd996dfc82ba7e 100644 +index 9e7357c65c36da9cad2f4492dacfc60af2a1af70..6b9924652ef3cb3b26042155b05df3458b2a25ab 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -352,7 +352,7 @@ public final class ItemStack { diff --git a/patches/server/0787-Fix-falling-block-spawn-methods.patch b/patches/server/0787-Fix-falling-block-spawn-methods.patch index 10bed96709..d8c8d6ad70 100644 --- a/patches/server/0787-Fix-falling-block-spawn-methods.patch +++ b/patches/server/0787-Fix-falling-block-spawn-methods.patch @@ -24,7 +24,7 @@ index c738fb984ffd120e5adccdb5828833f180e72e80..5c8e905bbf56dd2af5b30d34371793c3 if (Snowball.class.isAssignableFrom(clazz)) { entity = new net.minecraft.world.entity.projectile.Snowball(world, x, y, z); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4a19f5b1bada47f91516312db12245e11bf88e7d..9cb7163a5a59c804de5ac4e9003f401ef058c86a 100644 +index 5c59bc81676b9d53961058fd324990633086326d..adaa7eaf1a0a39f1d75061c7c1504b61f49ad845 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1387,7 +1387,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0810-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0810-Pass-ServerLevel-for-gamerule-callbacks.patch index a9dbe04353..a61f9d0423 100644 --- a/patches/server/0810-Pass-ServerLevel-for-gamerule-callbacks.patch +++ b/patches/server/0810-Pass-ServerLevel-for-gamerule-callbacks.patch @@ -158,7 +158,7 @@ index de713f1ca1d61a6b1fca2b66de9162556d102449..edd2c9d0cf5a81c779011cb4215d496a this.onChanged(server); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 9cb7163a5a59c804de5ac4e9003f401ef058c86a..1ef6091e9e5b204a714d53a98c1e05bee5569e5c 100644 +index adaa7eaf1a0a39f1d75061c7c1504b61f49ad845..c6e50305031c9f9c958ae1eaf650bd61b00d0f4b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1940,7 +1940,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0811-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0811-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch index 995f125894..46b984988b 100644 --- a/patches/server/0811-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch +++ b/patches/server/0811-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add pre-unbreaking amount to PlayerItemDamageEvent diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 3bd5338e66ee52d2ba5b89d050dd996dfc82ba7e..7c1f33082f84049544f958bfaa6552012b8cacd7 100644 +index 6b9924652ef3cb3b26042155b05df3458b2a25ab..ac688d6175cc4c82cb454100b19738318503701a 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -607,10 +607,11 @@ public final class ItemStack { diff --git a/patches/server/0813-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0813-Fix-NPE-for-BlockDataMeta-getBlockData.patch deleted file mode 100644 index 5057c9d0d2..0000000000 --- a/patches/server/0813-Fix-NPE-for-BlockDataMeta-getBlockData.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -Date: Sun, 27 Mar 2022 16:00:28 -0700 -Subject: [PATCH] Fix NPE for BlockDataMeta#getBlockData - - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 9fc74007bd887ab71dea9dcfdc1e3017036d0bfc..936f8babf74b2be6240e5dbc2d0a84f8badada2e 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -@@ -1096,7 +1096,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { - - @Override - public BlockData getBlockData(Material material) { -- return CraftBlockData.fromData(BlockItem.getBlockState(CraftMagicNumbers.getBlock(material).defaultBlockState(), blockData)); -+ // Paper start - fix NPE if this.blockData is null -+ final net.minecraft.world.level.block.state.BlockState defaultBlockState = CraftMagicNumbers.getBlock(material).defaultBlockState(); -+ return CraftBlockData.fromData(this.blockData == null ? defaultBlockState : BlockItem.getBlockState(defaultBlockState, blockData)); -+ // Paper end - } - - @Override diff --git a/patches/server/0814-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0813-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0814-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0813-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0815-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0814-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0815-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0814-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0816-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0815-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0816-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0815-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0817-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0816-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0817-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0816-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0818-Add-PlayerStopUsingItemEvent.patch b/patches/server/0817-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0818-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0817-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0819-FallingBlock-auto-expire-setting.patch b/patches/server/0818-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0819-FallingBlock-auto-expire-setting.patch rename to patches/server/0818-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0820-Don-t-tick-markers.patch b/patches/server/0819-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0820-Don-t-tick-markers.patch rename to patches/server/0819-Don-t-tick-markers.patch diff --git a/patches/server/0821-Do-not-accept-invalid-client-settings.patch b/patches/server/0820-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0821-Do-not-accept-invalid-client-settings.patch rename to patches/server/0820-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0822-Add-support-for-Proxy-Protocol.patch b/patches/server/0821-Add-support-for-Proxy-Protocol.patch similarity index 97% rename from patches/server/0822-Add-support-for-Proxy-Protocol.patch rename to patches/server/0821-Add-support-for-Proxy-Protocol.patch index a99dc9a0d5..b6b30e9680 100644 --- a/patches/server/0822-Add-support-for-Proxy-Protocol.patch +++ b/patches/server/0821-Add-support-for-Proxy-Protocol.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add support for Proxy Protocol diff --git a/build.gradle.kts b/build.gradle.kts -index e1e8f7c42f5e68da25b11c4cfadd67425395e558..7a17e05b630517a6861c34a4561198db62acf82a 100644 +index 9b37c31b97a95faeb4b31ed2ead82c07cf3ce6d0..a3a76b9b7efa773117d2ee1ce53ef784b09b277d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,6 +20,7 @@ dependencies { diff --git a/patches/server/0823-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0822-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0823-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0822-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0824-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0823-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0824-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0823-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0825-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0824-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0825-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0824-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0826-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0825-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0826-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0825-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0827-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0826-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0827-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0826-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0828-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0827-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0828-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0827-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0829-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0828-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0829-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0828-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0830-Dont-resent-entity-on-art-update.patch b/patches/server/0829-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0830-Dont-resent-entity-on-art-update.patch rename to patches/server/0829-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0831-Add-WardenAngerChangeEvent.patch b/patches/server/0830-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0831-Add-WardenAngerChangeEvent.patch rename to patches/server/0830-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0832-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0831-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0832-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0831-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0833-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0832-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0833-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0832-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0834-Nameable-Banner-API.patch b/patches/server/0833-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0834-Nameable-Banner-API.patch rename to patches/server/0833-Nameable-Banner-API.patch diff --git a/patches/server/0835-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0834-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0835-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0834-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0836-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0835-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0836-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0835-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0837-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0836-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0837-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0836-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0838-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0837-Don-t-print-component-in-resource-pack-rejection-mes.patch similarity index 100% rename from patches/server/0838-Don-t-print-component-in-resource-pack-rejection-mes.patch rename to patches/server/0837-Don-t-print-component-in-resource-pack-rejection-mes.patch diff --git a/patches/server/0839-Add-Player-getFishHook.patch b/patches/server/0838-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0839-Add-Player-getFishHook.patch rename to patches/server/0838-Add-Player-getFishHook.patch diff --git a/patches/server/0840-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0839-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0840-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0839-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0841-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0840-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0841-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0840-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0842-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0841-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 100% rename from patches/server/0842-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/server/0841-Add-some-minimal-debug-information-to-chat-packet-er.patch diff --git a/patches/server/0843-Fix-Bee-flower-NPE.patch b/patches/server/0842-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0843-Fix-Bee-flower-NPE.patch rename to patches/server/0842-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0844-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0843-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/0844-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0843-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/0845-More-Teleport-API.patch b/patches/server/0844-More-Teleport-API.patch similarity index 99% rename from patches/server/0845-More-Teleport-API.patch rename to patches/server/0844-More-Teleport-API.patch index 9ec1252fe0..b11c2fe09a 100644 --- a/patches/server/0845-More-Teleport-API.patch +++ b/patches/server/0844-More-Teleport-API.patch @@ -74,7 +74,7 @@ index c6fc526db6943f6466d6504feff63715e35a0eb2..f04c50a76f3589181dd4502d630a93c4 // Let the server handle cross world teleports if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6b61a80407cc5ba580d7c95e5bf2146d177b1b4a..ce83330c4ebd81247f2b4c4f2693265810237d7a 100644 +index 41784e46737a4a22aee53df4d4bdf170850b7a75..4b2ff9527d6af588a4947c6eea66eee89f888aaa 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1233,13 +1233,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0846-Add-EntityPortalReadyEvent.patch b/patches/server/0845-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0846-Add-EntityPortalReadyEvent.patch rename to patches/server/0845-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0847-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0846-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0847-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0846-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0848-Send-block-entities-after-destroy-prediction.patch b/patches/server/0847-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0848-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0847-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0849-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0848-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 98% rename from patches/server/0849-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0848-Warn-on-plugins-accessing-faraway-chunks.patch index 1d9610a4f7..388caad802 100644 --- a/patches/server/0849-Warn-on-plugins-accessing-faraway-chunks.patch +++ b/patches/server/0848-Warn-on-plugins-accessing-faraway-chunks.patch @@ -18,7 +18,7 @@ index 01e420715d47b5531ede82139133a9bb59c25955..090771dce76f4e8037b6b2df9fc0dad7 private static boolean isOutsideSpawnableHeight(int y) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1ef6091e9e5b204a714d53a98c1e05bee5569e5c..c02df2ad5366e678d69e432b54706eb96269e285 100644 +index c6e50305031c9f9c958ae1eaf650bd61b00d0f4b..ab8cf1641dc0dc256c357481c23dca87f50d2c84 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -311,9 +311,24 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0850-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0849-Custom-Chat-Completion-Suggestions-API.patch similarity index 94% rename from patches/server/0850-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0849-Custom-Chat-Completion-Suggestions-API.patch index 8d90427836..6f2ca99ef1 100644 --- a/patches/server/0850-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/server/0849-Custom-Chat-Completion-Suggestions-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ce83330c4ebd81247f2b4c4f2693265810237d7a..328a59ef54e0e0eca0c5c42cf59227834da6cd86 100644 +index 4b2ff9527d6af588a4947c6eea66eee89f888aaa..62e4356f01e35da79af4b60eef271d250f850310 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -642,6 +642,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0851-Add-missing-BlockFadeEvents.patch b/patches/server/0850-Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0851-Add-missing-BlockFadeEvents.patch rename to patches/server/0850-Add-missing-BlockFadeEvents.patch diff --git a/patches/server/0852-Collision-API.patch b/patches/server/0851-Collision-API.patch similarity index 100% rename from patches/server/0852-Collision-API.patch rename to patches/server/0851-Collision-API.patch diff --git a/patches/server/0853-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0852-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0853-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0852-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0854-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0853-Remove-invalid-signature-login-stacktrace.patch similarity index 100% rename from patches/server/0854-Remove-invalid-signature-login-stacktrace.patch rename to patches/server/0853-Remove-invalid-signature-login-stacktrace.patch diff --git a/patches/server/0855-Block-Ticking-API.patch b/patches/server/0854-Block-Ticking-API.patch similarity index 100% rename from patches/server/0855-Block-Ticking-API.patch rename to patches/server/0854-Block-Ticking-API.patch diff --git a/patches/server/0856-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0855-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0856-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0855-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0857-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0856-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0857-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/server/0856-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0858-Add-NamespacedKey-biome-methods.patch b/patches/server/0857-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0858-Add-NamespacedKey-biome-methods.patch rename to patches/server/0857-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0859-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0858-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0859-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0858-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0860-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0859-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0860-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0859-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0861-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0860-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0861-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0860-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0862-Missing-eating-regain-reason.patch b/patches/server/0861-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0862-Missing-eating-regain-reason.patch rename to patches/server/0861-Missing-eating-regain-reason.patch diff --git a/patches/server/0863-Missing-effect-cause.patch b/patches/server/0862-Missing-effect-cause.patch similarity index 100% rename from patches/server/0863-Missing-effect-cause.patch rename to patches/server/0862-Missing-effect-cause.patch diff --git a/patches/server/0864-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0863-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0864-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0863-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0865-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0864-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0865-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0864-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0866-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0865-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0866-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0865-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0867-Configurable-chat-thread-limit.patch b/patches/server/0866-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0867-Configurable-chat-thread-limit.patch rename to patches/server/0866-Configurable-chat-thread-limit.patch diff --git a/patches/server/0868-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0867-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0868-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0867-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0869-fix-Jigsaw-block-kicking-user.patch b/patches/server/0868-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0869-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0868-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0870-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0869-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0870-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0869-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0871-Add-getDrops-to-BlockState.patch b/patches/server/0870-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0871-Add-getDrops-to-BlockState.patch rename to patches/server/0870-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0872-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0871-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0872-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0871-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0873-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0872-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0873-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0872-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0874-Fix-custom-piglin-loved-items.patch b/patches/server/0873-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0874-Fix-custom-piglin-loved-items.patch rename to patches/server/0873-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0875-EntityPickupItemEvent-fixes.patch b/patches/server/0874-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0875-EntityPickupItemEvent-fixes.patch rename to patches/server/0874-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0876-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0875-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0876-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0875-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0877-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0876-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0877-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0876-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0878-Elder-Guardian-appearance-API.patch b/patches/server/0877-Elder-Guardian-appearance-API.patch similarity index 84% rename from patches/server/0878-Elder-Guardian-appearance-API.patch rename to patches/server/0877-Elder-Guardian-appearance-API.patch index be1b6b521c..ca02d67fd2 100644 --- a/patches/server/0878-Elder-Guardian-appearance-API.patch +++ b/patches/server/0877-Elder-Guardian-appearance-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Elder Guardian appearance API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 328a59ef54e0e0eca0c5c42cf59227834da6cd86..4b8299c14518fbc658fc30c833e8a870d5e97021 100644 +index 62e4356f01e35da79af4b60eef271d250f850310..5eea6d85606df02d342f3ff88d2a9f3f8b01303c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3118,6 +3118,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3108,6 +3108,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } // Paper end diff --git a/patches/server/0879-Allow-changing-bed-s-occupied-property.patch b/patches/server/0878-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0879-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0878-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0880-Add-entity-knockback-API.patch b/patches/server/0879-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0880-Add-entity-knockback-API.patch rename to patches/server/0879-Add-entity-knockback-API.patch diff --git a/patches/server/0881-Detect-headless-JREs.patch b/patches/server/0880-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0881-Detect-headless-JREs.patch rename to patches/server/0880-Detect-headless-JREs.patch diff --git a/patches/server/0882-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0881-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0882-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0881-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0883-optimized-dirt-and-snow-spreading.patch b/patches/server/0882-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0883-optimized-dirt-and-snow-spreading.patch rename to patches/server/0882-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0884-Added-EntityToggleSitEvent.patch b/patches/server/0883-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0884-Added-EntityToggleSitEvent.patch rename to patches/server/0883-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0885-Add-fire-tick-delay-option.patch b/patches/server/0884-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0885-Add-fire-tick-delay-option.patch rename to patches/server/0884-Add-fire-tick-delay-option.patch diff --git a/patches/server/0886-Add-Moving-Piston-API.patch b/patches/server/0885-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0886-Add-Moving-Piston-API.patch rename to patches/server/0885-Add-Moving-Piston-API.patch diff --git a/patches/server/0887-Ignore-impossible-spawn-tick.patch b/patches/server/0886-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0887-Ignore-impossible-spawn-tick.patch rename to patches/server/0886-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0888-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0887-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0888-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0887-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0889-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0888-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0889-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0888-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0890-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0889-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0890-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0889-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0891-Prevent-compass-from-loading-chunks.patch b/patches/server/0890-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0891-Prevent-compass-from-loading-chunks.patch rename to patches/server/0890-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0892-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0891-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0892-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0891-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0893-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0892-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0893-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0892-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0894-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0893-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0894-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0893-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0895-Add-Player-Warden-Warning-API.patch b/patches/server/0894-Add-Player-Warden-Warning-API.patch similarity index 93% rename from patches/server/0895-Add-Player-Warden-Warning-API.patch rename to patches/server/0894-Add-Player-Warden-Warning-API.patch index bf6a08293c..399d146481 100644 --- a/patches/server/0895-Add-Player-Warden-Warning-API.patch +++ b/patches/server/0894-Add-Player-Warden-Warning-API.patch @@ -10,10 +10,10 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4b8299c14518fbc658fc30c833e8a870d5e97021..c0ecdf15124e1694a8fa65164a82bf56a18917a8 100644 +index 5eea6d85606df02d342f3ff88d2a9f3f8b01303c..82ba1b4d0fbfb72bd858eafe942555f46577ca1e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3123,6 +3123,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3113,6 +3113,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void showElderGuardian(boolean silent) { if (getHandle().connection != null) getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, silent ? 0F : 1F)); } diff --git a/patches/server/0896-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0895-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0896-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0895-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0897-Add-paper-dumplisteners-command.patch b/patches/server/0896-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0897-Add-paper-dumplisteners-command.patch rename to patches/server/0896-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0898-check-global-player-list-where-appropriate.patch b/patches/server/0897-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0898-check-global-player-list-where-appropriate.patch rename to patches/server/0897-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0899-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0898-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0899-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0898-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0900-ItemStack-damage-API.patch b/patches/server/0899-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0900-ItemStack-damage-API.patch rename to patches/server/0899-ItemStack-damage-API.patch diff --git a/patches/server/0901-Friction-API.patch b/patches/server/0900-Friction-API.patch similarity index 100% rename from patches/server/0901-Friction-API.patch rename to patches/server/0900-Friction-API.patch diff --git a/patches/server/0902-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0901-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0902-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0901-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0903-Fix-player-kick-on-shutdown.patch b/patches/server/0902-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0903-Fix-player-kick-on-shutdown.patch rename to patches/server/0902-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0904-Sync-offhand-slot-in-menus.patch b/patches/server/0903-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0904-Sync-offhand-slot-in-menus.patch rename to patches/server/0903-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0905-Player-Entity-Tracking-Events.patch b/patches/server/0904-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0905-Player-Entity-Tracking-Events.patch rename to patches/server/0904-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0906-Limit-pet-look-distance.patch b/patches/server/0905-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0906-Limit-pet-look-distance.patch rename to patches/server/0905-Limit-pet-look-distance.patch diff --git a/patches/server/0907-Properly-resend-entities.patch b/patches/server/0906-Properly-resend-entities.patch similarity index 100% rename from patches/server/0907-Properly-resend-entities.patch rename to patches/server/0906-Properly-resend-entities.patch diff --git a/patches/server/0908-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0907-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0908-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0907-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0909-fix-Instruments.patch b/patches/server/0908-fix-Instruments.patch similarity index 97% rename from patches/server/0909-fix-Instruments.patch rename to patches/server/0908-fix-Instruments.patch index 452cf079c4..d8b3ab9e46 100644 --- a/patches/server/0909-fix-Instruments.patch +++ b/patches/server/0908-fix-Instruments.patch @@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments properly handle Player#playNote diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c0ecdf15124e1694a8fa65164a82bf56a18917a8..f734089dde9321387a9fd5bdc43341624c680872 100644 +index 82ba1b4d0fbfb72bd858eafe942555f46577ca1e..b4f19650ae6486991bb83147b9fb589474aadb2d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -744,62 +744,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0910-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0909-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0910-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0909-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0911-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0910-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0911-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0910-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0912-Improve-logging-and-errors.patch b/patches/server/0911-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0912-Improve-logging-and-errors.patch rename to patches/server/0911-Improve-logging-and-errors.patch diff --git a/patches/server/0913-Add-BlockLockCheckEvent.patch b/patches/server/0912-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0913-Add-BlockLockCheckEvent.patch rename to patches/server/0912-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0914-Add-Sneaking-API-for-Entities.patch b/patches/server/0913-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0914-Add-Sneaking-API-for-Entities.patch rename to patches/server/0913-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0915-Improve-PortalEvents.patch b/patches/server/0914-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0915-Improve-PortalEvents.patch rename to patches/server/0914-Improve-PortalEvents.patch diff --git a/patches/server/0916-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0915-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0916-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0915-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0916-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0916-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0918-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0917-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0918-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0917-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0919-Flying-Fall-Damage.patch b/patches/server/0918-Flying-Fall-Damage.patch similarity index 95% rename from patches/server/0919-Flying-Fall-Damage.patch rename to patches/server/0918-Flying-Fall-Damage.patch index aa62883423..1a8b5cd95c 100644 --- a/patches/server/0919-Flying-Fall-Damage.patch +++ b/patches/server/0918-Flying-Fall-Damage.patch @@ -26,7 +26,7 @@ index 53487f0a4fe672298c3b83d24a2a603641afcde8..58152160d609d0e9d105153aeb166a56 } else { if (fallDistance >= 2.0F) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f734089dde9321387a9fd5bdc43341624c680872..edb5777a6b69d2947708d6799f0054b438078628 100644 +index b4f19650ae6486991bb83147b9fb589474aadb2d..9d9881b0adc33fa72a61b019f328c254c13dc1b2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2303,6 +2303,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0920-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0919-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 100% rename from patches/server/0920-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/server/0919-Add-exploded-block-state-to-BlockExplodeEvent.patch diff --git a/patches/server/0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0920-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0920-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0922-config-for-disabling-entity-tag-tags.patch b/patches/server/0921-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0922-config-for-disabling-entity-tag-tags.patch rename to patches/server/0921-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0923-Use-single-player-info-update-packet-on-join.patch b/patches/server/0922-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0923-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0922-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0923-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0923-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0925-Win-Screen-API.patch b/patches/server/0924-Win-Screen-API.patch similarity index 93% rename from patches/server/0925-Win-Screen-API.patch rename to patches/server/0924-Win-Screen-API.patch index ebdc6441ab..2020d18a37 100644 --- a/patches/server/0925-Win-Screen-API.patch +++ b/patches/server/0924-Win-Screen-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API public net.minecraft.server.level.ServerPlayer seenCredits diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index edb5777a6b69d2947708d6799f0054b438078628..fc71dfcf4387c355a69a8bbfaec17aafb6d98d2d 100644 +index 9d9881b0adc33fa72a61b019f328c254c13dc1b2..6e9c25337bf9b4bb80558174bdc24181dcbd695c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1203,6 +1203,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0925-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0925-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0927-Fix-force-opening-enchantment-tables.patch b/patches/server/0926-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0927-Fix-force-opening-enchantment-tables.patch rename to patches/server/0926-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0928-Add-Entity-Body-Yaw-API.patch b/patches/server/0927-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0928-Add-Entity-Body-Yaw-API.patch rename to patches/server/0927-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0929-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0928-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0929-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0928-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0930-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0929-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0930-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0929-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0931-Add-EntityFertilizeEggEvent.patch b/patches/server/0930-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0931-Add-EntityFertilizeEggEvent.patch rename to patches/server/0930-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0932-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0931-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0932-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0931-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0933-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0932-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0933-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0932-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0934-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0933-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0934-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0933-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0935-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0934-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0935-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0934-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0936-Fix-text-display-error-on-spawn.patch b/patches/server/0935-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0936-Fix-text-display-error-on-spawn.patch rename to patches/server/0935-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0937-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0936-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0937-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0936-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0938-Add-Shearable-API.patch b/patches/server/0937-Add-Shearable-API.patch similarity index 100% rename from patches/server/0938-Add-Shearable-API.patch rename to patches/server/0937-Add-Shearable-API.patch diff --git a/patches/server/0939-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0938-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0939-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0938-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0940-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0939-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch similarity index 100% rename from patches/server/0940-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch rename to patches/server/0939-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch diff --git a/patches/server/0941-Optimize-Hoppers.patch b/patches/server/0940-Optimize-Hoppers.patch similarity index 99% rename from patches/server/0941-Optimize-Hoppers.patch rename to patches/server/0940-Optimize-Hoppers.patch index a938fbc3e6..9bc6524a85 100644 --- a/patches/server/0941-Optimize-Hoppers.patch +++ b/patches/server/0940-Optimize-Hoppers.patch @@ -25,7 +25,7 @@ index 2c3577c6f59e482d68c80d3d414ed43942dfcfbb..fb82bb52f219e7683fe1d3c0fb3acbe2 this.profiler.push(() -> { diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 7c1f33082f84049544f958bfaa6552012b8cacd7..5424a3d83cb0705f6966bd607911280c92c75a14 100644 +index ac688d6175cc4c82cb454100b19738318503701a..deb1b4c4216f76c4b44a31c337d43baae8039640 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -718,10 +718,16 @@ public final class ItemStack { diff --git a/patches/server/0942-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0941-Fix-beehives-generating-from-using-bonemeal.patch similarity index 96% rename from patches/server/0942-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0941-Fix-beehives-generating-from-using-bonemeal.patch index 4784cf8470..48fda8c1b9 100644 --- a/patches/server/0942-Fix-beehives-generating-from-using-bonemeal.patch +++ b/patches/server/0941-Fix-beehives-generating-from-using-bonemeal.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix beehives generating from using bonemeal diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 5424a3d83cb0705f6966bd607911280c92c75a14..dd799019cc1fce709f8160fbd37c6ac11475593b 100644 +index deb1b4c4216f76c4b44a31c337d43baae8039640..da4e0712bea0c7aad9fe905b805b9fa11580f59f 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -392,6 +392,7 @@ public final class ItemStack { diff --git a/patches/server/0943-Fix-api-checking-banned-ips.patch b/patches/server/0942-Fix-api-checking-banned-ips.patch similarity index 100% rename from patches/server/0943-Fix-api-checking-banned-ips.patch rename to patches/server/0942-Fix-api-checking-banned-ips.patch diff --git a/patches/server/0944-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0943-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0944-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0943-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0945-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0944-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0945-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0944-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0946-remove-duplicate-animate-packet-for-records.patch b/patches/server/0945-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0946-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0945-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0947-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0946-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0947-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0946-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0948-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0947-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0948-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0947-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0949-Use-array-for-gamerule-storage.patch b/patches/server/0948-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0949-Use-array-for-gamerule-storage.patch rename to patches/server/0948-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0950-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0949-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0950-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0949-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0951-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0951-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0952-Add-Mob-Experience-reward-API.patch b/patches/server/0951-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0952-Add-Mob-Experience-reward-API.patch rename to patches/server/0951-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0953-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0952-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0953-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0952-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0954-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0953-Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/server/0954-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0953-Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/server/0955-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0954-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0955-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0954-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0956-More-accurate-isInOpenWater-impl.patch b/patches/server/0955-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0956-More-accurate-isInOpenWater-impl.patch rename to patches/server/0955-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0957-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0956-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0957-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0956-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0958-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0957-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0958-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0957-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0959-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0958-Fix-destroying-beehive-without-any-players-nearby-th.patch similarity index 100% rename from patches/server/0959-Fix-destroying-beehive-without-any-players-nearby-th.patch rename to patches/server/0958-Fix-destroying-beehive-without-any-players-nearby-th.patch diff --git a/patches/server/0960-Expand-PlayerItemMendEvent.patch b/patches/server/0959-Expand-PlayerItemMendEvent.patch similarity index 98% rename from patches/server/0960-Expand-PlayerItemMendEvent.patch rename to patches/server/0959-Expand-PlayerItemMendEvent.patch index d94d6d8ea5..f482fcc55d 100644 --- a/patches/server/0960-Expand-PlayerItemMendEvent.patch +++ b/patches/server/0959-Expand-PlayerItemMendEvent.patch @@ -33,7 +33,7 @@ index 000c13afc6bb3acb68b9adcaeefb7bb1cb703702..673327af0f77aeac0d704b0fb6bebebc return k > 0 ? this.repairPlayerItems(player, k) : 0; } else { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index fc71dfcf4387c355a69a8bbfaec17aafb6d98d2d..c911e86abaa1293e8948e37cb197f64b8ee35844 100644 +index 6e9c25337bf9b4bb80558174bdc24181dcbd695c..8fe9e6c540ae40b29c4e45b5efd6ff94478ba2dd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1673,11 +1673,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0961-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0960-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0961-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0960-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0962-Add-transient-modifier-API.patch b/patches/server/0961-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0962-Add-transient-modifier-API.patch rename to patches/server/0961-Add-transient-modifier-API.patch diff --git a/work/Bukkit b/work/Bukkit index 3635fe1a77..2d009e6420 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 3635fe1a771a768acc67a9ab8b3ea184fc724bae +Subproject commit 2d009e6420462f8de68db42906fe1f4f4931c3fd diff --git a/work/CraftBukkit b/work/CraftBukkit index e1188ed3a2..f3b2b22103 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit e1188ed3a2f295cba417e59645ca22c97b4587a4 +Subproject commit f3b2b2210362d2f322fe1999e96453bc4abb98a4 diff --git a/work/Spigot b/work/Spigot index 81b9def3c8..723951c3cf 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 81b9def3c89c26289118ed0e43ec4df167edd56c +Subproject commit 723951c3cf8cf3bb6721b3da29cd262f642fbfb1