diff --git a/README.md b/README.md index 81900c34ce..07949c622e 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ How To (Plugin Developers) io.papermc.paper paper-api - 1.19.2-R0.1-SNAPSHOT + 1.19.3-R0.1-SNAPSHOT provided ``` @@ -54,7 +54,7 @@ repositories { } dependencies { - compileOnly("io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT") } java { diff --git a/build.gradle.kts b/build.gradle.kts index 4984b4b877..443c5ec79d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -61,7 +61,7 @@ repositories { } dependencies { - paramMappings("net.fabricmc:yarn:1.19.2+build.28:mergedv2") + paramMappings("net.fabricmc:yarn:1.19.3+build.1:mergedv2") remapper("net.fabricmc:tiny-remapper:0.8.6:fat") decompiler("net.minecraftforge:forgeflower:1.5.605.7") spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6") @@ -133,7 +133,7 @@ allprojects { tasks.collectAtsFromPatches { // Uncomment while updating for a new Minecraft version - // extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server")) + extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server")) } tasks.register("printMinecraftVersion") { diff --git a/gradle.properties b/gradle.properties index d2cf8c41f7..0c899c224a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ group=io.papermc.paper -version=1.19.2-R0.1-SNAPSHOT -mcVersion=1.19.2 +version=1.19.3-R0.1-SNAPSHOT +mcVersion=1.19.3 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch index 11e12cc29e..a815082dfe 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..e1e7c0ff7edcc5865e81d458795755649837d7fc +index 0000000000000000000000000000000000000000..9686f621c7b837a7a38ffb2fea10ae492b18556d --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,81 @@ @@ -43,8 +43,8 @@ index 0000000000000000000000000000000000000000..e1e7c0ff7edcc5865e81d45879575564 + +dependencies { + // api dependencies are listed transitively to API consumers -+ api("com.google.guava:guava:31.0.1-jre") -+ api("com.google.code.gson:gson:2.8.9") ++ 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") + @@ -114,7 +114,7 @@ index 0000000000000000000000000000000000000000..e1e7c0ff7edcc5865e81d45879575564 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index becaae6cc840ee2ac49853e41d86087bc0e893a8..0000000000000000000000000000000000000000 +index 389f3761876d2a667309d317d1a99b545f36771a..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null @@ -1,252 +0,0 @@ @@ -125,7 +125,7 @@ index becaae6cc840ee2ac49853e41d86087bc0e893a8..00000000000000000000000000000000 - - org.spigotmc - spigot-api -- 1.19.2-R0.1-SNAPSHOT +- 1.19.3-R0.1-SNAPSHOT - jar - - Spigot-API @@ -155,14 +155,14 @@ index becaae6cc840ee2ac49853e41d86087bc0e893a8..00000000000000000000000000000000 - - com.google.guava - guava -- 31.0.1-jre +- 31.1-jre - compile - - - - com.google.code.gson - gson -- 2.8.9 +- 2.10 - compile - - diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch index fd42c769ba..f56de5eb15 100644 --- a/patches/api/0002-Build-system-changes.patch +++ b/patches/api/0002-Build-system-changes.patch @@ -5,11 +5,11 @@ Subject: [PATCH] Build system changes diff --git a/build.gradle.kts b/build.gradle.kts -index e1e7c0ff7edcc5865e81d458795755649837d7fc..fc6cd4fcab1b7430cb3d5c66e386bf4ea6e8f599 100644 +index 9686f621c7b837a7a38ffb2fea10ae492b18556d..2b3288057d67e5add4e22e6b7072527057bcd808 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,15 +14,27 @@ dependencies { - api("com.google.code.gson:gson:2.8.9") + api("com.google.code.gson:gson:2.10") api("net.md-5:bungeecord-chat:1.16-R0.4") api("org.yaml:snakeyaml:1.33") + // Paper start diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch index 692bddd2f2..7ad98abbcd 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 f4b289d92892003bcc254a65cefe4d73c368aa55..3320666626cdadefc045331d33c3e9e9741344fc 100644 +index c2928c6f2d54de0ffde164fd9407085cf9fa18a6..ab62ed5c6767d0a858583af795018a82c94d2fc3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,17 +8,37 @@ java { @@ -29,8 +29,8 @@ index f4b289d92892003bcc254a65cefe4d73c368aa55..3320666626cdadefc045331d33c3e9e9 + dependencies { // api dependencies are listed transitively to API consumers - api("com.google.guava:guava:31.0.1-jre") - api("com.google.code.gson:gson:2.8.9") + 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("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.6") // Paper api("org.yaml:snakeyaml:1.33") @@ -735,7 +735,7 @@ index 0000000000000000000000000000000000000000..6e94562d79206d88b74b53814f9423f1 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b7066d6cad3 100644 +index 446e4d21c5b9b624e633875df62160a7351517d9..0084898567e8bb74fa271b65b56523a5c26d387c 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -358,7 +358,9 @@ public final class Bukkit { @@ -748,7 +748,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70 public static int broadcastMessage(@NotNull String message) { return server.broadcastMessage(message); } -@@ -1072,6 +1074,19 @@ public final class Bukkit { +@@ -1074,6 +1076,19 @@ public final class Bukkit { server.shutdown(); } @@ -768,7 +768,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70 /** * Broadcasts the specified message to every user with the given * permission name. -@@ -1081,6 +1096,21 @@ public final class Bukkit { +@@ -1083,6 +1098,21 @@ public final class Bukkit { * permissibles} must have to receive the broadcast * @return number of message recipients */ @@ -790,7 +790,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70 public static int broadcast(@NotNull String message, @NotNull String permission) { return server.broadcast(message, permission); } -@@ -1319,6 +1349,7 @@ public final class Bukkit { +@@ -1321,6 +1351,7 @@ public final class Bukkit { return server.createInventory(owner, type); } @@ -798,7 +798,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70 /** * Creates an empty inventory with the specified type and title. If the type * is {@link InventoryType#CHEST}, the new inventory has a size of 27; -@@ -1344,6 +1375,38 @@ public final class Bukkit { +@@ -1346,6 +1377,38 @@ public final class Bukkit { * @see InventoryType#isCreatable() */ @NotNull @@ -837,7 +837,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70 public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) { return server.createInventory(owner, type, title); } -@@ -1362,6 +1425,7 @@ public final class Bukkit { +@@ -1364,6 +1427,7 @@ public final class Bukkit { return server.createInventory(owner, size); } @@ -845,7 +845,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70 /** * Creates an empty inventory of type {@link InventoryType#CHEST} with the * specified size and title. -@@ -1374,10 +1438,30 @@ public final class Bukkit { +@@ -1376,10 +1440,30 @@ public final class Bukkit { * @throws IllegalArgumentException if the size is not a multiple of 9 */ @NotNull @@ -876,7 +876,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70 /** * Creates an empty merchant. * -@@ -1385,7 +1469,20 @@ public final class Bukkit { +@@ -1387,7 +1471,20 @@ public final class Bukkit { * when the merchant inventory is viewed * @return a new merchant */ @@ -897,7 +897,7 @@ index 72143df182e55b70726b066b6b276021c1f4f4d7..c800da7aba43de995682eb724ccf8b70 public static Merchant createMerchant(@Nullable String title) { return server.createMerchant(title); } -@@ -1502,22 +1599,47 @@ public final class Bukkit { +@@ -1504,22 +1601,47 @@ public final class Bukkit { return server.isPrimaryThread(); } @@ -1070,7 +1070,7 @@ index 803fa0019869127ee8c7e4fb1777a59c43e66f8a..c65f0d6569c130b4920a9e71ad24af64 + // Paper end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe3580854fd5 100644 +index 52dd3148ae2a3480982593dc627ef7eede52bc5a..892e03189957b0072827be4fd485dd98352334e8 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -59,13 +59,13 @@ import org.jetbrains.annotations.Nullable; @@ -1108,7 +1108,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35 public int broadcastMessage(@NotNull String message); /** -@@ -911,8 +913,33 @@ public interface Server extends PluginMessageRecipient { +@@ -913,8 +915,33 @@ public interface Server extends PluginMessageRecipient { * @param permission the required permission {@link Permissible * permissibles} must have to receive the broadcast * @return number of message recipients @@ -1142,7 +1142,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35 /** * Gets the player by the given name, regardless if they are offline or -@@ -1110,6 +1137,7 @@ public interface Server extends PluginMessageRecipient { +@@ -1112,6 +1139,7 @@ public interface Server extends PluginMessageRecipient { @NotNull Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type); @@ -1150,7 +1150,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35 /** * Creates an empty inventory with the specified type and title. If the type * is {@link InventoryType#CHEST}, the new inventory has a size of 27; -@@ -1135,6 +1163,36 @@ public interface Server extends PluginMessageRecipient { +@@ -1137,6 +1165,36 @@ public interface Server extends PluginMessageRecipient { * @see InventoryType#isCreatable() */ @NotNull @@ -1187,7 +1187,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35 Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title); /** -@@ -1149,6 +1207,22 @@ public interface Server extends PluginMessageRecipient { +@@ -1151,6 +1209,22 @@ public interface Server extends PluginMessageRecipient { @NotNull Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException; @@ -1210,7 +1210,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35 /** * Creates an empty inventory of type {@link InventoryType#CHEST} with the * specified size and title. -@@ -1159,10 +1233,13 @@ public interface Server extends PluginMessageRecipient { +@@ -1161,10 +1235,13 @@ public interface Server extends PluginMessageRecipient { * viewed * @return a new inventory * @throws IllegalArgumentException if the size is not a multiple of 9 @@ -1224,7 +1224,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35 /** * Creates an empty merchant. * -@@ -1170,7 +1247,18 @@ public interface Server extends PluginMessageRecipient { +@@ -1172,7 +1249,18 @@ public interface Server extends PluginMessageRecipient { * when the merchant inventory is viewed * @return a new merchant */ @@ -1243,7 +1243,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35 Merchant createMerchant(@Nullable String title); /** -@@ -1266,20 +1354,41 @@ public interface Server extends PluginMessageRecipient { +@@ -1268,20 +1356,41 @@ public interface Server extends PluginMessageRecipient { */ boolean isPrimaryThread(); @@ -1285,7 +1285,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35 String getShutdownMessage(); /** -@@ -1661,7 +1770,9 @@ public interface Server extends PluginMessageRecipient { +@@ -1663,7 +1772,9 @@ public interface Server extends PluginMessageRecipient { * Sends the component to the player * * @param component the components to send @@ -1295,7 +1295,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35 public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -1670,7 +1781,9 @@ public interface Server extends PluginMessageRecipient { +@@ -1672,7 +1783,9 @@ public interface Server extends PluginMessageRecipient { * Sends an array of components as a single message to the player * * @param components the components to send @@ -1306,7 +1306,7 @@ index c0a3b44c728ec98ecce4d1e71746747d87582aa9..4d5c3af2e1f0030aa7415fbe9d11fe35 throw new UnsupportedOperationException("Not supported yet."); } diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java -index 21b95d404fbdf7f972f8a13ecd07dc28481f2286..da844079a9d3efd1a92c892de79fc7b3aeecaf4b 100644 +index 6b360758cd4cb02145f18ce743b51f91a471a650..bf8eea5464f4b09198e7b621419a3adade9f4601 100644 --- a/src/main/java/org/bukkit/Sound.java +++ b/src/main/java/org/bukkit/Sound.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; @@ -1318,7 +1318,7 @@ index 21b95d404fbdf7f972f8a13ecd07dc28481f2286..da844079a9d3efd1a92c892de79fc7b3 AMBIENT_BASALT_DELTAS_ADDITIONS("ambient.basalt_deltas.additions"), AMBIENT_BASALT_DELTAS_LOOP("ambient.basalt_deltas.loop"), -@@ -1345,4 +1345,12 @@ public enum Sound implements Keyed { +@@ -1416,4 +1416,12 @@ public enum Sound implements Keyed { public NamespacedKey getKey() { return key; } @@ -2689,10 +2689,10 @@ index 3c2ea8fec3a748cab7f5ad9100d12bd8213ec6c9..7941c60b0e1840785ba2b250071591bd * Gets how much EXP the Player should have at respawn. *

diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java -index 441362d2fbdc9413ed64a1f00b50fb6d06327e79..e1e7f45fd0f65d0874dd0698da436c7ac2e7951b 100644 +index 21ef4150d41a57fdc4f405fea1f578448f0c860b..b917c13a30254a83cc2ea87279d427276bc75074 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java -@@ -140,6 +140,18 @@ public enum InventoryType { +@@ -144,6 +144,18 @@ public enum InventoryType { private final String title; private final boolean isCreatable; @@ -2711,7 +2711,7 @@ index 441362d2fbdc9413ed64a1f00b50fb6d06327e79..e1e7f45fd0f65d0874dd0698da436c7a private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle) { this(defaultSize, defaultTitle, true); } -@@ -148,6 +160,7 @@ public enum InventoryType { +@@ -152,6 +164,7 @@ public enum InventoryType { size = defaultSize; title = defaultTitle; this.isCreatable = isCreatable; @@ -2719,7 +2719,7 @@ index 441362d2fbdc9413ed64a1f00b50fb6d06327e79..e1e7f45fd0f65d0874dd0698da436c7a } public int getDefaultSize() { -@@ -155,6 +168,7 @@ public enum InventoryType { +@@ -159,6 +172,7 @@ public enum InventoryType { } @NotNull @@ -3501,55 +3501,53 @@ index 03bfca9d368bbe4b7c1353d52c883e756bf69bda..943d324435350d3f16fad3e21cb472a0 /** diff --git a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java -index cf13380b23b70edb73b5879397b64b24a1088729..77173e1ca3ce972632608c620aa1a2fffed27e04 100644 +index 5adbe0514129abf3cfbc4b29a213f522359fe2e1..732d8d0436dc76cff33394b43452ff8f7a9b7fab 100644 --- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java +++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java -@@ -23,7 +23,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable +@@ -22,7 +22,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable + private static final HandlerList handlers = new HandlerList(); private final String hostname; private final InetAddress address; - private final boolean shouldSendChatPreviews; - private String motd; + private net.kyori.adventure.text.Component motd; // Paper private final int numPlayers; private int maxPlayers; -@@ -37,7 +37,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable +@@ -31,7 +31,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable Preconditions.checkArgument(numPlayers >= 0, "Cannot have negative number of players online", numPlayers); this.hostname = hostname; this.address = address; - this.motd = motd; + this.motd = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(motd); // Paper - this.shouldSendChatPreviews = shouldSendChatPreviews; this.numPlayers = numPlayers; this.maxPlayers = maxPlayers; -@@ -58,16 +58,83 @@ public class ServerListPingEvent extends ServerEvent implements Iterable + } +@@ -45,15 +45,80 @@ public class ServerListPingEvent extends ServerEvent implements Iterable + * @param address the address of the pinger * @param motd the message of the day - * @param shouldSendChatPreviews if the server should send chat previews * @param maxPlayers the max number of players -+ * @deprecated in favour of {@link #ServerListPingEvent(String, java.net.InetAddress, net.kyori.adventure.text.Component, boolean, int)} ++ * @deprecated in favour of {@link #ServerListPingEvent(String, java.net.InetAddress, net.kyori.adventure.text.Component, int)} */ + @Deprecated // Paper - protected ServerListPingEvent(@NotNull final String hostname, @NotNull final InetAddress address, @NotNull final String motd, boolean shouldSendChatPreviews, final int maxPlayers) { + protected ServerListPingEvent(@NotNull final String hostname, @NotNull final InetAddress address, @NotNull final String motd, final int maxPlayers) { super(true); this.numPlayers = MAGIC_PLAYER_COUNT; this.hostname = hostname; this.address = address; + this.motd = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(motd); // Paper -+ this.shouldSendChatPreviews = shouldSendChatPreviews; + this.maxPlayers = maxPlayers; + } + // Paper start + @Deprecated -+ public ServerListPingEvent(@NotNull final InetAddress address, @NotNull final net.kyori.adventure.text.Component motd, boolean shouldSendChatPreviews, final int numPlayers, final int maxPlayers) { -+ this("", address, motd, shouldSendChatPreviews, numPlayers, maxPlayers); ++ public ServerListPingEvent(@NotNull final InetAddress address, @NotNull final net.kyori.adventure.text.Component motd, final int numPlayers, final int maxPlayers) { ++ this("", address, motd, numPlayers, maxPlayers); + } -+ public ServerListPingEvent(@NotNull final String hostname, @NotNull final InetAddress address, @NotNull final net.kyori.adventure.text.Component motd, boolean shouldSendChatPreviews, final int numPlayers, final int maxPlayers) { ++ public ServerListPingEvent(@NotNull final String hostname, @NotNull final InetAddress address, @NotNull final net.kyori.adventure.text.Component motd, final int numPlayers, final int maxPlayers) { + super(true); + Preconditions.checkArgument(numPlayers >= 0, "Cannot have negative number of players online (%s)", numPlayers); + this.hostname = hostname; + this.address = address; this.motd = motd; - this.shouldSendChatPreviews = shouldSendChatPreviews; + this.numPlayers = numPlayers; this.maxPlayers = maxPlayers; } @@ -3561,11 +3559,11 @@ index cf13380b23b70edb73b5879397b64b24a1088729..77173e1ca3ce972632608c620aa1a2ff + * @param address the address of the pinger + * @param motd the message of the day + * @param maxPlayers the max number of players -+ * @deprecated in favour of {@link #ServerListPingEvent(String, java.net.InetAddress, net.kyori.adventure.text.Component, boolean, int)} ++ * @deprecated in favour of {@link #ServerListPingEvent(String, java.net.InetAddress, net.kyori.adventure.text.Component, int)} + */ + @Deprecated -+ protected ServerListPingEvent(@NotNull final InetAddress address, @NotNull final net.kyori.adventure.text.Component motd, boolean shouldSendChatPreviews, final int maxPlayers) { -+ this("", address, motd, shouldSendChatPreviews, maxPlayers); ++ protected ServerListPingEvent(@NotNull final InetAddress address, @NotNull final net.kyori.adventure.text.Component motd, final int maxPlayers) { ++ this("", address, motd, maxPlayers); + } + + /** @@ -3578,12 +3576,11 @@ index cf13380b23b70edb73b5879397b64b24a1088729..77173e1ca3ce972632608c620aa1a2ff + * @param motd the message of the day + * @param maxPlayers the max number of players + */ -+ protected ServerListPingEvent(final @NotNull String hostname, final @NotNull InetAddress address, final @NotNull net.kyori.adventure.text.Component motd, final boolean shouldSendChatPreviews, final int maxPlayers) { ++ protected ServerListPingEvent(final @NotNull String hostname, final @NotNull InetAddress address, final @NotNull net.kyori.adventure.text.Component motd, final int maxPlayers) { + this.numPlayers = MAGIC_PLAYER_COUNT; + this.hostname = hostname; + this.address = address; + this.motd = motd; -+ this.shouldSendChatPreviews = shouldSendChatPreviews; + this.maxPlayers = maxPlayers; + } + /** @@ -3606,7 +3603,7 @@ index cf13380b23b70edb73b5879397b64b24a1088729..77173e1ca3ce972632608c620aa1a2ff /** * Gets the hostname that the player used to connect to the server, or -@@ -94,19 +161,23 @@ public class ServerListPingEvent extends ServerEvent implements Iterable +@@ -80,19 +145,23 @@ public class ServerListPingEvent extends ServerEvent implements Iterable * Get the message of the day message. * * @return the message of the day diff --git a/patches/api/0007-Timings-v2.patch b/patches/api/0007-Timings-v2.patch index 59277e9e04..9303d3c156 100644 --- a/patches/api/0007-Timings-v2.patch +++ b/patches/api/0007-Timings-v2.patch @@ -2791,7 +2791,7 @@ index 0000000000000000000000000000000000000000..5989ee21297935651b0edd44b8239e65 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index c800da7aba43de995682eb724ccf8b7066d6cad3..557cf1ff29e16fa942545ceca14696c2a50b2d4d 100644 +index 0084898567e8bb74fa271b65b56523a5c26d387c..e24589a4cb42b0163e4a1455b8b11d7130b5cd41 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -802,7 +802,6 @@ public final class Bukkit { @@ -2803,10 +2803,10 @@ index c800da7aba43de995682eb724ccf8b7066d6cad3..557cf1ff29e16fa942545ceca14696c2 /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 4d5c3af2e1f0030aa7415fbe9d11fe3580854fd5..a2ae6b84fe20e43292f1442401a472dcce1600ec 100644 +index 892e03189957b0072827be4fd485dd98352334e8..ac087402c90dad4b3c499fcf8507e50e9099cea5 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1766,6 +1766,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1768,6 +1768,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi throw new UnsupportedOperationException("Not supported yet."); } diff --git a/patches/api/0010-Add-getTPS-method.patch b/patches/api/0010-Add-getTPS-method.patch index 71a488925f..978f773c66 100644 --- a/patches/api/0010-Add-getTPS-method.patch +++ b/patches/api/0010-Add-getTPS-method.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add getTPS method diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index a5c02f744664248f46aa35452318b6a728cd4afd..3603bcdadeea10f2babe8d6c609d7eaee3f0f89c 100644 +index 71a09ed2b9863d2d339967f41ab6373ec27429d3..397f57f0ab4844fb88c60681bf6e6e3db8a98945 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1889,6 +1889,17 @@ public final class Bukkit { +@@ -1891,6 +1891,17 @@ public final class Bukkit { return server.getEntity(uuid); } @@ -27,10 +27,10 @@ index a5c02f744664248f46aa35452318b6a728cd4afd..3603bcdadeea10f2babe8d6c609d7eae * Get the advancement specified by this key. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index da13ae75ca1892c21a35aff02f92b91783a868bf..36f5e47ffcdce23b0b5594881fdd49a3a3337578 100644 +index a4f8035b40eebff8afe01788781128b04247f28c..3f3531e208472a0e76f76e2b1a08a699527cef8f 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1603,6 +1603,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1605,6 +1605,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @Nullable Entity getEntity(@NotNull UUID uuid); diff --git a/patches/api/0018-Expose-server-CommandMap.patch b/patches/api/0018-Expose-server-CommandMap.patch index b491f0f613..02a4a3417a 100644 --- a/patches/api/0018-Expose-server-CommandMap.patch +++ b/patches/api/0018-Expose-server-CommandMap.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 3603bcdadeea10f2babe8d6c609d7eaee3f0f89c..5475f7df443a31e839d353e251b0d9d55e53a84f 100644 +index 397f57f0ab4844fb88c60681bf6e6e3db8a98945..1035ce181415a19f8d6460f70d3d900e3f7017d3 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2090,6 +2090,19 @@ public final class Bukkit { +@@ -2092,6 +2092,19 @@ public final class Bukkit { return server.getUnsafe(); } @@ -29,10 +29,10 @@ index 3603bcdadeea10f2babe8d6c609d7eaee3f0f89c..5475f7df443a31e839d353e251b0d9d5 public static Server.Spigot spigot() { return server.spigot(); diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 36f5e47ffcdce23b0b5594881fdd49a3a3337578..2dac2c6e01b4f230750605ab1f49317927705c6b 100644 +index 3f3531e208472a0e76f76e2b1a08a699527cef8f..6a7b91af3e738613cf79c13e2844efe9a2efd254 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1613,6 +1613,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1615,6 +1615,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi public double[] getTPS(); // Paper end diff --git a/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch index 52b78c56c4..9f6ec05cf3 100644 --- a/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch +++ b/patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 7a8eaf46ecd37163dbe34beb2cf8754bddae302f..9463169bdb45a53ad774a0e3a5ec07704508685f 100644 +index 316146305465b68b703e898206745de94ad5350f..6311d7ef36b3c6922c73695c353c561c507f2128 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2125,6 +2125,13 @@ public final class Bukkit { +@@ -2127,6 +2127,13 @@ public final class Bukkit { public static org.bukkit.command.CommandMap getCommandMap() { return server.getCommandMap(); } @@ -24,10 +24,10 @@ index 7a8eaf46ecd37163dbe34beb2cf8754bddae302f..9463169bdb45a53ad774a0e3a5ec0770 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 1aed052ea337f2875b581064bd8e79d8a5a1a9ec..cd51a1a9a59cfa868237ab750d98d9df8464152f 100644 +index bef555b3de44fed312b45a5d5cd811b18fda88c8..994f494fe7cace5c88738858def4051788391a3c 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1874,4 +1874,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1876,4 +1876,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull Spigot spigot(); // Spigot end diff --git a/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch index 6e73474e0f..5be01c94c3 100644 --- a/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch +++ b/patches/api/0042-Allow-Reloading-of-Command-Aliases.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 9463169bdb45a53ad774a0e3a5ec07704508685f..fe5f6494fb0610dd11e59793701b2182fa862419 100644 +index 6311d7ef36b3c6922c73695c353c561c507f2128..a314ff1363cb527fa7e1b366f9191939e9c7ca6e 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2132,6 +2132,15 @@ public final class Bukkit { +@@ -2134,6 +2134,15 @@ public final class Bukkit { public static void reloadPermissions() { server.reloadPermissions(); } @@ -26,10 +26,10 @@ index 9463169bdb45a53ad774a0e3a5ec07704508685f..fe5f6494fb0610dd11e59793701b2182 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index cd51a1a9a59cfa868237ab750d98d9df8464152f..29e71b746adcec45657787bf38427027508b0043 100644 +index 994f494fe7cace5c88738858def4051788391a3c..610475aff60b7f19c4bedb932985c736fb890684 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1876,4 +1876,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1878,4 +1878,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi // Spigot end void reloadPermissions(); // Paper diff --git a/patches/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch index 96389ab056..3053e5bf28 100644 --- a/patches/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/patches/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index fe5f6494fb0610dd11e59793701b2182fa862419..05908e512b0f2c01124737cf68df79c6c04518ee 100644 +index a314ff1363cb527fa7e1b366f9191939e9c7ca6e..d3d8c5ac59cee2ec24e91223e0c994016a4f9752 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2141,6 +2141,16 @@ public final class Bukkit { +@@ -2143,6 +2143,16 @@ public final class Bukkit { public static boolean reloadCommandAliases() { return server.reloadCommandAliases(); } @@ -27,10 +27,10 @@ index fe5f6494fb0610dd11e59793701b2182fa862419..05908e512b0f2c01124737cf68df79c6 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 29e71b746adcec45657787bf38427027508b0043..f84c37ad591f4d0e4062889941791a3aeb7c5be5 100644 +index 610475aff60b7f19c4bedb932985c736fb890684..a8d3addae5b0ed261d6a27052ad4e54970de597c 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1878,4 +1878,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1880,4 +1880,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi void reloadPermissions(); // Paper boolean reloadCommandAliases(); // Paper diff --git a/patches/api/0054-Fix-upstream-javadocs.patch b/patches/api/0054-Fix-upstream-javadocs.patch index 9141a754dc..4562c30b86 100644 --- a/patches/api/0054-Fix-upstream-javadocs.patch +++ b/patches/api/0054-Fix-upstream-javadocs.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Fix upstream javadocs Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 05908e512b0f2c01124737cf68df79c6c04518ee..2ff65157d511108e2902838f37732742b186af6e 100644 +index d3d8c5ac59cee2ec24e91223e0c994016a4f9752..82757d3013e01a6bfbb685929955d3e7dad8508c 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1332,6 +1332,8 @@ public final class Bukkit { +@@ -1334,6 +1334,8 @@ public final class Bukkit { /** * Gets every player that has ever played on this server. @@ -19,7 +19,7 @@ index 05908e512b0f2c01124737cf68df79c6c04518ee..2ff65157d511108e2902838f37732742 * @return an array containing all previous players */ diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index f84c37ad591f4d0e4062889941791a3aeb7c5be5..d9566b18e6109db824cbc1732666771bf124adbf 100644 +index a8d3addae5b0ed261d6a27052ad4e54970de597c..3485db7548e93242f99977a236eb3bcebedfb964 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -510,13 +510,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -37,7 +37,7 @@ index f84c37ad591f4d0e4062889941791a3aeb7c5be5..d9566b18e6109db824cbc1732666771b */ public int getTicksPerSpawns(@NotNull SpawnCategory spawnCategory); -@@ -1127,6 +1124,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1129,6 +1126,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi /** * Gets every player that has ever played on this server. diff --git a/patches/api/0058-Basic-PlayerProfile-API.patch b/patches/api/0058-Basic-PlayerProfile-API.patch index f5c412834d..16e4589015 100644 --- a/patches/api/0058-Basic-PlayerProfile-API.patch +++ b/patches/api/0058-Basic-PlayerProfile-API.patch @@ -321,10 +321,10 @@ index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 2ff65157d511108e2902838f37732742b186af6e..d5fd584c109c0a84a4259b10e7b43fae3a1da1ae 100644 +index 82757d3013e01a6bfbb685929955d3e7dad8508c..a6a792babe69712594c18f49542feb30ff591810 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2153,6 +2153,83 @@ public final class Bukkit { +@@ -2155,6 +2155,83 @@ public final class Bukkit { public static boolean suggestPlayerNamesWhenNullTabCompletions() { return server.suggestPlayerNamesWhenNullTabCompletions(); } @@ -409,10 +409,10 @@ index 2ff65157d511108e2902838f37732742b186af6e..d5fd584c109c0a84a4259b10e7b43fae @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index d9566b18e6109db824cbc1732666771bf124adbf..fab39e4fc595c022da27e87e27bd168939e54381 100644 +index 3485db7548e93242f99977a236eb3bcebedfb964..bf1102b4481b8c9b9c4f5ba0c561556b75fea077 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1886,5 +1886,74 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1888,5 +1888,74 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return true if player names should be suggested */ boolean suggestPlayerNamesWhenNullTabCompletions(); diff --git a/patches/api/0077-Display-warning-on-deprecated-recipe-API.patch b/patches/api/0077-Display-warning-on-deprecated-recipe-API.patch index 48352336bf..3d2b357c11 100644 --- a/patches/api/0077-Display-warning-on-deprecated-recipe-API.patch +++ b/patches/api/0077-Display-warning-on-deprecated-recipe-API.patch @@ -10,10 +10,10 @@ on the players login. Plugin authors need to define a key to keep it consistent between server restarts. diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index fde34da0f7a13dee06e479fd6c5350a69beb3c95..ad2ab6e97ccf6900d19f8bfbe08181d4c7743a99 100644 +index e57e600283702dd7fc60fa3baa1e1cc1b8574873..7be830ea0a3b24c5cdfb8e6ab62cb2ee506a4026 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -@@ -24,6 +24,7 @@ public class ShapedRecipe implements Recipe, Keyed { +@@ -26,6 +26,7 @@ public class ShapedRecipe implements Recipe, Keyed { public ShapedRecipe(@NotNull ItemStack result) { Preconditions.checkArgument(result.getType() != Material.AIR, "Recipe must have non-AIR result."); this.key = NamespacedKey.randomKey(); @@ -22,10 +22,10 @@ index fde34da0f7a13dee06e479fd6c5350a69beb3c95..ad2ab6e97ccf6900d19f8bfbe08181d4 } diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -index cc3f7cccfa06a92f3ca192cb88f30f8929c02dfd..75b47c608d0a902e4ea5f03c395667f47dec8980 100644 +index df4c52f1f0be2409c7506b09167bd58b5602fa7a..62675962d1b7882b953d2618aed1f363c046e97d 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -@@ -25,6 +25,7 @@ public class ShapelessRecipe implements Recipe, Keyed { +@@ -27,6 +27,7 @@ public class ShapelessRecipe implements Recipe, Keyed { public ShapelessRecipe(@NotNull ItemStack result) { Preconditions.checkArgument(result.getType() != Material.AIR, "Recipe must have non-AIR result."); this.key = NamespacedKey.randomKey(); diff --git a/patches/api/0091-Player.setPlayerProfile-API.patch b/patches/api/0091-Player.setPlayerProfile-API.patch index a8fad2d70d..edc236ceb3 100644 --- a/patches/api/0091-Player.setPlayerProfile-API.patch +++ b/patches/api/0091-Player.setPlayerProfile-API.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Player.setPlayerProfile API This can be useful for changing name or skins after a player has logged in. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index d5fd584c109c0a84a4259b10e7b43fae3a1da1ae..a452adcbf8657c501ad92f4cb361b551992f128f 100644 +index a6a792babe69712594c18f49542feb30ff591810..ec1af46667d8590ea218370249286f86652f3ac4 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1197,8 +1197,10 @@ public final class Bukkit { +@@ -1199,8 +1199,10 @@ public final class Bukkit { * @return the new PlayerProfile * @throws IllegalArgumentException if both the unique id is * null and the name is null or blank @@ -20,7 +20,7 @@ index d5fd584c109c0a84a4259b10e7b43fae3a1da1ae..a452adcbf8657c501ad92f4cb361b551 public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) { return server.createPlayerProfile(uniqueId, name); } -@@ -1209,8 +1211,10 @@ public final class Bukkit { +@@ -1211,8 +1213,10 @@ public final class Bukkit { * @param uniqueId the unique id * @return the new PlayerProfile * @throws IllegalArgumentException if the unique id is null @@ -31,7 +31,7 @@ index d5fd584c109c0a84a4259b10e7b43fae3a1da1ae..a452adcbf8657c501ad92f4cb361b551 public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) { return server.createPlayerProfile(uniqueId); } -@@ -1222,8 +1226,10 @@ public final class Bukkit { +@@ -1224,8 +1228,10 @@ public final class Bukkit { * @return the new PlayerProfile * @throws IllegalArgumentException if the name is null or * blank @@ -43,10 +43,10 @@ index d5fd584c109c0a84a4259b10e7b43fae3a1da1ae..a452adcbf8657c501ad92f4cb361b551 return server.createPlayerProfile(name); } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index fab39e4fc595c022da27e87e27bd168939e54381..e90056341407f58ff6ce2d9b80c8f3f64464e650 100644 +index bf1102b4481b8c9b9c4f5ba0c561556b75fea077..8539bac19bf9ba1a66689a9af90e088a03f9c152 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1015,8 +1015,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1017,8 +1017,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return the new PlayerProfile * @throws IllegalArgumentException if both the unique id is * null and the name is null or blank @@ -57,7 +57,7 @@ index fab39e4fc595c022da27e87e27bd168939e54381..e90056341407f58ff6ce2d9b80c8f3f6 PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name); /** -@@ -1025,8 +1027,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1027,8 +1029,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @param uniqueId the unique id * @return the new PlayerProfile * @throws IllegalArgumentException if the unique id is null @@ -68,7 +68,7 @@ index fab39e4fc595c022da27e87e27bd168939e54381..e90056341407f58ff6ce2d9b80c8f3f6 PlayerProfile createPlayerProfile(@NotNull UUID uniqueId); /** -@@ -1036,8 +1040,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1038,8 +1042,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return the new PlayerProfile * @throws IllegalArgumentException if the name is null or * blank diff --git a/patches/api/0155-Material-API-additions.patch b/patches/api/0155-Material-API-additions.patch index 9f13508f04..bbda411f80 100644 --- a/patches/api/0155-Material-API-additions.patch +++ b/patches/api/0155-Material-API-additions.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Material API additions diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 47d14a334c0f8d0918a2f08d5bf54f82370aaf44..666ed1075dad7c233c450f033d2309c748a2be26 100644 +index bcf746a611fbfa66b12b31a12710c423ba39d42c..cd09fa22e6322770bcb582ba00a384c5ca0fd8d8 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -109,6 +109,7 @@ import org.jetbrains.annotations.Nullable; +@@ -112,6 +112,7 @@ import org.jetbrains.annotations.Nullable; /** * An enum of all material IDs accepted by the official server and client */ @@ -16,7 +16,7 @@ index 47d14a334c0f8d0918a2f08d5bf54f82370aaf44..666ed1075dad7c233c450f033d2309c7 public enum Material implements Keyed { // AIR(9648, 0), -@@ -4113,6 +4114,22 @@ public enum Material implements Keyed { +@@ -4273,6 +4274,22 @@ public enum Material implements Keyed { } } diff --git a/patches/api/0163-Make-the-default-permission-message-configurable.patch b/patches/api/0163-Make-the-default-permission-message-configurable.patch index 780b707eab..2895285fe4 100644 --- a/patches/api/0163-Make-the-default-permission-message-configurable.patch +++ b/patches/api/0163-Make-the-default-permission-message-configurable.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Make the default permission message configurable diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 303e539338383d0d7825b873611ca5843ee1c0a3..00295e256c0def25dd3e552ef67eea06ab01ad15 100644 +index 6567da9e9c89f1995b9c3544b4dd767d66e6f5f2..c59700bcec0938bd5a0f10c4e0d5e3e2c446d622 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2193,6 +2193,28 @@ public final class Bukkit { +@@ -2195,6 +2195,28 @@ public final class Bukkit { return server.suggestPlayerNamesWhenNullTabCompletions(); } @@ -38,10 +38,10 @@ index 303e539338383d0d7825b873611ca5843ee1c0a3..00295e256c0def25dd3e552ef67eea06 * Creates a PlayerProfile for the specified uuid, with name as null. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index b0e6446c0dc49088878d7ae453dc3eee8b346f4e..dc26cf95f1769da76dd4d768a0912c1f5346d83e 100644 +index c46cae77e6a1d3f01b08ff03407eb1a564d000de..7e51025404bdc64e5eff48423280ad53244c6631 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1905,6 +1905,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1907,6 +1907,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ boolean suggestPlayerNamesWhenNullTabCompletions(); diff --git a/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch index 9517c3da01..90e6e08be5 100644 --- a/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch +++ b/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch @@ -9,10 +9,10 @@ Redirects some of upstream's APIs to these new methods to avoid usage of magic values and the deprecated RecipeChoice#getItemStack diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index ad2ab6e97ccf6900d19f8bfbe08181d4c7743a99..ecf8cd763ae600c11be6385ea6240e4d2c08abc9 100644 +index 7be830ea0a3b24c5cdfb8e6ab62cb2ee506a4026..baba8485587baab945add8bc91e91a1bfa27c84b 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -@@ -144,6 +144,13 @@ public class ShapedRecipe implements Recipe, Keyed { +@@ -146,6 +146,13 @@ public class ShapedRecipe implements Recipe, Keyed { return this; } @@ -27,10 +27,10 @@ index ad2ab6e97ccf6900d19f8bfbe08181d4c7743a99..ecf8cd763ae600c11be6385ea6240e4d * Get a copy of the ingredients map. * diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -index 75b47c608d0a902e4ea5f03c395667f47dec8980..7485da0de3712619b8d89d0b21f60fe20dafad6b 100644 +index 62675962d1b7882b953d2618aed1f363c046e97d..61b3a1b1d03fe6cdacb82b07e6c7197f56b4a1b3 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -@@ -142,6 +142,40 @@ public class ShapelessRecipe implements Recipe, Keyed { +@@ -144,6 +144,40 @@ public class ShapelessRecipe implements Recipe, Keyed { return this; } @@ -71,7 +71,7 @@ index 75b47c608d0a902e4ea5f03c395667f47dec8980..7485da0de3712619b8d89d0b21f60fe2 /** * Removes an ingredient from the list. * -@@ -165,7 +199,7 @@ public class ShapelessRecipe implements Recipe, Keyed { +@@ -167,7 +201,7 @@ public class ShapelessRecipe implements Recipe, Keyed { */ @NotNull public ShapelessRecipe removeIngredient(@NotNull Material ingredient) { @@ -80,7 +80,7 @@ index 75b47c608d0a902e4ea5f03c395667f47dec8980..7485da0de3712619b8d89d0b21f60fe2 } /** -@@ -192,7 +226,7 @@ public class ShapelessRecipe implements Recipe, Keyed { +@@ -194,7 +228,7 @@ public class ShapelessRecipe implements Recipe, Keyed { */ @NotNull public ShapelessRecipe removeIngredient(int count, @NotNull Material ingredient) { diff --git a/patches/api/0175-Fix-Spigot-annotation-mistakes.patch b/patches/api/0175-Fix-Spigot-annotation-mistakes.patch index e922e942d3..14eafe77a6 100644 --- a/patches/api/0175-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0175-Fix-Spigot-annotation-mistakes.patch @@ -9,10 +9,10 @@ a ton of noise to plugin developers. These do not help plugin developers if they bring moise noise than value. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 00295e256c0def25dd3e552ef67eea06ab01ad15..940e93021aba7dade1558054deead5896d74d3c6 100644 +index c59700bcec0938bd5a0f10c4e0d5e3e2c446d622..9abb50fb10bb2fbd21d5f31e54b135416cae3433 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1198,10 +1198,8 @@ public final class Bukkit { +@@ -1200,10 +1200,8 @@ public final class Bukkit { * @param name the name the player to retrieve * @return an offline player * @see #getOfflinePlayer(java.util.UUID) @@ -24,7 +24,7 @@ index 00295e256c0def25dd3e552ef67eea06ab01ad15..940e93021aba7dade1558054deead589 @NotNull public static OfflinePlayer getOfflinePlayer(@NotNull String name) { return server.getOfflinePlayer(name); -@@ -1750,7 +1748,7 @@ public final class Bukkit { +@@ -1752,7 +1750,7 @@ public final class Bukkit { * * @return the scoreboard manager or null if no worlds are loaded. */ @@ -79,10 +79,10 @@ index 57cb548683f7b2972c998afd34176952426f8b47..d4c87bfed81b2d73919705912f59fab0 if (this.world == null) { return null; diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 666ed1075dad7c233c450f033d2309c748a2be26..6eb0b9ba2b7ad5faba31220483c424203802e1d3 100644 +index cd09fa22e6322770bcb582ba00a384c5ca0fd8d8..a7d36ef22724f0ce3add61ab314e09e6465077d4 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4143,11 +4143,11 @@ public enum Material implements Keyed { +@@ -4303,11 +4303,11 @@ public enum Material implements Keyed { } /** @@ -96,7 +96,7 @@ index 666ed1075dad7c233c450f033d2309c748a2be26..6eb0b9ba2b7ad5faba31220483c42420 public boolean isLegacy() { return legacy; } -@@ -4218,8 +4218,10 @@ public enum Material implements Keyed { +@@ -4378,8 +4378,10 @@ public enum Material implements Keyed { * Gets the MaterialData class associated with this Material * * @return MaterialData associated with this Material @@ -159,10 +159,10 @@ index 6277451c3c6c551078c237cd767b6d70c4f585ea..10f5cfb1885833a1d2c1027c03974da4 CRACKED(0x0), GLYPHED(0x1), diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index dc26cf95f1769da76dd4d768a0912c1f5346d83e..8c608f9260acd8257b49f9befae510fa645886a8 100644 +index 7e51025404bdc64e5eff48423280ad53244c6631..60897ff659a468f80f6ddf554c8facb136ecb24b 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -999,10 +999,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1001,10 +1001,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @param name the name the player to retrieve * @return an offline player * @see #getOfflinePlayer(java.util.UUID) @@ -174,7 +174,7 @@ index dc26cf95f1769da76dd4d768a0912c1f5346d83e..8c608f9260acd8257b49f9befae510fa @NotNull public OfflinePlayer getOfflinePlayer(@NotNull String name); -@@ -1468,7 +1466,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1470,7 +1468,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * * @return the scoreboard manager or null if no worlds are loaded. */ @@ -552,10 +552,10 @@ index 0cc6e29a5af28e95f87f415d6b2424d4622a6f34..acba500393e1736e6081facac6ef9ab1 /** diff --git a/src/main/java/org/bukkit/inventory/CookingRecipe.java b/src/main/java/org/bukkit/inventory/CookingRecipe.java -index 6f251252aa96f202139103c657a81c71a0ffbfaf..e95ee930c4791c441c9b54b2c284f3da343eb376 100644 +index 571652ba8843a9493f1843523e24145baa958637..f7fa79393aef40027446b78bac8e9490cfafd8bc 100644 --- a/src/main/java/org/bukkit/inventory/CookingRecipe.java +++ b/src/main/java/org/bukkit/inventory/CookingRecipe.java -@@ -66,7 +66,9 @@ public abstract class CookingRecipe implements Recipe, +@@ -68,7 +68,9 @@ public abstract class CookingRecipe implements Recipe, * Get the input material. * * @return The input material. @@ -757,10 +757,10 @@ index 5461f7fa75f5a065bb333b4a113640b5fe1e3825..c4d657727e508cb941320730a9d3aa54 /** diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index ecf8cd763ae600c11be6385ea6240e4d2c08abc9..161e408bf90de7ca8c3ea418543d25ecccc35c48 100644 +index baba8485587baab945add8bc91e91a1bfa27c84b..038a82b865afee02380805bd1f3816149143c811 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -@@ -95,8 +95,10 @@ public class ShapedRecipe implements Recipe, Keyed { +@@ -97,8 +97,10 @@ public class ShapedRecipe implements Recipe, Keyed { * @param key The character that represents the ingredient in the shape. * @param ingredient The ingredient. * @return The changed recipe, so you can chain calls. @@ -771,7 +771,7 @@ index ecf8cd763ae600c11be6385ea6240e4d2c08abc9..161e408bf90de7ca8c3ea418543d25ec public ShapedRecipe setIngredient(char key, @NotNull MaterialData ingredient) { return setIngredient(key, ingredient.getItemType(), ingredient.getData()); } -@@ -155,7 +157,9 @@ public class ShapedRecipe implements Recipe, Keyed { +@@ -157,7 +159,9 @@ public class ShapedRecipe implements Recipe, Keyed { * Get a copy of the ingredients map. * * @return The mapping of character to ingredients. @@ -782,10 +782,10 @@ index ecf8cd763ae600c11be6385ea6240e4d2c08abc9..161e408bf90de7ca8c3ea418543d25ec public Map getIngredientMap() { HashMap result = new HashMap(); diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -index 7485da0de3712619b8d89d0b21f60fe20dafad6b..3c8423192f069f3c7690eee4e3080b3dc2e7acf8 100644 +index 61b3a1b1d03fe6cdacb82b07e6c7197f56b4a1b3..402eef14987f00d2a5fccc45f0b7e3b1c16706dc 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -@@ -54,8 +54,10 @@ public class ShapelessRecipe implements Recipe, Keyed { +@@ -56,8 +56,10 @@ public class ShapelessRecipe implements Recipe, Keyed { * * @param ingredient The ingredient to add. * @return The changed recipe, so you can chain calls. @@ -796,7 +796,7 @@ index 7485da0de3712619b8d89d0b21f60fe20dafad6b..3c8423192f069f3c7690eee4e3080b3d public ShapelessRecipe addIngredient(@NotNull MaterialData ingredient) { return addIngredient(1, ingredient); } -@@ -91,8 +93,10 @@ public class ShapelessRecipe implements Recipe, Keyed { +@@ -93,8 +95,10 @@ public class ShapelessRecipe implements Recipe, Keyed { * @param count How many to add (can't be more than 9!) * @param ingredient The ingredient to add. * @return The changed recipe, so you can chain calls. @@ -807,7 +807,7 @@ index 7485da0de3712619b8d89d0b21f60fe20dafad6b..3c8423192f069f3c7690eee4e3080b3d public ShapelessRecipe addIngredient(int count, @NotNull MaterialData ingredient) { return addIngredient(count, ingredient.getItemType(), ingredient.getData()); } -@@ -209,8 +213,10 @@ public class ShapelessRecipe implements Recipe, Keyed { +@@ -211,8 +215,10 @@ public class ShapelessRecipe implements Recipe, Keyed { * * @param ingredient The ingredient to remove * @return The changed recipe. @@ -818,7 +818,7 @@ index 7485da0de3712619b8d89d0b21f60fe20dafad6b..3c8423192f069f3c7690eee4e3080b3d public ShapelessRecipe removeIngredient(@NotNull MaterialData ingredient) { return removeIngredient(ingredient.getItemType(), ingredient.getData()); } -@@ -237,8 +243,10 @@ public class ShapelessRecipe implements Recipe, Keyed { +@@ -239,8 +245,10 @@ public class ShapelessRecipe implements Recipe, Keyed { * @param count The number of copies to remove. * @param ingredient The ingredient to remove. * @return The changed recipe. @@ -829,7 +829,7 @@ index 7485da0de3712619b8d89d0b21f60fe20dafad6b..3c8423192f069f3c7690eee4e3080b3d public ShapelessRecipe removeIngredient(int count, @NotNull MaterialData ingredient) { return removeIngredient(count, ingredient.getItemType(), ingredient.getData()); } -@@ -299,7 +307,9 @@ public class ShapelessRecipe implements Recipe, Keyed { +@@ -301,7 +309,9 @@ public class ShapelessRecipe implements Recipe, Keyed { * Get the list of ingredients used for this recipe. * * @return The input list @@ -840,7 +840,7 @@ index 7485da0de3712619b8d89d0b21f60fe20dafad6b..3c8423192f069f3c7690eee4e3080b3d public List getIngredientList() { ArrayList result = new ArrayList(ingredients.size()); diff --git a/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java b/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java -index d8ef781d6b025790ce9d2a9782e6ef2a47cc8e62..09806e5f7f01028baad2985406c3c1a43be459f8 100644 +index 07c3dff4d6190ef388d9c1e1c36f67f00a3e8e66..aa5e7f37d20d6976f33e04876ae625ed0e5b2b41 100644 --- a/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java +++ b/src/main/java/org/bukkit/inventory/StonecuttingRecipe.java @@ -57,7 +57,9 @@ public class StonecuttingRecipe implements Recipe, Keyed { diff --git a/patches/api/0183-Expose-the-internal-current-tick.patch b/patches/api/0183-Expose-the-internal-current-tick.patch index c8ae43d595..bc7b98793b 100644 --- a/patches/api/0183-Expose-the-internal-current-tick.patch +++ b/patches/api/0183-Expose-the-internal-current-tick.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 940e93021aba7dade1558054deead5896d74d3c6..d3f784c0c68567ee94befa57e0be1cedc7d586cb 100644 +index 9abb50fb10bb2fbd21d5f31e54b135416cae3433..75be5b6c2f01fa794ed4d69082d34ab0a422e8cb 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2289,6 +2289,10 @@ public final class Bukkit { +@@ -2291,6 +2291,10 @@ public final class Bukkit { public static com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name) { return server.createProfileExact(uuid, name); } @@ -20,10 +20,10 @@ index 940e93021aba7dade1558054deead5896d74d3c6..d3f784c0c68567ee94befa57e0be1ced @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 8c608f9260acd8257b49f9befae510fa645886a8..d092d43178c1795028c33518713a8156648c460b 100644 +index 60897ff659a468f80f6ddf554c8facb136ecb24b..2cd6826cb5d8e5b545644e063c0d67d68f2c1322 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1988,5 +1988,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1990,5 +1990,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name); diff --git a/patches/api/0189-Add-tick-times-API.patch b/patches/api/0189-Add-tick-times-API.patch index 3f4f81a1a3..c86c5399ab 100644 --- a/patches/api/0189-Add-tick-times-API.patch +++ b/patches/api/0189-Add-tick-times-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add tick times API diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index d3f784c0c68567ee94befa57e0be1cedc7d586cb..dab845c22713c0a3ae044afaf16d7b72eeff8ea5 100644 +index 75be5b6c2f01fa794ed4d69082d34ab0a422e8cb..18acd00146e073cfd7912b05c87cdcb124a9ff9f 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1961,6 +1961,25 @@ public final class Bukkit { +@@ -1963,6 +1963,25 @@ public final class Bukkit { public static double[] getTPS() { return server.getTPS(); } @@ -35,10 +35,10 @@ index d3f784c0c68567ee94befa57e0be1cedc7d586cb..dab845c22713c0a3ae044afaf16d7b72 /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index d092d43178c1795028c33518713a8156648c460b..13e4893049219ff1e50ede8df405561360ae4760 100644 +index 2cd6826cb5d8e5b545644e063c0d67d68f2c1322..38f9977e302322dc511214553bcd727ef08c14c5 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1650,6 +1650,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1652,6 +1652,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull public double[] getTPS(); diff --git a/patches/api/0190-Expose-MinecraftServer-isRunning.patch b/patches/api/0190-Expose-MinecraftServer-isRunning.patch index 7a9f4ee7d6..ff57b1d5fe 100644 --- a/patches/api/0190-Expose-MinecraftServer-isRunning.patch +++ b/patches/api/0190-Expose-MinecraftServer-isRunning.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index dab845c22713c0a3ae044afaf16d7b72eeff8ea5..4771149c9fcee5e51c5313fffb105ad6f68a256a 100644 +index 18acd00146e073cfd7912b05c87cdcb124a9ff9f..51a43429e58fbebf8c95d23257cd9c84ce57b1aa 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2312,6 +2312,15 @@ public final class Bukkit { +@@ -2314,6 +2314,15 @@ public final class Bukkit { public static int getCurrentTick() { return server.getCurrentTick(); } @@ -26,10 +26,10 @@ index dab845c22713c0a3ae044afaf16d7b72eeff8ea5..4771149c9fcee5e51c5313fffb105ad6 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 13e4893049219ff1e50ede8df405561360ae4760..201cbb0d33fc25e90b7960894eb6a9e6ef0d107b 100644 +index 38f9977e302322dc511214553bcd727ef08c14c5..122ef60bcb1548713f2e355cb77eccbebcd17f04 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2010,5 +2010,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2012,5 +2012,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return Current tick */ int getCurrentTick(); diff --git a/patches/api/0200-Add-Mob-Goal-API.patch b/patches/api/0200-Add-Mob-Goal-API.patch index d4f8ce75de..f3f71f0bc5 100644 --- a/patches/api/0200-Add-Mob-Goal-API.patch +++ b/patches/api/0200-Add-Mob-Goal-API.patch @@ -523,10 +523,10 @@ index 0000000000000000000000000000000000000000..8fd399f791b45eb7fc62693ca954eea0 + @Deprecated GoalKey UNIVERSAL_ANGER_RESET = GoalKey.of(Mob.class, NamespacedKey.minecraft("universal_anger_reset")); +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 022a3de1bc7969a1db7395a910782bde1468758a..f3f8a6db7ee1b4ea1aaf6bc972fa02a8af5f3772 100644 +index f4897529322f57eaf0d26ce82307dcd785511af8..93a74792837e6dcff354e5f0afb7aacd0a19f7e1 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2333,6 +2333,16 @@ public final class Bukkit { +@@ -2335,6 +2335,16 @@ public final class Bukkit { public static boolean isStopping() { return server.isStopping(); } @@ -544,10 +544,10 @@ index 022a3de1bc7969a1db7395a910782bde1468758a..f3f8a6db7ee1b4ea1aaf6bc972fa02a8 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 832b19712612fdbac5d2f472aab203b14f7e4a46..4f17bc607639bb3d20a1694ffb02d22d283348b3 100644 +index 97c2708b69ff01f9e7898ad7282016cac605bc79..cd3ce4155ff46d85d4c603a688dd96893400ed77 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2027,5 +2027,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2029,5 +2029,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return true if server is in the process of being shutdown */ boolean isStopping(); diff --git a/patches/api/0220-Add-methods-to-get-translation-keys.patch b/patches/api/0220-Add-methods-to-get-translation-keys.patch index 29e183af97..c9a54f742e 100644 --- a/patches/api/0220-Add-methods-to-get-translation-keys.patch +++ b/patches/api/0220-Add-methods-to-get-translation-keys.patch @@ -119,7 +119,7 @@ index 938c3217f92e6d3ef9a637269c469f8359af6347..ef49495909a37d718a87d5dfbcd644d4 /** diff --git a/src/main/java/org/bukkit/GameRule.java b/src/main/java/org/bukkit/GameRule.java -index dddc450e1372409c513bbedc0acfc80d9f749333..38a1b02c006af766b0c10ee65e9fc28f5a922774 100644 +index 0a66077d152a3c89fa7a277663969767798eb100..b02490737409eb80a2d2fb275c9a60b6078a8133 100644 --- a/src/main/java/org/bukkit/GameRule.java +++ b/src/main/java/org/bukkit/GameRule.java @@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable; @@ -131,7 +131,7 @@ index dddc450e1372409c513bbedc0acfc80d9f749333..38a1b02c006af766b0c10ee65e9fc28f private static Map> gameRules = new HashMap<>(); // Boolean rules -@@ -288,4 +288,11 @@ public final class GameRule { +@@ -314,4 +314,11 @@ public final class GameRule { public static GameRule[] values() { return gameRules.values().toArray(new GameRule[gameRules.size()]); } @@ -144,10 +144,10 @@ index dddc450e1372409c513bbedc0acfc80d9f749333..38a1b02c006af766b0c10ee65e9fc28f + // Paper end } diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 6eb0b9ba2b7ad5faba31220483c424203802e1d3..a4c7ff53b7e12e9d3ca649782008a4ce26a33f89 100644 +index a7d36ef22724f0ce3add61ab314e09e6465077d4..4d496c7c088a75b79a25e7397b47600a8c104cf4 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -110,7 +110,7 @@ import org.jetbrains.annotations.Nullable; +@@ -113,7 +113,7 @@ import org.jetbrains.annotations.Nullable; * An enum of all material IDs accepted by the official server and client */ @SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper @@ -156,7 +156,7 @@ index 6eb0b9ba2b7ad5faba31220483c424203802e1d3..a4c7ff53b7e12e9d3ca649782008a4ce // AIR(9648, 0), STONE(22948), -@@ -4128,6 +4128,23 @@ public enum Material implements Keyed { +@@ -4288,6 +4288,23 @@ public enum Material implements Keyed { } return false; } @@ -181,7 +181,7 @@ index 6eb0b9ba2b7ad5faba31220483c424203802e1d3..a4c7ff53b7e12e9d3ca649782008a4ce /** diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 7c74163031cd8b49b9fe98241356697fd06c54c5..b69e8210d6d7a534804af9ed1b877dab9d5bc139 100644 +index 5453b2ae459b2d5171ef7129c29891b721ee8e0b..b518720355d8a8dcd55cb755e4e1fa9fc3dfc52b 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -112,5 +112,34 @@ public interface UnsafeValues { @@ -326,7 +326,7 @@ index 4d5f0837bd0e02a30c943d8969fb6b13452322e0..a39f9c078f42451bd122f3e3729d10ca // Paper end } diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java -index e4a1dac898bb7f93e57c1fa35d0c29f5d95dfa66..032a252688b6dbefb05a0d4f91791e102bbae0cd 100644 +index df9d315cfaf968527fc8bc26dadd88f64a408cde..50d9442ffafdfabd4904dafae7daaeadcedee75b 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.Contract; @@ -338,7 +338,7 @@ index e4a1dac898bb7f93e57c1fa35d0c29f5d95dfa66..032a252688b6dbefb05a0d4f91791e10 // These strings MUST match the strings in nms.EntityTypes and are case sensitive. /** -@@ -424,4 +424,27 @@ public enum EntityType implements Keyed { +@@ -425,4 +425,27 @@ public enum EntityType implements Keyed { public boolean isAlive() { return living; } diff --git a/patches/api/0228-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0228-Add-getOfflinePlayerIfCached-String.patch index 1aebb14af4..aec446f2d9 100644 --- a/patches/api/0228-Add-getOfflinePlayerIfCached-String.patch +++ b/patches/api/0228-Add-getOfflinePlayerIfCached-String.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String) diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 2d26f1fd3bbbe95e7a73bb5ebc7d85c9e066c1ee..f1e1efaebfd9fe4399ff9d23c76f7dde6419ff71 100644 +index 6d98664f2da191c2327e80b8212c1ad979f7d6ac..ceb8d207843df5ddc852d44928286648a652eedb 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1228,6 +1228,27 @@ public final class Bukkit { +@@ -1230,6 +1230,27 @@ public final class Bukkit { return server.getOfflinePlayer(name); } @@ -37,10 +37,10 @@ index 2d26f1fd3bbbe95e7a73bb5ebc7d85c9e066c1ee..f1e1efaebfd9fe4399ff9d23c76f7dde * Gets the player by the given UUID, regardless if they are offline or * online. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 634a7e38987bc18232c07e5f767b37b523f13920..50542df291d90a667af119fb9fcc3db2535ae6b5 100644 +index 936ebaf531a76cab12809cfa334e2b0d89e625c3..02b898d441c42771903d5839c3cde544b1a25778 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1023,6 +1023,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1025,6 +1025,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull public OfflinePlayer getOfflinePlayer(@NotNull String name); diff --git a/patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch index b42db5d4db..e699063364 100644 --- a/patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch +++ b/patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add API to get Material from Boats and Minecarts diff --git a/src/main/java/org/bukkit/entity/Boat.java b/src/main/java/org/bukkit/entity/Boat.java -index e5d5d2c944df1e9a81b38d3854fbe70c166588d1..3e458b96d5c15a78d3d411d5b88a716213588a94 100644 +index ebab99bd0c4bc6ca19ba92ece93a5f903b38f9b3..fbe0a946d821e479fd3097021058d95732ace1b3 100644 --- a/src/main/java/org/bukkit/entity/Boat.java +++ b/src/main/java/org/bukkit/entity/Boat.java -@@ -173,4 +173,14 @@ public interface Boat extends Vehicle { +@@ -174,4 +174,14 @@ public interface Boat extends Vehicle { ON_LAND, IN_AIR; } diff --git a/patches/api/0260-Added-Vanilla-Entity-Tags.patch b/patches/api/0260-Added-Vanilla-Entity-Tags.patch index d7acec1bd1..83c95da0ff 100644 --- a/patches/api/0260-Added-Vanilla-Entity-Tags.patch +++ b/patches/api/0260-Added-Vanilla-Entity-Tags.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Added Vanilla Entity Tags diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index 60e98f0eb8028fc9dfb73320b2939a33435174c1..92bb9bbfb9181e9aa9edfe39ddbbfa54dab14df0 100644 +index 15699ee58e06880a508689f761ecfdb77d44d182..be5bb4210a11154013e2fc80653bf467ebdaf15f 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java -@@ -811,6 +811,44 @@ public interface Tag extends Keyed { +@@ -839,6 +839,44 @@ public interface Tag extends Keyed { * Vanilla tag representing entities which can be eaten by frogs. */ Tag ENTITY_TYPES_FROG_FOOD = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("frog_food"), EntityType.class); diff --git a/patches/api/0271-Cache-the-result-of-Material-isBlock.patch b/patches/api/0271-Cache-the-result-of-Material-isBlock.patch index b7c79e9f76..62e0c5fb00 100644 --- a/patches/api/0271-Cache-the-result-of-Material-isBlock.patch +++ b/patches/api/0271-Cache-the-result-of-Material-isBlock.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Cache the result of Material#isBlock diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index a4c7ff53b7e12e9d3ca649782008a4ce26a33f89..90367a01199ad90f0f10b977e214585a6e1ecf8a 100644 +index 4d496c7c088a75b79a25e7397b47600a8c104cf4..b1214775680099c8255b45ed0285568572f12895 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4072,6 +4072,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata +@@ -4232,6 +4232,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata public final Class data; private final boolean legacy; private final NamespacedKey key; @@ -16,7 +16,7 @@ index a4c7ff53b7e12e9d3ca649782008a4ce26a33f89..90367a01199ad90f0f10b977e214585a private Material(final int id) { this(id, 64); -@@ -4278,6 +4279,11 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata +@@ -4438,6 +4439,11 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata * @return true if this material is a block */ public boolean isBlock() { @@ -28,7 +28,7 @@ index a4c7ff53b7e12e9d3ca649782008a4ce26a33f89..90367a01199ad90f0f10b977e214585a switch (this) { // case ACACIA_BUTTON: -@@ -5394,6 +5400,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata +@@ -5593,6 +5599,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata static { for (Material material : values()) { BY_NAME.put(material.name(), material); diff --git a/patches/api/0277-Item-Rarity-API.patch b/patches/api/0277-Item-Rarity-API.patch index 11d8c94bf5..3e3fcac796 100644 --- a/patches/api/0277-Item-Rarity-API.patch +++ b/patches/api/0277-Item-Rarity-API.patch @@ -39,10 +39,10 @@ index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db202 + } +} diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 90367a01199ad90f0f10b977e214585a6e1ecf8a..f24f1d7a676f3b83ab05f655bd66b81b0069f88c 100644 +index b1214775680099c8255b45ed0285568572f12895..6fbbc3525574abd5189c9032f7d64dc55c0dfa80 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4146,6 +4146,17 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata +@@ -4306,6 +4306,17 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata public @NotNull String translationKey() { return Bukkit.getUnsafe().getTranslationKey(this); } @@ -61,7 +61,7 @@ index 90367a01199ad90f0f10b977e214585a6e1ecf8a..f24f1d7a676f3b83ab05f655bd66b81b /** diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 0fe8efe3f5d16768dde497693c3f098dffbd1584..50397eecc867810ad6a89ce740814592082ad99e 100644 +index b359a7bff658c4b3ff569e78e0751dc07437bb48..bc8e86f83423a0abdfe3516076636b02192e7501 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -163,5 +163,22 @@ public interface UnsafeValues { diff --git a/patches/api/0294-Add-basic-Datapack-API.patch b/patches/api/0294-Add-basic-Datapack-API.patch index a1a8c84460..21e9e273b8 100644 --- a/patches/api/0294-Add-basic-Datapack-API.patch +++ b/patches/api/0294-Add-basic-Datapack-API.patch @@ -70,10 +70,10 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7 + +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index db44d88bf169f59a759be165094876497487d756..d8e301befb37b540bc246cf58988923b0ab23375 100644 +index 197cf8cdd3d51c3e01ec737981601f37764315c6..b0d2d45ad2394313be752e92bc594095bfc93120 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2387,6 +2387,14 @@ public final class Bukkit { +@@ -2389,6 +2389,14 @@ public final class Bukkit { public static com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() { return server.getMobGoals(); } @@ -89,10 +89,10 @@ index db44d88bf169f59a759be165094876497487d756..d8e301befb37b540bc246cf58988923b @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 723057dcc769bd29acdb82561ee0126ed467579d..16f631fdde4b63e0ed3162486dba684697bdffa7 100644 +index 1a3b4f20c7126caf8a34040028f735083bf47150..a11d02cc17b1e9bea06ab61cd3ae21c3c41aaceb 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2074,5 +2074,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2076,5 +2076,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull com.destroystokyo.paper.entity.ai.MobGoals getMobGoals(); diff --git a/patches/api/0302-Attributes-API-for-item-defaults.patch b/patches/api/0302-Attributes-API-for-item-defaults.patch index 0436e90167..fb2164214c 100644 --- a/patches/api/0302-Attributes-API-for-item-defaults.patch +++ b/patches/api/0302-Attributes-API-for-item-defaults.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Attributes API for item defaults diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index f24f1d7a676f3b83ab05f655bd66b81b0069f88c..163c3ed1974e50376b7c2b2805df283322d41777 100644 +index 6fbbc3525574abd5189c9032f7d64dc55c0dfa80..bdc51797e3e3c8ffb1db842e29ddb86beeec48ec 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4157,6 +4157,21 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata +@@ -4317,6 +4317,21 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata public io.papermc.paper.inventory.ItemRarity getItemRarity() { return Bukkit.getUnsafe().getItemRarity(this); } @@ -31,7 +31,7 @@ index f24f1d7a676f3b83ab05f655bd66b81b0069f88c..163c3ed1974e50376b7c2b2805df2833 /** diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 55e09755499cc49ecb9068fec2ff60c8258af587..d71e2ef9b9274bfcf8d9885d1583dcb310849c43 100644 +index 6f4e02065bcb4130f5a30de01f3adbe3513c1d70..4e3eac5f06a6ded0f152f1744fcebfeef6b48814 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -191,6 +191,18 @@ public interface UnsafeValues { diff --git a/patches/api/0329-Get-entity-default-attributes.patch b/patches/api/0329-Get-entity-default-attributes.patch index 595c3ab5a3..b4b4a952ea 100644 --- a/patches/api/0329-Get-entity-default-attributes.patch +++ b/patches/api/0329-Get-entity-default-attributes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Get entity default attributes diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index d71e2ef9b9274bfcf8d9885d1583dcb310849c43..7bd7bdf756f780752a127a786077f69cd85e1551 100644 +index 4e3eac5f06a6ded0f152f1744fcebfeef6b48814..68b560af277d4913306fb1b9c88c2fadcd2f446a 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -209,5 +209,22 @@ public interface UnsafeValues { @@ -32,10 +32,10 @@ index d71e2ef9b9274bfcf8d9885d1583dcb310849c43..7bd7bdf756f780752a127a786077f69c // Paper end } diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java -index 032a252688b6dbefb05a0d4f91791e102bbae0cd..4aa2d483b706fbf6ba0dc5126de74ee532e12382 100644 +index 50d9442ffafdfabd4904dafae7daaeadcedee75b..5a0c96875d9c3bd32b4649a3fccd43af1ccb195b 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java -@@ -446,5 +446,24 @@ public enum EntityType implements Keyed, net.kyori.adventure.translation.Transla +@@ -447,5 +447,24 @@ public enum EntityType implements Keyed, net.kyori.adventure.translation.Transla Preconditions.checkArgument(this != UNKNOWN, "UNKNOWN entities do not have translation keys"); return org.bukkit.Bukkit.getUnsafe().getTranslationKey(this); } diff --git a/patches/api/0335-Add-isCollidable-methods-to-various-places.patch b/patches/api/0335-Add-isCollidable-methods-to-various-places.patch index 8880574d51..4607f0597e 100644 --- a/patches/api/0335-Add-isCollidable-methods-to-various-places.patch +++ b/patches/api/0335-Add-isCollidable-methods-to-various-places.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add isCollidable methods to various places diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 163c3ed1974e50376b7c2b2805df283322d41777..cb00e050cd5fff3a037a32ac34e02eeea3827357 100644 +index bdc51797e3e3c8ffb1db842e29ddb86beeec48ec..56459876a7736bd3a015e0aba511313997f9ec65 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4172,6 +4172,16 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata +@@ -4332,6 +4332,16 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata public Multimap getItemAttributes(@NotNull EquipmentSlot equipmentSlot) { return Bukkit.getUnsafe().getItemAttributes(this, equipmentSlot); } @@ -26,7 +26,7 @@ index 163c3ed1974e50376b7c2b2805df283322d41777..cb00e050cd5fff3a037a32ac34e02eee /** diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 7bd7bdf756f780752a127a786077f69cd85e1551..057a4f1a374fcc240998c6ac3fe52d22389458c3 100644 +index 68b560af277d4913306fb1b9c88c2fadcd2f446a..9fd64aa7f2487b07fe0a6873bd57a0ed483499a3 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -226,5 +226,14 @@ public interface UnsafeValues { diff --git a/patches/api/0341-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0341-Allow-delegation-to-vanilla-chunk-gen.patch index c09dcdba13..5ced65d4c1 100644 --- a/patches/api/0341-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/api/0341-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index d8e301befb37b540bc246cf58988923b0ab23375..77e824f6071782def8865fc178e2f064f109cebb 100644 +index b0d2d45ad2394313be752e92bc594095bfc93120..85dc2bf97175207bcc169d5d7e0d86dae39aecf2 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1905,6 +1905,24 @@ public final class Bukkit { +@@ -1907,6 +1907,24 @@ public final class Bukkit { return server.createChunkData(world); } @@ -34,10 +34,10 @@ index d8e301befb37b540bc246cf58988923b0ab23375..77e824f6071782def8865fc178e2f064 * Creates a boss bar instance to display to players. The progress * defaults to 1.0 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 16f631fdde4b63e0ed3162486dba684697bdffa7..a7e1d81a8a5e14f556d6b462dfba7f2e49f06f5f 100644 +index a11d02cc17b1e9bea06ab61cd3ae21c3c41aaceb..c07eef17aac9140e1f461aa20e3a90fcb3f4ae74 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1600,6 +1600,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1602,6 +1602,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull public ChunkGenerator.ChunkData createChunkData(@NotNull World world); diff --git a/patches/api/0360-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0360-API-for-creating-command-sender-which-forwards-feedb.patch index 95101a7000..03afc95f0f 100644 --- a/patches/api/0360-API-for-creating-command-sender-which-forwards-feedb.patch +++ b/patches/api/0360-API-for-creating-command-sender-which-forwards-feedb.patch @@ -5,10 +5,10 @@ Subject: [PATCH] API for creating command sender which forwards feedback diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 77e824f6071782def8865fc178e2f064f109cebb..1b52cb7d8b894ee73be5754ed44236de01d7d0c6 100644 +index 85dc2bf97175207bcc169d5d7e0d86dae39aecf2..1934a4521a43ad14beacf0c56e5914e35da8bc59 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1413,6 +1413,20 @@ public final class Bukkit { +@@ -1415,6 +1415,20 @@ public final class Bukkit { return server.getConsoleSender(); } @@ -30,10 +30,10 @@ index 77e824f6071782def8865fc178e2f064f109cebb..1b52cb7d8b894ee73be5754ed44236de * Gets the folder that contains all of the various {@link World}s. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index a7e1d81a8a5e14f556d6b462dfba7f2e49f06f5f..6d056cee2fb727db9fbcc0ee98a7c800a8981ad6 100644 +index c07eef17aac9140e1f461aa20e3a90fcb3f4ae74..23063ebcf36dd4f02ad4670839295064c95e3aec 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1179,6 +1179,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1181,6 +1181,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull public ConsoleCommandSender getConsoleSender(); diff --git a/patches/api/0363-Add-GameEvent-tags.patch b/patches/api/0363-Add-GameEvent-tags.patch index a3687657c0..97de65fa11 100644 --- a/patches/api/0363-Add-GameEvent-tags.patch +++ b/patches/api/0363-Add-GameEvent-tags.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add GameEvent tags diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index 92bb9bbfb9181e9aa9edfe39ddbbfa54dab14df0..d999dae63e3796ce268b281d61b148dacacb3bad 100644 +index be5bb4210a11154013e2fc80653bf467ebdaf15f..d34f0481b3f27591f089dce5673dbe2feae358f5 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java -@@ -848,6 +848,18 @@ public interface Tag extends Keyed { +@@ -876,6 +876,18 @@ public interface Tag extends Keyed { */ @Deprecated(forRemoval = true) Tag SKELETONS = ENTITY_TYPES_SKELETONS; diff --git a/patches/api/0367-Custom-Potion-Mixes.patch b/patches/api/0367-Custom-Potion-Mixes.patch index 260c044149..b8679717f4 100644 --- a/patches/api/0367-Custom-Potion-Mixes.patch +++ b/patches/api/0367-Custom-Potion-Mixes.patch @@ -102,10 +102,10 @@ index 0000000000000000000000000000000000000000..cb6d93526b637946aec311bef103ad30 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 1b52cb7d8b894ee73be5754ed44236de01d7d0c6..840aaf9e8fc828b5a7ea02252038c6524680f2e0 100644 +index 1934a4521a43ad14beacf0c56e5914e35da8bc59..41ea6212b52359927bd5c944c886ef32322b9a08 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2427,6 +2427,15 @@ public final class Bukkit { +@@ -2429,6 +2429,15 @@ public final class Bukkit { public static io.papermc.paper.datapack.DatapackManager getDatapackManager() { return server.getDatapackManager(); } @@ -122,10 +122,10 @@ index 1b52cb7d8b894ee73be5754ed44236de01d7d0c6..840aaf9e8fc828b5a7ea02252038c652 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 6d056cee2fb727db9fbcc0ee98a7c800a8981ad6..da5cab4246bd253fcc4e4d9574bdae1867ebb5ab 100644 +index 23063ebcf36dd4f02ad4670839295064c95e3aec..fe50eb0820b99ce5ad8fb8c53ced08709aa4caef 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2108,5 +2108,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2110,5 +2110,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull io.papermc.paper.datapack.DatapackManager getDatapackManager(); diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index 830a5584ed..a432b81696 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -28,7 +28,7 @@ index 3df8c60ab5cd1454660980883f80668d535b742b..37c3a00659ce21623be07317f4f6a45b +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..d10ff4a52c22033e2adb2a4e7f2cee98a13ea6c5 +index 0000000000000000000000000000000000000000..40d1dcd4a0870cf002ee6d0309ce667f49a89d35 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,138 @@ @@ -43,7 +43,7 @@ index 0000000000000000000000000000000000000000..d10ff4a52c22033e2adb2a4e7f2cee98 +dependencies { + implementation(project(":paper-api")) + implementation("jline:jline:2.12.1") -+ implementation("org.apache.logging.log4j:log4j-iostreams:2.17.0") { ++ implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") { + exclude(group = "org.apache.logging.log4j", module = "log4j-api") + } + implementation("org.ow2.asm:asm:9.3") @@ -59,7 +59,7 @@ index 0000000000000000000000000000000000000000..d10ff4a52c22033e2adb2a4e7f2cee98 + testImplementation("org.hamcrest:hamcrest-library:1.3") +} + -+val craftbukkitPackageVersion = "1_19_R1" // Paper ++val craftbukkitPackageVersion = "1_19_R2" // Paper +tasks.jar { + archiveClassifier.set("dev") + @@ -172,17 +172,17 @@ index 0000000000000000000000000000000000000000..d10ff4a52c22033e2adb2a4e7f2cee98 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index 82a2b163a8b660d0f65dd9eca6651c520b571cd2..0000000000000000000000000000000000000000 +index 30e4978569bcda9e38a326b8fcd9953e1e319c21..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null -@@ -1,623 +0,0 @@ +@@ -1,629 +0,0 @@ - - 4.0.0 - org.spigotmc - spigot - jar -- 1.19.2-R0.1-SNAPSHOT +- 1.19.3-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ - @@ -198,7 +198,7 @@ index 82a2b163a8b660d0f65dd9eca6651c520b571cd2..00000000000000000000000000000000 - UTF-8 - unknown - git -- 1_19_R1 +- 1_19_R2 - 17 - 17 - @@ -233,7 +233,7 @@ index 82a2b163a8b660d0f65dd9eca6651c520b571cd2..00000000000000000000000000000000 - - org.apache.logging.log4j - log4j-iostreams -- 2.17.0 +- 2.19.0 - compile - - @@ -246,13 +246,13 @@ index 82a2b163a8b660d0f65dd9eca6651c520b571cd2..00000000000000000000000000000000 - - com.github.oshi - oshi-core -- 5.8.5 +- 6.2.2 - compile - - - com.mojang - authlib -- 3.11.49 +- 3.16.29 - compile - - @@ -270,13 +270,13 @@ index 82a2b163a8b660d0f65dd9eca6651c520b571cd2..00000000000000000000000000000000 - - com.mojang - javabridge -- 1.2.24 +- 2.0.25 - compile - - - com.mojang - logging -- 1.0.0 +- 1.1.1 - compile - - @@ -288,81 +288,81 @@ index 82a2b163a8b660d0f65dd9eca6651c520b571cd2..00000000000000000000000000000000 - - io.netty - netty-buffer -- 4.1.77.Final +- 4.1.82.Final - compile - - - io.netty - netty-codec -- 4.1.77.Final +- 4.1.82.Final - compile - - - io.netty - netty-common -- 4.1.77.Final +- 4.1.82.Final - compile - - - io.netty - netty-handler -- 4.1.77.Final +- 4.1.82.Final - compile - - - io.netty - netty-resolver -- 4.1.77.Final +- 4.1.82.Final - compile - - - io.netty - netty-transport -- 4.1.77.Final +- 4.1.82.Final - compile - - - io.netty - netty-transport-classes-epoll -- 4.1.77.Final +- 4.1.82.Final - compile - - - io.netty - netty-transport-native-epoll -- 4.1.77.Final +- 4.1.82.Final - linux-x86_64 - compile - - - io.netty - netty-transport-native-epoll -- 4.1.77.Final +- 4.1.82.Final - linux-aarch_64 - compile - - - io.netty - netty-transport-native-unix-common -- 4.1.77.Final +- 4.1.82.Final - compile - - - it.unimi.dsi - fastutil -- 8.5.6 +- 8.5.9 - compile - - - net.java.dev.jna - jna -- 5.10.0 +- 5.12.1 - compile - - - net.java.dev.jna - jna-platform -- 5.10.0 +- 5.12.1 - compile - - @@ -380,19 +380,25 @@ index 82a2b163a8b660d0f65dd9eca6651c520b571cd2..00000000000000000000000000000000 - - org.apache.logging.log4j - log4j-core -- 2.17.0 +- 2.19.0 - compile - - - org.apache.logging.log4j -- log4j-slf4j18-impl -- 2.17.0 +- log4j-slf4j2-impl +- 2.19.0 +- compile +- +- +- org.joml +- joml +- 1.10.5 - compile - - - org.slf4j - slf4j-api -- 1.8.0-beta4 +- 2.0.1 - compile - - diff --git a/patches/server/0002-Remap-fixes.patch b/patches/unapplied/server/0002-Remap-fixes.patch similarity index 100% rename from patches/server/0002-Remap-fixes.patch rename to patches/unapplied/server/0002-Remap-fixes.patch diff --git a/patches/server/0003-Build-system-changes.patch b/patches/unapplied/server/0003-Build-system-changes.patch similarity index 100% rename from patches/server/0003-Build-system-changes.patch rename to patches/unapplied/server/0003-Build-system-changes.patch diff --git a/patches/server/0004-Paper-config-files.patch b/patches/unapplied/server/0004-Paper-config-files.patch similarity index 100% rename from patches/server/0004-Paper-config-files.patch rename to patches/unapplied/server/0004-Paper-config-files.patch diff --git a/patches/server/0005-MC-Dev-fixes.patch b/patches/unapplied/server/0005-MC-Dev-fixes.patch similarity index 99% rename from patches/server/0005-MC-Dev-fixes.patch rename to patches/unapplied/server/0005-MC-Dev-fixes.patch index d67b4c8561..543ee77384 100644 --- a/patches/server/0005-MC-Dev-fixes.patch +++ b/patches/unapplied/server/0005-MC-Dev-fixes.patch @@ -169,7 +169,7 @@ index cd9f94b98f9b7072ed7ca1becd779132dfc1dd12..80a3c56fb5e73c09c542b17aac952fb6 MultiPackResourceManager resourcemanager = new MultiPackResourceManager(PackType.SERVER_DATA, immutablelist); diff --git a/src/main/java/net/minecraft/server/level/Ticket.java b/src/main/java/net/minecraft/server/level/Ticket.java -index 062da1bddd9704f5fbc46e974e13e60cd500bbe2..ffc43e5d3d0563c9e9c171064511b2c65ddf67e1 100644 +index 2f66abf62d303342f5fe614fb3e35e7844497ffc..b346fa94b23d81da7da073f71dd12e672e0f079c 100644 --- a/src/main/java/net/minecraft/server/level/Ticket.java +++ b/src/main/java/net/minecraft/server/level/Ticket.java @@ -21,7 +21,7 @@ public final class Ticket implements Comparable> { @@ -195,7 +195,7 @@ index d0f6eb3981a171c0f34870cb0472599d6cca9642..d1b2ba24ef54e01c6249c3b2ca16e80f public static SortedArraySet create(Comparator comparator) { diff --git a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java -index 8760e4199a1c8ae1a784f885923616f3740fe120..bb2be6eea7a0cff4cc70bd43738b1ce213e43558 100644 +index b789a156fa7fb01844323f4a967aef4e1f0667c3..157c5f2d2738a9ed15949b97d176977905ada14c 100644 --- a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java +++ b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java @@ -31,7 +31,7 @@ public class PoiSection { diff --git a/patches/server/0006-ConcurrentUtil.patch b/patches/unapplied/server/0006-ConcurrentUtil.patch similarity index 100% rename from patches/server/0006-ConcurrentUtil.patch rename to patches/unapplied/server/0006-ConcurrentUtil.patch diff --git a/patches/server/0007-CB-fixes.patch b/patches/unapplied/server/0007-CB-fixes.patch similarity index 98% rename from patches/server/0007-CB-fixes.patch rename to patches/unapplied/server/0007-CB-fixes.patch index e0daaa9d40..a5ad0e79f0 100644 --- a/patches/server/0007-CB-fixes.patch +++ b/patches/unapplied/server/0007-CB-fixes.patch @@ -17,7 +17,7 @@ Subject: [PATCH] CB fixes Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index bbdde701a16480b0b4b29e8fb6b5b5d987db0ce3..aa396df025115c7fd866cbc63a44c2c17abfde84 100644 +index 61f1da79bbd0428c4d99f62974c06183230864b6..a3c602f1a1b2dbc6bbb32bffa8745dc71cf20872 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -293,7 +293,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0008-MC-Utils.patch b/patches/unapplied/server/0008-MC-Utils.patch similarity index 99% rename from patches/server/0008-MC-Utils.patch rename to patches/unapplied/server/0008-MC-Utils.patch index 37b08320b2..38d11e8622 100644 --- a/patches/server/0008-MC-Utils.patch +++ b/patches/unapplied/server/0008-MC-Utils.patch @@ -6635,7 +6635,7 @@ index 9fdfeab462e5f5c5e09c5fee2dfe1fca89330086..18d56618a1e8ff5ba408523f620333db public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 9001040060383cff5a51028d652315467c7d51ec..e283e8383a52c74cebd16fa7642a5e3993b2ed1a 100644 +index c7c212fb231f86dd17efb4134976f1ec1d10630b..d2958d4c897d93f81ab4faea2c67783c2f0de37f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -260,6 +260,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0009-Adventure.patch b/patches/unapplied/server/0009-Adventure.patch similarity index 100% rename from patches/server/0009-Adventure.patch rename to patches/unapplied/server/0009-Adventure.patch diff --git a/patches/server/0010-Paper-command.patch b/patches/unapplied/server/0010-Paper-command.patch similarity index 100% rename from patches/server/0010-Paper-command.patch rename to patches/unapplied/server/0010-Paper-command.patch diff --git a/patches/server/0011-Paper-Metrics.patch b/patches/unapplied/server/0011-Paper-Metrics.patch similarity index 99% rename from patches/server/0011-Paper-Metrics.patch rename to patches/unapplied/server/0011-Paper-Metrics.patch index 37974e62f8..d15b306441 100644 --- a/patches/server/0011-Paper-Metrics.patch +++ b/patches/unapplied/server/0011-Paper-Metrics.patch @@ -690,7 +690,7 @@ index 0000000000000000000000000000000000000000..5a19e30a9b7e65a70f68a429b8ca741f + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 393e465b0bac55d407f2ec66d7b11ed0537c9641..408eff59b081ace53bf435947df17e2fe75bfd5e 100644 +index 8f29bb843fc456384f7b4e216afca5018fb7f794..f4a6a6addbba65b3415320977048aeba0eadba63 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -192,6 +192,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0012-Timings-v2.patch b/patches/unapplied/server/0012-Timings-v2.patch similarity index 98% rename from patches/server/0012-Timings-v2.patch rename to patches/unapplied/server/0012-Timings-v2.patch index 3ae8a82b4f..727ba711e8 100644 --- a/patches/server/0012-Timings-v2.patch +++ b/patches/unapplied/server/0012-Timings-v2.patch @@ -695,7 +695,7 @@ index 0000000000000000000000000000000000000000..0fda52841b5e1643efeda92106124998 + } +} diff --git a/src/main/java/net/minecraft/commands/CommandFunction.java b/src/main/java/net/minecraft/commands/CommandFunction.java -index eb434d46add6960dba026a03ec3c582a4277bfbd..04adaa6f393be8c3dfa13f371e6bc51082d1d1be 100644 +index 3ceeddf4c2898172d24db9ee1bab8d6b17e36128..8273ee1c5e513f02c9743ee38c9b7cf700e2ecad 100644 --- a/src/main/java/net/minecraft/commands/CommandFunction.java +++ b/src/main/java/net/minecraft/commands/CommandFunction.java @@ -16,6 +16,15 @@ import net.minecraft.server.ServerFunctionManager; @@ -729,7 +729,7 @@ index 13421daa96b4ba302581f36abcd730952713d8cd..049e64c355d5f064009b1107ad15d28c } catch (Exception exception) { if (listener.shouldPropagateHandlingExceptions()) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e4220f14a5ebf43dd3491fc8649c2be5238c5798..53be6189d3fa6a65a09996683913fbbf5133dcb7 100644 +index 77cb412656e741fdb7e002011e3a99ac304118cb..2b2b71f3963e66fa0d2683b10581b1a38c774549 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -177,7 +177,7 @@ import org.bukkit.event.player.AsyncPlayerChatPreviewEvent; @@ -997,7 +997,7 @@ index f4a6a6addbba65b3415320977048aeba0eadba63..c905602d23cdf3af1de7ab4419f11856 } diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 1fbe1b6de925f71763f79fe3d2371b70a8650f25..2a9e5fb8164f79b0f9c1cb5497216e51f9df3454 100644 +index 8c6ca0acde4cb266a844a1670296ac327e3382dc..44f12777f115ca4d465bc603e1e23932e102efb2 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1,8 +1,10 @@ @@ -1054,7 +1054,7 @@ index 1fbe1b6de925f71763f79fe3d2371b70a8650f25..2a9e5fb8164f79b0f9c1cb5497216e51 } diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 1a8c5ce3ecce9cbbc8496ea3882b18c297964e33..8c99e9d1cc1abf5a425846eb4edd52bf38aa2f75 100644 +index 85238e1bcb2a7ac8f824f10409ee5a4bc7e6c002..0bf02ffba51e0dda6d01972c3f8c834c42d72512 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -414,13 +414,15 @@ public class ServerChunkCache extends ChunkSource { @@ -1146,7 +1146,7 @@ index 1a8c5ce3ecce9cbbc8496ea3882b18c297964e33..8c99e9d1cc1abf5a425846eb4edd52bf } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b2f79a0c9caa6783816afc36531c94378e832cb7..99d44faab5b5da244fdc170c73d73723c174c8fd 100644 +index f5ed23104c781098e64850b32963d13c1a611b96..3049d732ce3df71a4755ee9160d4f3fae052d1b6 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1,6 +1,8 @@ @@ -1262,7 +1262,7 @@ index b2f79a0c9caa6783816afc36531c94378e832cb7..99d44faab5b5da244fdc170c73d73723 this.entityManager.saveAll(); } else { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 93d02b5de0721e3c5903e80bbf8b3b56ec3ab45d..4e7db441f68019d6e5d3359605b76bc4b258e87e 100644 +index f1441c9fde9d736d4c053073a88a7a79222f5c5c..2f2d92bfda1713c7454e73cb2d2e77f69184a2d4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -342,7 +342,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -1309,7 +1309,7 @@ index 93d02b5de0721e3c5903e80bbf8b3b56ec3ab45d..4e7db441f68019d6e5d3359605b76bc4 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 3710f544a491a837b973daedc2dfa51357b70b56..e7fcb402e3d4e0707a28505a9fb6642764034e23 100644 +index 8246a78e4e01ee24db88660351bc0f27a6f320aa..5f85d48fbd0ce34c21acec4849ad3efcc73c7210 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1,5 +1,6 @@ @@ -1425,7 +1425,7 @@ index cdf8020194f2ec1fe7b65b22c8e1f5b1c23eaefa..2db27f5e3e3c1bb0502c055f78c4a81e } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e283e8383a52c74cebd16fa7642a5e3993b2ed1a..8c2d76c27c784536c3b573bf4ae4f47c2c3c4b6b 100644 +index d2958d4c897d93f81ab4faea2c67783c2f0de37f..4cbd068bbb19eec3a702bc9067ac4f106ddf00e1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -140,7 +140,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -1588,7 +1588,7 @@ index dec38e58e30c84887e9d29436c0f76c70c0a627d..be08224c8107aab3e9a3645a20977dd1 private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry(); public CraftPersistentDataContainer persistentDataContainer; diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index bcd0287d99eeba2b3534b4a298dc4b79b293ec58..b322d9b7bd9e107a9adf995b6c4db4ff0af05fc1 100644 +index 41dda06ac8d9adc263936bc417d35b62a8801565..1c6f51c227a0b6da81eeb817f996789645a547db 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -680,6 +680,7 @@ public class LevelChunk extends ChunkAccess { @@ -1608,7 +1608,7 @@ index bcd0287d99eeba2b3534b4a298dc4b79b293ec58..b322d9b7bd9e107a9adf995b6c4db4ff } } diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index 98ba88896c73651591b8ad8e070868fb443ae999..864e2e0355a5fb8c1d4a5b0896ba299faf9ea534 100644 +index e1558691dc23ad812358e3890020fdc7d6d7c28b..6c844a826892c5f31d5afb9ead56d4cff3ab5968 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java @@ -507,13 +507,10 @@ public class ChunkSerializer { @@ -2035,7 +2035,7 @@ index e52ef47b783785dc214746b678e7b549aea9a274..3d90b3426873a3528af14f7f1ab0adae this.value = value; } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 56a3dc9dcbd2229c60aa64e2d4c0ed147539a5ef..e309a589e6ce76294187c906820a88367da25305 100644 +index ede9c2d8e98fd42a936045e82b3e2c174f7bac0b..a3b303c2593b3f06b40ec827592a349431d0aaf9 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -222,6 +222,12 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0013-Rewrite-dataconverter-system.patch b/patches/unapplied/server/0013-Rewrite-dataconverter-system.patch similarity index 99% rename from patches/server/0013-Rewrite-dataconverter-system.patch rename to patches/unapplied/server/0013-Rewrite-dataconverter-system.patch index eb71ed8fe3..49b2d11b8f 100644 --- a/patches/server/0013-Rewrite-dataconverter-system.patch +++ b/patches/unapplied/server/0013-Rewrite-dataconverter-system.patch @@ -22656,7 +22656,7 @@ index 0000000000000000000000000000000000000000..967ad1186cbc81a76a4958ea99d4eff3 + } +} diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java -index c56946f86565ad1ac41bb7b655c113f648d2f539..9730ee10042e02741383c8153eb3b7b7103f80e0 100644 +index 6902a90ebee993a972404d83ec8c781438351639..aa6d4996e1b9fce21ebf184eefb9d7a92d2a340b 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java @@ -78,7 +78,7 @@ public class ChunkStorage implements AutoCloseable { @@ -22700,7 +22700,7 @@ index dae66dd5dbebc7fd8fc331b1f5f06ec461667830..0ede151943109e81f66875340261d77f public static int getVersion(CompoundTag chunkNbt) { diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java -index 8a4750dd8f604062c4ea452f7b97b05a0c8d583a..a0b61647e5a7e5989aed52522bc9a43bc487421c 100644 +index 6701d07886325e33f45ac894bfaa1c5b91afad9d..5631345dee84001be1053fbf92def683be7a97f5 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java @@ -142,7 +142,14 @@ public class SectionStorage implements AutoCloseable { diff --git a/patches/server/0014-Starlight.patch b/patches/unapplied/server/0014-Starlight.patch similarity index 100% rename from patches/server/0014-Starlight.patch rename to patches/unapplied/server/0014-Starlight.patch diff --git a/patches/server/0015-Not-implemeneted.patch b/patches/unapplied/server/0015-Not-implemeneted.patch similarity index 100% rename from patches/server/0015-Not-implemeneted.patch rename to patches/unapplied/server/0015-Not-implemeneted.patch diff --git a/patches/server/0016-Rewrite-chunk-system.patch b/patches/unapplied/server/0016-Rewrite-chunk-system.patch similarity index 100% rename from patches/server/0016-Rewrite-chunk-system.patch rename to patches/unapplied/server/0016-Rewrite-chunk-system.patch diff --git a/patches/server/0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/server/0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/server/0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/unapplied/server/0017-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/server/0018-Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/unapplied/server/0018-Configurable-cactus-bamboo-and-reed-growth-heights.patch similarity index 100% rename from patches/server/0018-Configurable-cactus-bamboo-and-reed-growth-heights.patch rename to patches/unapplied/server/0018-Configurable-cactus-bamboo-and-reed-growth-heights.patch diff --git a/patches/server/0019-Configurable-baby-zombie-movement-speed.patch b/patches/unapplied/server/0019-Configurable-baby-zombie-movement-speed.patch similarity index 100% rename from patches/server/0019-Configurable-baby-zombie-movement-speed.patch rename to patches/unapplied/server/0019-Configurable-baby-zombie-movement-speed.patch diff --git a/patches/server/0020-Configurable-fishing-time-ranges.patch b/patches/unapplied/server/0020-Configurable-fishing-time-ranges.patch similarity index 100% rename from patches/server/0020-Configurable-fishing-time-ranges.patch rename to patches/unapplied/server/0020-Configurable-fishing-time-ranges.patch diff --git a/patches/server/0021-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/unapplied/server/0021-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch similarity index 96% rename from patches/server/0021-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch rename to patches/unapplied/server/0021-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch index 621e6370ae..eb521c2fe8 100644 --- a/patches/server/0021-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch +++ b/patches/unapplied/server/0021-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow nerfed mobs to jump and take water damage diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 738c54ce0a0fb7fee6b584a6d96a8b74931222e5..38d3749104742f63f1f4f4c9595e83a4fa445cd1 100644 +index c3357f65d3c5cec3446326b8a68750ee2cc27b9a..ecb86bb87468cdef07e47df9308e6548cf987fe4 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -110,6 +110,7 @@ public abstract class Mob extends LivingEntity { diff --git a/patches/server/0022-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/unapplied/server/0022-Add-configurable-despawn-distances-for-living-entiti.patch similarity index 93% rename from patches/server/0022-Add-configurable-despawn-distances-for-living-entiti.patch rename to patches/unapplied/server/0022-Add-configurable-despawn-distances-for-living-entiti.patch index a88ee8f743..236f40666c 100644 --- a/patches/server/0022-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/patches/unapplied/server/0022-Add-configurable-despawn-distances-for-living-entiti.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable despawn distances for living entities diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 38d3749104742f63f1f4f4c9595e83a4fa445cd1..ce04fa5ae8c539fd6f6aa7648a4cdce6b680463e 100644 +index ecb86bb87468cdef07e47df9308e6548cf987fe4..a27082368913e5c6dc926bd197f3b135a633f30d 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -794,14 +794,14 @@ public abstract class Mob extends LivingEntity { diff --git a/patches/server/0023-Allow-for-toggling-of-spawn-chunks.patch b/patches/unapplied/server/0023-Allow-for-toggling-of-spawn-chunks.patch similarity index 100% rename from patches/server/0023-Allow-for-toggling-of-spawn-chunks.patch rename to patches/unapplied/server/0023-Allow-for-toggling-of-spawn-chunks.patch diff --git a/patches/server/0024-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/unapplied/server/0024-Drop-falling-block-and-tnt-entities-at-the-specified.patch similarity index 100% rename from patches/server/0024-Drop-falling-block-and-tnt-entities-at-the-specified.patch rename to patches/unapplied/server/0024-Drop-falling-block-and-tnt-entities-at-the-specified.patch diff --git a/patches/server/0025-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/unapplied/server/0025-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch similarity index 98% rename from patches/server/0025-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch rename to patches/unapplied/server/0025-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 268c394466..af99d15ea1 100644 --- a/patches/server/0025-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/patches/unapplied/server/0025-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 317cd6f68c2368b2f70dfb809db3e418de040f05..4d7ea3b3b8fb00b2b02c79d90a067c2f32b46988 100644 +index 0d2114be30df99c5b50f82def97b0a44e797e573..2c78c2aebedef02fe66fe0c352d586b80f66144d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1426,7 +1426,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop withinDistance(double x, double y, double z, double max) { double d4 = max * max; diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 7e9954dc290e7ee069cceb45a744bb2c9a8b7f17..ae35b7119f06f751b1d3e51f4d516c5fe61d9445 100644 +index a27082368913e5c6dc926bd197f3b135a633f30d..d315d9e0e6724e210924ec5814545e8c52ba2d8b 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -790,7 +790,7 @@ public abstract class Mob extends LivingEntity { @@ -73,7 +73,7 @@ index 1b48576beca178af14bfab297bd427b5f5bdaf42..d3ca0706e8dc3160d2100d23788dd3d5 entityzombie.finalizeSpawn(worldserver, this.level.getCurrentDifficultyAt(entityzombie.blockPosition()), MobSpawnType.REINFORCEMENT, (SpawnGroupData) null, (CompoundTag) null); worldserver.addFreshEntityWithPassengers(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 0232baa005e2839317d7ac2d64c88fb93bc29e5e..08b0b7b9146f58c4eb263d5ce1fee1b08d43fafe 100644 +index 1883c6a4a6a58b25913eaed40786ea67785bad37..4751fea5e7319600422c4fb3e40026a36db85a6a 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -184,6 +184,9 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0029-Further-improve-server-tick-loop.patch b/patches/unapplied/server/0029-Further-improve-server-tick-loop.patch similarity index 99% rename from patches/server/0029-Further-improve-server-tick-loop.patch rename to patches/unapplied/server/0029-Further-improve-server-tick-loop.patch index e6f977211f..2c1c8c05cc 100644 --- a/patches/server/0029-Further-improve-server-tick-loop.patch +++ b/patches/unapplied/server/0029-Further-improve-server-tick-loop.patch @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1d4b3f02ebf918bf669647635bf236ca6094c0c7..a7e58261bc54f1177045f094678e85d00b054435 100644 +index 2c78c2aebedef02fe66fe0c352d586b80f66144d..0955b4e0ee33a26c5bfee744242cdc24aebccb20 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -270,7 +270,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 22c095539425a6667b8e7f5c5f0a8ff2e87adfb5..e21a6961bab606036440f2a6bd90998b4129ae10 100644 +index 1742efe86fe2017e58513f9a63e4b63579327f04..2be965faaed8ca25fc01d6ca1f496f7e41e6b7a0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2038,7 +2038,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -107,7 +107,7 @@ index 58f3ee6c47313b5c3b093a03b1b759e9fb0207ee..524338428265f27aa33774a23b53c242 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 3be63b51511fd12f295e1f07549f281246ee2dc0..94ec829c549dac568a94c3262d9de026ff9d9a39 100644 +index 3be63b51511fd12f295e1f07549f281246ee2dc0..55c9d229356e3eb75419f7630cfafdd8f883a5e0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -502,7 +502,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0051-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/unapplied/server/0051-All-chunks-are-slime-spawn-chunks-toggle.patch similarity index 100% rename from patches/server/0051-All-chunks-are-slime-spawn-chunks-toggle.patch rename to patches/unapplied/server/0051-All-chunks-are-slime-spawn-chunks-toggle.patch diff --git a/patches/server/0052-Expose-server-CommandMap.patch b/patches/unapplied/server/0052-Expose-server-CommandMap.patch similarity index 100% rename from patches/server/0052-Expose-server-CommandMap.patch rename to patches/unapplied/server/0052-Expose-server-CommandMap.patch diff --git a/patches/server/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/unapplied/server/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch similarity index 100% rename from patches/server/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch rename to patches/unapplied/server/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch diff --git a/patches/server/0054-Ensure-inv-drag-is-in-bounds.patch b/patches/unapplied/server/0054-Ensure-inv-drag-is-in-bounds.patch similarity index 100% rename from patches/server/0054-Ensure-inv-drag-is-in-bounds.patch rename to patches/unapplied/server/0054-Ensure-inv-drag-is-in-bounds.patch diff --git a/patches/server/0055-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/0055-Player-Tab-List-and-Title-APIs.patch similarity index 98% rename from patches/server/0055-Player-Tab-List-and-Title-APIs.patch rename to patches/unapplied/server/0055-Player-Tab-List-and-Title-APIs.patch index c530b1515a..621fe540af 100644 --- a/patches/server/0055-Player-Tab-List-and-Title-APIs.patch +++ b/patches/unapplied/server/0055-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 94ec829c549dac568a94c3262d9de026ff9d9a39..6f5248febd3f84f2f5bc83806cbb9953600b71b6 100644 +index 55c9d229356e3eb75419f7630cfafdd8f883a5e0..a4452324892c37c92e8e0c7cee1fdeda50e9d81b 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/0056-Add-configurable-portal-search-radius.patch b/patches/unapplied/server/0056-Add-configurable-portal-search-radius.patch similarity index 100% rename from patches/server/0056-Add-configurable-portal-search-radius.patch rename to patches/unapplied/server/0056-Add-configurable-portal-search-radius.patch diff --git a/patches/server/0057-Add-velocity-warnings.patch b/patches/unapplied/server/0057-Add-velocity-warnings.patch similarity index 100% rename from patches/server/0057-Add-velocity-warnings.patch rename to patches/unapplied/server/0057-Add-velocity-warnings.patch diff --git a/patches/server/0058-Configurable-inter-world-teleportation-safety.patch b/patches/unapplied/server/0058-Configurable-inter-world-teleportation-safety.patch similarity index 94% rename from patches/server/0058-Configurable-inter-world-teleportation-safety.patch rename to patches/unapplied/server/0058-Configurable-inter-world-teleportation-safety.patch index 154500b60e..c4403cd8d8 100644 --- a/patches/server/0058-Configurable-inter-world-teleportation-safety.patch +++ b/patches/unapplied/server/0058-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 6f5248febd3f84f2f5bc83806cbb9953600b71b6..342cd3c6ffdcf46f0329e072fae446c5e9665e33 100644 +index a4452324892c37c92e8e0c7cee1fdeda50e9d81b..60850848e76d656d7b4e885c79dfe992108c8ad5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1129,7 +1129,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0059-Add-exception-reporting-event.patch b/patches/unapplied/server/0059-Add-exception-reporting-event.patch similarity index 100% rename from patches/server/0059-Add-exception-reporting-event.patch rename to patches/unapplied/server/0059-Add-exception-reporting-event.patch diff --git a/patches/server/0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/unapplied/server/0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch similarity index 100% rename from patches/server/0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch rename to patches/unapplied/server/0060-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch diff --git a/patches/server/0061-Disable-Scoreboards-for-non-players-by-default.patch b/patches/unapplied/server/0061-Disable-Scoreboards-for-non-players-by-default.patch similarity index 95% rename from patches/server/0061-Disable-Scoreboards-for-non-players-by-default.patch rename to patches/unapplied/server/0061-Disable-Scoreboards-for-non-players-by-default.patch index 3394f19cea..46585ba5c2 100644 --- a/patches/server/0061-Disable-Scoreboards-for-non-players-by-default.patch +++ b/patches/unapplied/server/0061-Disable-Scoreboards-for-non-players-by-default.patch @@ -23,7 +23,7 @@ index dc29c677e21a71b5ba1a48c7aea8acadc2689c77..70275d1db39c9809a5fc93cebb49beb3 } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 1d0f6aec5b34208c6bbda23789238b3a27c33c4c..f513e9abb929fbabe12e40bb56af708745ea1ad9 100644 +index 1738512d977f60c4021c01a5fce642f62d7e4c74..17426b43a16887653a63c34128aa97785a23796c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -823,6 +823,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/unapplied/server/0062-Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/server/0063-Chunk-Save-Reattempt.patch b/patches/unapplied/server/0063-Chunk-Save-Reattempt.patch similarity index 96% rename from patches/server/0063-Chunk-Save-Reattempt.patch rename to patches/unapplied/server/0063-Chunk-Save-Reattempt.patch index 66fe0ef951..e8fab11cda 100644 --- a/patches/server/0063-Chunk-Save-Reattempt.patch +++ b/patches/unapplied/server/0063-Chunk-Save-Reattempt.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks. diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index 8adebb8408cc22ae7e9e89721645e5dd27a41cd8..038e2177182c94baa4af24f9111cf155ec342dfe 100644 +index aa8972fd1a1fade05d60ab69efb8ff24f344508a..ddcc212ba83d9365adb842b3d3ced64e3d7dd155 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java @@ -275,7 +275,7 @@ public class RegionFile implements AutoCloseable { diff --git a/patches/server/0064-Complete-resource-pack-API.patch b/patches/unapplied/server/0064-Complete-resource-pack-API.patch similarity index 95% rename from patches/server/0064-Complete-resource-pack-API.patch rename to patches/unapplied/server/0064-Complete-resource-pack-API.patch index cac7d1f1fb..662284faa9 100644 --- a/patches/server/0064-Complete-resource-pack-API.patch +++ b/patches/unapplied/server/0064-Complete-resource-pack-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e21a6961bab606036440f2a6bd90998b4129ae10..9f0a5b950a022aa2a3d3d60837fdb9023f041a9b 100644 +index 2be965faaed8ca25fc01d6ca1f496f7e41e6b7a0..5443c0008ae3bb0264dbfc1b2bb3921de306c1dd 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1768,8 +1768,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -23,7 +23,7 @@ index e21a6961bab606036440f2a6bd90998b4129ae10..9f0a5b950a022aa2a3d3d60837fdb902 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 342cd3c6ffdcf46f0329e072fae446c5e9665e33..307c76b2d06b748304d28d6634e86bb91f3ded67 100644 +index 60850848e76d656d7b4e885c79dfe992108c8ad5..15257f9236d0c32c1c74a15ce4e7decf4d9f2f91 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -150,6 +150,7 @@ import org.bukkit.plugin.Plugin; diff --git a/patches/server/0065-Default-loading-permissions.yml-before-plugins.patch b/patches/unapplied/server/0065-Default-loading-permissions.yml-before-plugins.patch similarity index 100% rename from patches/server/0065-Default-loading-permissions.yml-before-plugins.patch rename to patches/unapplied/server/0065-Default-loading-permissions.yml-before-plugins.patch diff --git a/patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch b/patches/unapplied/server/0066-Allow-Reloading-of-Custom-Permissions.patch similarity index 100% rename from patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch rename to patches/unapplied/server/0066-Allow-Reloading-of-Custom-Permissions.patch diff --git a/patches/server/0067-Remove-Metadata-on-reload.patch b/patches/unapplied/server/0067-Remove-Metadata-on-reload.patch similarity index 100% rename from patches/server/0067-Remove-Metadata-on-reload.patch rename to patches/unapplied/server/0067-Remove-Metadata-on-reload.patch diff --git a/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch b/patches/unapplied/server/0068-Handle-Item-Meta-Inconsistencies.patch similarity index 99% rename from patches/server/0068-Handle-Item-Meta-Inconsistencies.patch rename to patches/unapplied/server/0068-Handle-Item-Meta-Inconsistencies.patch index c87023e427..5d25a8c8cd 100644 --- a/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch +++ b/patches/unapplied/server/0068-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 e937186aaf819a77c80beeb9e08413a1f781c13a..0e19f49ca2496b1c42d27289bcea15d26993ca85 100644 +index 1b83577ec8e78e20051f20a336e5cf3e7836c079..28a8ad5f42a5ba2e2a9d4c9a04a7add621b28e82 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -151,6 +151,23 @@ public final class ItemStack { diff --git a/patches/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/unapplied/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 93% rename from patches/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to patches/unapplied/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch index 9544e6114a..0c639a46e3 100644 --- a/patches/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch +++ b/patches/unapplied/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate Can set a much shorter despawn rate for arrows that players can not pick up. diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index 27c31a9e926f919c7edc8fc0cdd7fba70616d60c..7cd802be238cedf166174a61e816d9d4b29b87d2 100644 +index 0e3c8edf0891e815a67020bb094866fd47102d67..62cb9dff53d980399913c913893fca2c1110d184 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java @@ -311,7 +311,7 @@ public abstract class AbstractArrow extends Projectile { diff --git a/patches/server/0070-Add-World-Util-Methods.patch b/patches/unapplied/server/0070-Add-World-Util-Methods.patch similarity index 96% rename from patches/server/0070-Add-World-Util-Methods.patch rename to patches/unapplied/server/0070-Add-World-Util-Methods.patch index da13541bad..8ac7076ce6 100644 --- a/patches/server/0070-Add-World-Util-Methods.patch +++ b/patches/unapplied/server/0070-Add-World-Util-Methods.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods Methods that can be used for other patches to help improve logic. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index e235531d694e3e904042f2d42641c1ffbecfd5a3..d935fbdbee8b20f0efa09438b7d4c4a0da93abcc 100644 +index 29e432e9bea9da307c96d42d9b45d1c3a3161fa1..d0e069e2dd950f2fe0d51594ceddcbbe44458acd 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -216,7 +216,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0071-Custom-replacement-for-eaten-items.patch b/patches/unapplied/server/0071-Custom-replacement-for-eaten-items.patch similarity index 96% rename from patches/server/0071-Custom-replacement-for-eaten-items.patch rename to patches/unapplied/server/0071-Custom-replacement-for-eaten-items.patch index 62f3354374..992a82e46a 100644 --- a/patches/server/0071-Custom-replacement-for-eaten-items.patch +++ b/patches/unapplied/server/0071-Custom-replacement-for-eaten-items.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f513e9abb929fbabe12e40bb56af708745ea1ad9..d038c65e8a3d4a0000465e9d3ac7c4915b1b1015 100644 +index 17426b43a16887653a63c34128aa97785a23796c..c276190251c152f343de74d9c9b4028e10532ae1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3614,10 +3614,11 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/unapplied/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 96% rename from patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to patches/unapplied/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch index a32c66067a..7a57f61816 100644 --- a/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/patches/unapplied/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -5,7 +5,7 @@ Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d038c65e8a3d4a0000465e9d3ac7c4915b1b1015..2cf58d6e086c1d6cc86ed689eb0d1cdc89b69477 100644 +index c276190251c152f343de74d9c9b4028e10532ae1..766711e4d32ceebf9d94e39f9bcd14ff0371ad06 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -784,7 +784,13 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0073-Use-a-Shared-Random-for-Entities.patch b/patches/unapplied/server/0073-Use-a-Shared-Random-for-Entities.patch similarity index 97% rename from patches/server/0073-Use-a-Shared-Random-for-Entities.patch rename to patches/unapplied/server/0073-Use-a-Shared-Random-for-Entities.patch index d8ba52e49b..76f363ea62 100644 --- a/patches/server/0073-Use-a-Shared-Random-for-Entities.patch +++ b/patches/unapplied/server/0073-Use-a-Shared-Random-for-Entities.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e28ccb5651a793775166d51859620882ee54b641..233c8950816521be5a9d099c29c99d0a421d30e4 100644 +index 70275d1db39c9809a5fc93cebb49beb32d616476..dd5e9dc310f30c008f0c8c60ac4305160261bad9 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -159,6 +159,79 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/unapplied/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 94% rename from patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch rename to patches/unapplied/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch index 150405cc49..24b3b297c3 100644 --- a/patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/patches/unapplied/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable spawn chances for skeleton horses diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index d935fbdbee8b20f0efa09438b7d4c4a0da93abcc..0116fcc8de2b6bd1783db56f1062c9b590a65c34 100644 +index d0e069e2dd950f2fe0d51594ceddcbbe44458acd..5f3c21172dbb9a4a0cb8aa0bffcb17bc357ef04e 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -696,7 +696,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/unapplied/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 96% rename from patches/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/unapplied/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch index 07f2005801..ad6a7953ec 100644 --- a/patches/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch +++ b/patches/unapplied/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch @@ -54,7 +54,7 @@ index 0e787d877901dfcea714b0e14e9fc4358ee30bbe..41e61e6c128f22224665af3f07cd11d6 public abstract BlockState setBlockState(BlockPos pos, BlockState state, boolean moved); diff --git a/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java -index a78bf00d4559dd99869d93ec78b3525d24331925..b7856c420f346ac4923afa66a9f8276490f27e82 100644 +index 2eb92dde607d7c8968cb07c6f3c24e1c45e9990f..908f71721daf4305692f424d7712cbfdddddae83 100644 --- a/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java @@ -55,6 +55,12 @@ public class EmptyLevelChunk extends LevelChunk { @@ -88,7 +88,7 @@ index ac5dff35e2df23b8790bbe65c40acc6a3c77e6ac..8ffc206a858864d277ff94de7c66ffdb @Override public FluidState getFluidState(BlockPos pos) { diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index 20c9eada6f051ecdd5e45e625d7e6289d406a2f8..5244a0a85d80963493d9106dd2674b1701c1919c 100644 +index ea2176501dfa773a1114f5db4e6dbe4c2d2c7abe..0a08287d3b0471b01ee38eb62f92f542da35c07d 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -342,12 +342,29 @@ public class LevelChunk extends ChunkAccess { @@ -138,7 +138,7 @@ index dddae1e226d8f58cdcfc597e25d4228cd3245cb4..ae37e97e52557b48f129cc02eeea3953 private short tickingFluidCount; public final PalettedContainer states; diff --git a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java -index 040c6092ceed4c693a7a056c0d1a49d3d2242b19..13b62e8e6569c154547bc0d5626488c5b0839f20 100644 +index 0b67858f8d6689b34816f9556f3424af512a7401..c24b4c6a560aab2df07783b3481981deb8571a50 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java @@ -94,14 +94,18 @@ public class ProtoChunk extends ChunkAccess { diff --git a/patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/unapplied/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch similarity index 96% rename from patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch rename to patches/unapplied/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch index 8d12218f4b..909bfbff37 100644 --- a/patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch +++ b/patches/unapplied/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener Saves on some object allocation and processing when no plugin listens to this diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c0b8daca75feec011423ba4b4ef5900558bc4d92..7dce9f0355c74828f40b07276c34e352132a2549 100644 +index 093ac159fcc34de9901395ad9450372efdf7cb5b..c5e3f7f0623731c02e4625971fc82acbc834f51a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1350,6 +1350,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { return worldserver + " " + worldserver.dimension().location(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 51603dcbe81301557757152404c33fc91e21dc1a..81d24e082ad8be36db40c0ab62db3386401aa821 100644 +index 5f3c21172dbb9a4a0cb8aa0bffcb17bc357ef04e..1cfd73068455b1108a74156e9715061d2dca231f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -215,6 +215,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 92% rename from patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/unapplied/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch index 67b27958eb..59ceda0f86 100644 --- a/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/patches/unapplied/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 81d24e082ad8be36db40c0ab62db3386401aa821..6ec90ab4ff94c103682df9b66917e897cf420f33 100644 +index 1cfd73068455b1108a74156e9715061d2dca231f..b255f8bd65006240153cb607f65e277f8a560b75 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2245,6 +2245,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0078-Configurable-Chunk-Inhabited-Time.patch b/patches/unapplied/server/0078-Configurable-Chunk-Inhabited-Time.patch similarity index 92% rename from patches/server/0078-Configurable-Chunk-Inhabited-Time.patch rename to patches/unapplied/server/0078-Configurable-Chunk-Inhabited-Time.patch index 913007c7d1..34b3c0a6c3 100644 --- a/patches/server/0078-Configurable-Chunk-Inhabited-Time.patch +++ b/patches/unapplied/server/0078-Configurable-Chunk-Inhabited-Time.patch @@ -11,7 +11,7 @@ For people who want all chunks to be treated equally, you can chose a fixed valu This allows to fine-tune vanilla gameplay. diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index 5244a0a85d80963493d9106dd2674b1701c1919c..5cd8755dc8db2f1fdb32d2db3a5a137ca7cad3c7 100644 +index 0a08287d3b0471b01ee38eb62f92f542da35c07d..3a613d3fb6240a504724ba42b9aadaa0881b3ac1 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -327,6 +327,13 @@ public class LevelChunk extends ChunkAccess { diff --git a/patches/server/0079-EntityPathfindEvent.patch b/patches/unapplied/server/0079-EntityPathfindEvent.patch similarity index 100% rename from patches/server/0079-EntityPathfindEvent.patch rename to patches/unapplied/server/0079-EntityPathfindEvent.patch diff --git a/patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/unapplied/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch similarity index 100% rename from patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch rename to patches/unapplied/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch diff --git a/patches/server/0081-Do-not-load-chunks-for-Pathfinding.patch b/patches/unapplied/server/0081-Do-not-load-chunks-for-Pathfinding.patch similarity index 100% rename from patches/server/0081-Do-not-load-chunks-for-Pathfinding.patch rename to patches/unapplied/server/0081-Do-not-load-chunks-for-Pathfinding.patch diff --git a/patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/0082-Add-PlayerUseUnknownEntityEvent.patch similarity index 97% rename from patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch rename to patches/unapplied/server/0082-Add-PlayerUseUnknownEntityEvent.patch index 65c61e8d27..e2deda5e78 100644 --- a/patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch +++ b/patches/unapplied/server/0082-Add-PlayerUseUnknownEntityEvent.patch @@ -22,7 +22,7 @@ index 8834ed411a7db86b4d2b88183a1315317107d719..c45b5ab6776f3ac79f856c3a6467c510 static final ServerboundInteractPacket.Action ATTACK_ACTION = new ServerboundInteractPacket.Action() { @Override diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2f8a25e95dac5f61b5cc592200dbf6d76c00f5cd..5189a74fd224e50b7a0ca8df91aa06a57e7f1c02 100644 +index 5443c0008ae3bb0264dbfc1b2bb3921de306c1dd..65bd9005b722db154842978d359e0a2277bbb8b2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2644,8 +2644,37 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0083-Configurable-Grass-Spread-Tick-Rate.patch b/patches/unapplied/server/0083-Configurable-Grass-Spread-Tick-Rate.patch similarity index 100% rename from patches/server/0083-Configurable-Grass-Spread-Tick-Rate.patch rename to patches/unapplied/server/0083-Configurable-Grass-Spread-Tick-Rate.patch diff --git a/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/unapplied/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 89% rename from patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to patches/unapplied/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index 29f5f1ebcd..830d4a395d 100644 --- a/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/patches/unapplied/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b232df5fd870b75dc616dffcf76b15409fb6fdbe..937c4ad3acd69ee77d89c5f32480994d0b1ce5c9 100644 +index b255f8bd65006240153cb607f65e277f8a560b75..67c4b724b6b799c02ee4c5034d3472e44cb591fa 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1476,6 +1476,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0085-Optimize-DataBits.patch b/patches/unapplied/server/0085-Optimize-DataBits.patch similarity index 100% rename from patches/server/0085-Optimize-DataBits.patch rename to patches/unapplied/server/0085-Optimize-DataBits.patch diff --git a/patches/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/unapplied/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 100% rename from patches/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to patches/unapplied/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch diff --git a/patches/server/0087-Configurable-Player-Collision.patch b/patches/unapplied/server/0087-Configurable-Player-Collision.patch similarity index 97% rename from patches/server/0087-Configurable-Player-Collision.patch rename to patches/unapplied/server/0087-Configurable-Player-Collision.patch index 00970b35e0..6ebfa88df0 100644 --- a/patches/server/0087-Configurable-Player-Collision.patch +++ b/patches/unapplied/server/0087-Configurable-Player-Collision.patch @@ -18,7 +18,7 @@ index 1294b38262505b0d54089e428df9b363219de1f0..ee37ec0de1ca969144824427ae42b0c8 buf.writeComponent(this.playerPrefix); buf.writeComponent(this.playerSuffix); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7c389a37b9bac59f0ad3bbe1eae9c9f9b4bf014d..3b364c36f4c572e7f139997ef214bca8a8368e56 100644 +index c5e3f7f0623731c02e4625971fc82acbc834f51a..17ad0051afaaa0e201782228628c691b75b6cebc 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -580,6 +580,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop> consumer, Set trackedPlayers) { this.trackedPlayers = trackedPlayers; diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java -index 10f8b5ff56e4c1d8300835e045abdce719a99343..8101f358975b35b5a2dafbade3d14a910e408fa2 100644 +index 7a2ec239cd59b95dfd87ab1164d17bad23c4e558..65f0aa076dbfc4cd72d14ec485d1edf5533d825e 100644 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java @@ -97,6 +97,27 @@ public class PrimedTnt extends Entity { diff --git a/patches/server/0099-Faster-redstone-torch-rapid-clock-removal.patch b/patches/unapplied/server/0099-Faster-redstone-torch-rapid-clock-removal.patch similarity index 100% rename from patches/server/0099-Faster-redstone-torch-rapid-clock-removal.patch rename to patches/unapplied/server/0099-Faster-redstone-torch-rapid-clock-removal.patch diff --git a/patches/server/0100-Add-server-name-parameter.patch b/patches/unapplied/server/0100-Add-server-name-parameter.patch similarity index 100% rename from patches/server/0100-Add-server-name-parameter.patch rename to patches/unapplied/server/0100-Add-server-name-parameter.patch diff --git a/patches/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch b/patches/unapplied/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch similarity index 100% rename from patches/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch rename to patches/unapplied/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch diff --git a/patches/server/0102-Fix-Old-Sign-Conversion.patch b/patches/unapplied/server/0102-Fix-Old-Sign-Conversion.patch similarity index 100% rename from patches/server/0102-Fix-Old-Sign-Conversion.patch rename to patches/unapplied/server/0102-Fix-Old-Sign-Conversion.patch diff --git a/patches/server/0103-Avoid-blocking-on-Network-Manager-creation.patch b/patches/unapplied/server/0103-Avoid-blocking-on-Network-Manager-creation.patch similarity index 100% rename from patches/server/0103-Avoid-blocking-on-Network-Manager-creation.patch rename to patches/unapplied/server/0103-Avoid-blocking-on-Network-Manager-creation.patch diff --git a/patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/unapplied/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch similarity index 90% rename from patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch rename to patches/unapplied/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch index e542d272fa..1e05976371 100644 --- a/patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch +++ b/patches/unapplied/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't lookup game profiles that have no UUID and no name diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java -index 2249beff3200c5dab1e81bd3d10f2c3bf1e7dbc9..3295fd4bca58cf8feeff2fcefa514a5ec89310f9 100644 +index 225e15d686675e21969c4210fa38fef58d920355..5288aec173549a982e42aeeccf7f5f394080955d 100644 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java @@ -98,6 +98,7 @@ public class GameProfileCache { diff --git a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch b/patches/unapplied/server/0105-Add-setting-for-proxy-online-mode-status.patch similarity index 97% rename from patches/server/0105-Add-setting-for-proxy-online-mode-status.patch rename to patches/unapplied/server/0105-Add-setting-for-proxy-online-mode-status.patch index bd273b8189..774e8cb2a1 100644 --- a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch +++ b/patches/unapplied/server/0105-Add-setting-for-proxy-online-mode-status.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add setting for proxy online mode status TODO: Add isProxyOnlineMode check to Metrics diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java -index 3295fd4bca58cf8feeff2fcefa514a5ec89310f9..376845f5a25a348e76193fac5c047b0ba2fb080f 100644 +index 5288aec173549a982e42aeeccf7f5f394080955d..58e923f4ef1980bc7fff1e3b3fcdaad8c4eded53 100644 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java @@ -98,7 +98,8 @@ public class GameProfileCache { diff --git a/patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch b/patches/unapplied/server/0106-Optimise-BlockState-s-hashCode-equals.patch similarity index 100% rename from patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch rename to patches/unapplied/server/0106-Optimise-BlockState-s-hashCode-equals.patch diff --git a/patches/server/0107-Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/0107-Configurable-packet-in-spam-threshold.patch similarity index 94% rename from patches/server/0107-Configurable-packet-in-spam-threshold.patch rename to patches/unapplied/server/0107-Configurable-packet-in-spam-threshold.patch index 7059a874f8..cd270f2cbd 100644 --- a/patches/server/0107-Configurable-packet-in-spam-threshold.patch +++ b/patches/unapplied/server/0107-Configurable-packet-in-spam-threshold.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable packet in spam threshold diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b86f742c4a7500f0bb241d5c07a077aa1be1c7e5..c94a736dbf02c2ba34e74e73b6cc3780238f0ede 100644 +index 65bd9005b722db154842978d359e0a2277bbb8b2..3978ba09a5e29aaf9e48d5e4f800b1027181a4ad 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1611,13 +1611,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0108-Configurable-flying-kick-messages.patch b/patches/unapplied/server/0108-Configurable-flying-kick-messages.patch similarity index 95% rename from patches/server/0108-Configurable-flying-kick-messages.patch rename to patches/unapplied/server/0108-Configurable-flying-kick-messages.patch index b4c5d977eb..db9a9cd97a 100644 --- a/patches/server/0108-Configurable-flying-kick-messages.patch +++ b/patches/unapplied/server/0108-Configurable-flying-kick-messages.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c94a736dbf02c2ba34e74e73b6cc3780238f0ede..75bc0d9e8ec46d1fcfd6d5886d5ab03537e575d2 100644 +index 3978ba09a5e29aaf9e48d5e4f800b1027181a4ad..e032a9f72aa5d55daa9c680734e45e3dda13ca9b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -358,7 +358,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0109-Add-EntityZapEvent.patch b/patches/unapplied/server/0109-Add-EntityZapEvent.patch similarity index 100% rename from patches/server/0109-Add-EntityZapEvent.patch rename to patches/unapplied/server/0109-Add-EntityZapEvent.patch diff --git a/patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/patches/unapplied/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch similarity index 94% rename from patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch rename to patches/unapplied/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch index 9fc8ffaeaf..f7ef378ecd 100644 --- a/patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch +++ b/patches/unapplied/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java -index 6c4be7da19d0d61f35942558d438587853231aaa..18d81e8e8f387a7fb531652cb78c61a9bd5ae600 100644 +index 9ef526b3da1185f32257b8fb2fa79ff281855713..108c9ea0eb4a7f381042bfe0203ac40a9c4f27a7 100644 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java @@ -316,6 +316,18 @@ public class FallingBlockEntity extends Entity { diff --git a/patches/server/0111-Cache-user-authenticator-threads.patch b/patches/unapplied/server/0111-Cache-user-authenticator-threads.patch similarity index 100% rename from patches/server/0111-Cache-user-authenticator-threads.patch rename to patches/unapplied/server/0111-Cache-user-authenticator-threads.patch diff --git a/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/0112-Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/server/0112-Allow-Reloading-of-Command-Aliases.patch rename to patches/unapplied/server/0112-Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/0113-Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch rename to patches/unapplied/server/0113-Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/server/0114-Add-ProjectileCollideEvent.patch b/patches/unapplied/server/0114-Add-ProjectileCollideEvent.patch similarity index 98% rename from patches/server/0114-Add-ProjectileCollideEvent.patch rename to patches/unapplied/server/0114-Add-ProjectileCollideEvent.patch index 8c5308cbe4..affd54446b 100644 --- a/patches/server/0114-Add-ProjectileCollideEvent.patch +++ b/patches/unapplied/server/0114-Add-ProjectileCollideEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add ProjectileCollideEvent diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index 7cd802be238cedf166174a61e816d9d4b29b87d2..7f1f4813ac007fbf79e8ba254075c015fe15e3a1 100644 +index 62cb9dff53d980399913c913893fca2c1110d184..da92f324322f4fb18f9aa72c4298ffc8ab040953 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java @@ -226,6 +226,17 @@ public abstract class AbstractArrow extends Projectile { diff --git a/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/0115-Prevent-Pathfinding-out-of-World-Border.patch similarity index 100% rename from patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch rename to patches/unapplied/server/0115-Prevent-Pathfinding-out-of-World-Border.patch diff --git a/patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/unapplied/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch similarity index 100% rename from patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch rename to patches/unapplied/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch diff --git a/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/0117-Bound-Treasure-Maps-to-World-Border.patch similarity index 100% rename from patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch rename to patches/unapplied/server/0117-Bound-Treasure-Maps-to-World-Border.patch diff --git a/patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/0118-Configurable-Cartographer-Treasure-Maps.patch similarity index 100% rename from patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch rename to patches/unapplied/server/0118-Configurable-Cartographer-Treasure-Maps.patch diff --git a/patches/server/0119-Optimize-ItemStack.isEmpty.patch b/patches/unapplied/server/0119-Optimize-ItemStack.isEmpty.patch similarity index 90% rename from patches/server/0119-Optimize-ItemStack.isEmpty.patch rename to patches/unapplied/server/0119-Optimize-ItemStack.isEmpty.patch index cb004037bf..51afc65b61 100644 --- a/patches/server/0119-Optimize-ItemStack.isEmpty.patch +++ b/patches/unapplied/server/0119-Optimize-ItemStack.isEmpty.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty() Remove hashMap lookup every check, simplify code to remove ternary diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 0e19f49ca2496b1c42d27289bcea15d26993ca85..c0959edaef2bc0ebcfa482cd120855c23d83f2b8 100644 +index 28a8ad5f42a5ba2e2a9d4c9a04a7add621b28e82..7b61f9c45b9e23562bd5cf448df319ba9e1e091a 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -245,7 +245,7 @@ public final class ItemStack { diff --git a/patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 100% rename from patches/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to patches/unapplied/server/0120-Add-API-methods-to-control-if-armour-stands-can-move.patch diff --git a/patches/server/0121-String-based-Action-Bar-API.patch b/patches/unapplied/server/0121-String-based-Action-Bar-API.patch similarity index 96% rename from patches/server/0121-String-based-Action-Bar-API.patch rename to patches/unapplied/server/0121-String-based-Action-Bar-API.patch index 916142b45d..636afb03f0 100644 --- a/patches/server/0121-String-based-Action-Bar-API.patch +++ b/patches/unapplied/server/0121-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 4b7e5996b8b49d96f14cbd0d2167a0a09b47f4ec..843764d27c490e94bcf2becdafb15e5f1a68bc92 100644 +index 1e1deab4d8be5523a55daf072d7e12b08d36b560..87c8e494aa374b8bfb8b8432723783b00ba94763 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -355,6 +355,26 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0122-Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/0122-Properly-fix-item-duplication-bug.patch similarity index 94% rename from patches/server/0122-Properly-fix-item-duplication-bug.patch rename to patches/unapplied/server/0122-Properly-fix-item-duplication-bug.patch index 6a86bb31ec..f3c65cef8f 100644 --- a/patches/server/0122-Properly-fix-item-duplication-bug.patch +++ b/patches/unapplied/server/0122-Properly-fix-item-duplication-bug.patch @@ -19,7 +19,7 @@ index 3cea2ceb5d30329aa84f6659330eea075387fe18..0fded4890038de77781c27565fa3c8fe @Override diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 75bc0d9e8ec46d1fcfd6d5886d5ab03537e575d2..9df3561fca35b1649de1545e924bd96ec5f80089 100644 +index e032a9f72aa5d55daa9c680734e45e3dda13ca9b..6282cebfa3786c9ac72fcebeee1b8c4cdf5d7238 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3283,7 +3283,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0123-Firework-API-s.patch b/patches/unapplied/server/0123-Firework-API-s.patch similarity index 100% rename from patches/server/0123-Firework-API-s.patch rename to patches/unapplied/server/0123-Firework-API-s.patch diff --git a/patches/server/0124-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/0124-PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0124-PlayerTeleportEndGatewayEvent.patch rename to patches/unapplied/server/0124-PlayerTeleportEndGatewayEvent.patch diff --git a/patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 100% rename from patches/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/unapplied/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch diff --git a/patches/server/0126-Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/0126-Enforce-Sync-Player-Saves.patch similarity index 92% rename from patches/server/0126-Enforce-Sync-Player-Saves.patch rename to patches/unapplied/server/0126-Enforce-Sync-Player-Saves.patch index db22ab7995..ba14b9257f 100644 --- a/patches/server/0126-Enforce-Sync-Player-Saves.patch +++ b/patches/unapplied/server/0126-Enforce-Sync-Player-Saves.patch @@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 0d0b04775dc36c1749d8f19f5c8d2b9dd9bb5a1e..730f30b6ee5230cde784b7f0a2b20699968f7e15 100644 +index afbb45f2ee55f193e30c19bc20edc42434f16784..51add7e60fbd9eebbddc4893de044edc35854409 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1042,11 +1042,13 @@ public abstract class PlayerList { diff --git a/patches/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/unapplied/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch similarity index 100% rename from patches/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch rename to patches/unapplied/server/0127-Don-t-allow-entities-to-ride-themselves-572.patch diff --git a/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 98% rename from patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/unapplied/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 9efb14a80f..18d06d1c48 100644 --- a/patches/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/patches/unapplied/server/0128-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -131,7 +131,7 @@ index 63b57d47d7dbb7a8a655b1447241e20c67a3f9c2..0c19aa68dc444373bf1a9bd3b349d12d @Override diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 37076ea1f07108db37dd67f5f7d4466534994a9f..3e2dd4a1fb1e2a99da88d392457d92eb9087c430 100644 +index a0d6273a8a5613ee732c3dbb6eff46ecf42b5f4a..a42983b4d7dbd360bbe4206dcf6aa95375ef9b2b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1726,7 +1726,8 @@ public abstract class LivingEntity extends Entity { @@ -197,7 +197,7 @@ index fe660bbaa4113fb2ffa1ea2f10e4e1e674fbb86d..bb6063ae7f4438916306ce876057f748 } diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java -index e6a6b0a298e69ce975eac413723f068aaef72ec0..1709126f0853edc6bece6f31d7c65a5f8955683a 100644 +index 127aab56eef67d7f02f5c3de80d8f445ba70e7db..6eada8313e468e4ea851094976ac98c11710fb45 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java @@ -647,7 +647,7 @@ public class EnderDragon extends Mob implements Enemy { @@ -232,7 +232,7 @@ index 33d1a6b31afec4dbeb00dcabf50c5840852102d6..25cd8a4101cf44955d95924c9794c238 } diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -index b9a0fc52460ce0c50deea25112dee20c977e99c5..d7cb3d8b37f225ee4796246aa907da1092fa9a0d 100644 +index 9bc9307966b77e34cb091fc895db3d3a66f7be82..e594cf4b8084b7448c29208a2070e766e391713d 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java @@ -186,7 +186,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill diff --git a/patches/server/0129-Cap-Entity-Collisions.patch b/patches/unapplied/server/0129-Cap-Entity-Collisions.patch similarity index 91% rename from patches/server/0129-Cap-Entity-Collisions.patch rename to patches/unapplied/server/0129-Cap-Entity-Collisions.patch index 53b175e41e..2087d46233 100644 --- a/patches/server/0129-Cap-Entity-Collisions.patch +++ b/patches/unapplied/server/0129-Cap-Entity-Collisions.patch @@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped. You can set this to 0 to disable collisions. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b4d96dfc68788a4eae2197a0f2615de213d5ca8b..6e1b53317c4107f907e551a9baeaf64909f6de87 100644 +index 86fa079f9f1f958ed586c966467d26a44e09b11c..58256b341aa15e946abef464453c0ffcaf55b372 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -379,6 +379,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -24,7 +24,7 @@ index b4d96dfc68788a4eae2197a0f2615de213d5ca8b..6e1b53317c4107f907e551a9baeaf649 private org.bukkit.util.Vector origin; @javax.annotation.Nullable diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3e2dd4a1fb1e2a99da88d392457d92eb9087c430..2e006451768f08998dfae3999f28429ef0b491af 100644 +index a42983b4d7dbd360bbe4206dcf6aa95375ef9b2b..6295c89211ba86c10009775f4d399f597d240fd0 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3289,8 +3289,11 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 100% rename from patches/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch rename to patches/unapplied/server/0130-Remove-CraftScheduler-Async-Task-Debugger.patch diff --git a/patches/server/0131-Do-not-let-armorstands-drown.patch b/patches/unapplied/server/0131-Do-not-let-armorstands-drown.patch similarity index 100% rename from patches/server/0131-Do-not-let-armorstands-drown.patch rename to patches/unapplied/server/0131-Do-not-let-armorstands-drown.patch diff --git a/patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/0132-Properly-handle-async-calls-to-restart-the-server.patch similarity index 98% rename from patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch rename to patches/unapplied/server/0132-Properly-handle-async-calls-to-restart-the-server.patch index 8b06614a56..6bbd4f97f5 100644 --- a/patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch +++ b/patches/unapplied/server/0132-Properly-handle-async-calls-to-restart-the-server.patch @@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result in corruption/dataloss. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f1d4a7a9e74adc18e18b2df960794ec8c05ce340..37a3c1bd60dbd0e0069120d4f48a17cfbc82dca1 100644 +index f438056c74dd24142bd94b505160711d0f94a5d5..f852c1315cf9dcba56f5877063254d4c608abd61 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -221,6 +221,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e40eeb5e04d96fb55283ded82cea0a5539a2fad5..90bd5c1a010a3a9d24328e5c719053603e206626 100644 +index f1e3955625e3ae3e4b47cd53d3af7ec70892add6..b7d700c85d3a8c92e6c3cdd3d266f20f90fb8da8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -784,12 +784,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0169-PlayerPickupExperienceEvent.patch b/patches/unapplied/server/0169-PlayerPickupExperienceEvent.patch similarity index 92% rename from patches/server/0169-PlayerPickupExperienceEvent.patch rename to patches/unapplied/server/0169-PlayerPickupExperienceEvent.patch index f59d0999a5..4076248476 100644 --- a/patches/server/0169-PlayerPickupExperienceEvent.patch +++ b/patches/unapplied/server/0169-PlayerPickupExperienceEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent Allows plugins to cancel a player picking up an experience orb diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java -index 16a1a005f2dda30cf804bf51638383ef3bfeb43e..80f4dfdbc410aa3346897e2ca63272a081712b6e 100644 +index 0c19aa68dc444373bf1a9bd3b349d12df7d8dd9d..2fead19c1c4b04f94999887b196ceaee025edd99 100644 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java @@ -303,7 +303,7 @@ public class ExperienceOrb extends Entity { diff --git a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/0170-Ability-to-apply-mending-to-XP-API.patch similarity index 100% rename from patches/server/0170-Ability-to-apply-mending-to-XP-API.patch rename to patches/unapplied/server/0170-Ability-to-apply-mending-to-XP-API.patch diff --git a/patches/server/0171-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/0171-PlayerNaturallySpawnCreaturesEvent.patch similarity index 94% rename from patches/server/0171-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/unapplied/server/0171-PlayerNaturallySpawnCreaturesEvent.patch index 8e24b34515..1a31656ac4 100644 --- a/patches/server/0171-PlayerNaturallySpawnCreaturesEvent.patch +++ b/patches/unapplied/server/0171-PlayerNaturallySpawnCreaturesEvent.patch @@ -9,7 +9,7 @@ from triggering monster spawns on a server. Also a highly more effecient way to blanket block spawns in a world diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index eda47a2c2a26fcf3434af140e1436395b2506cb0..ea9f536efd4c76b421f6e02f93f16fae115840d8 100644 +index f69a4df520760fe9e849eb61512f410b82d7a034..236e0f8cc271d1ca1a2cb64e333d59de1cb953ea 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -680,7 +680,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -40,7 +40,7 @@ index eda47a2c2a26fcf3434af140e1436395b2506cb0..ea9f536efd4c76b421f6e02f93f16fae return true; diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index b3cff10fece84839fe85feb297fafbcd4a02d838..70077d3f359944e2df29198ae156be477ebc278d 100644 +index e63c655a9c65f0408c3d025ee4619a7923685b3c..302667d7b6dca8528e7107255feaeb6d6f837cf3 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -714,6 +714,15 @@ public class ServerChunkCache extends ChunkSource { @@ -60,7 +60,7 @@ index b3cff10fece84839fe85feb297fafbcd4a02d838..70077d3f359944e2df29198ae156be47 while (iterator1.hasNext()) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 776d2b38f284e13ec9a7dd67a538626817c79887..91f258aa1d4b888b1e1c604ce5f1cf0d755adb9d 100644 +index 0fded4890038de77781c27565fa3c8fe60e50aac..81a0407256a3a37e8ccb136e7fd602d95106c590 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0172-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/0172-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/0172-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/unapplied/server/0172-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/0173-PreCreatureSpawnEvent.patch b/patches/unapplied/server/0173-PreCreatureSpawnEvent.patch similarity index 98% rename from patches/server/0173-PreCreatureSpawnEvent.patch rename to patches/unapplied/server/0173-PreCreatureSpawnEvent.patch index 3ad4668bab..0de1d52b9d 100644 --- a/patches/server/0173-PreCreatureSpawnEvent.patch +++ b/patches/unapplied/server/0173-PreCreatureSpawnEvent.patch @@ -97,7 +97,7 @@ index 25cd8a4101cf44955d95924c9794c238ddde2901..f957c0aca36b7228ac3a33ca04c948b1 } } diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index ac767d107ea0d856f3f8caccfe6f79b14e933005..c41c1fa8085f502363c8273cd9fce1cf1743fe71 100644 +index 796e3bde04a118076ea004b0d58fd25641a7611e..2022224d2c5da60687474c5666e2bac207bf3f59 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -124,6 +124,27 @@ public abstract class BaseSpawner { @@ -129,7 +129,7 @@ index ac767d107ea0d856f3f8caccfe6f79b14e933005..c41c1fa8085f502363c8273cd9fce1cf Entity entity = EntityType.loadEntityRecursive(nbttagcompound, world, (entity1) -> { entity1.moveTo(d0, d1, d2, entity1.getYRot(), entity1.getXRot()); diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index c6ba7427b53398ddc8f0c942a810fad6e24561b4..c41390f5b9260bcfb843460904e1315695a1a972 100644 +index 287ea1d056556e106a23987eb9f1b42e81ce6262..6bc6c827a96e3fb7d7d9ca15e866d428d31a3e1f 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -212,7 +212,13 @@ public final class NaturalSpawner { diff --git a/patches/server/0174-Fill-Profile-Property-Events.patch b/patches/unapplied/server/0174-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/0174-Fill-Profile-Property-Events.patch rename to patches/unapplied/server/0174-Fill-Profile-Property-Events.patch diff --git a/patches/server/0175-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/0175-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/0175-PlayerAdvancementCriterionGrantEvent.patch rename to patches/unapplied/server/0175-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/0176-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/0176-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/server/0176-Add-ArmorStand-Item-Meta.patch rename to patches/unapplied/server/0176-Add-ArmorStand-Item-Meta.patch diff --git a/patches/server/0177-Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/0177-Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/0177-Extend-Player-Interact-cancellation.patch rename to patches/unapplied/server/0177-Extend-Player-Interact-cancellation.patch diff --git a/patches/server/0178-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/0178-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/0178-Tameable-getOwnerUniqueId-API.patch rename to patches/unapplied/server/0178-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/unapplied/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 91% rename from patches/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to patches/unapplied/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch index dd76c430fe..e080fddae5 100644 --- a/patches/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch +++ b/patches/unapplied/server/0179-Toggleable-player-crits-helps-mitigate-hacked-client.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients. diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index b07b9949b144981a8c461fc68bf3c296fd278572..b8cddd5616522a6b0fd8d70620f3c3fffbf003dc 100644 +index 0dc19e4701b35e94e94f07d261b3dbbdf9567d7b..35fa3a714c1a0fad5f0ed6149b4a248deb02e213 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1253,6 +1253,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0180-Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/0180-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/0180-Disable-Explicit-Network-Manager-Flushing.patch rename to patches/unapplied/server/0180-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/0181-Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/0181-Implement-extended-PaperServerListPingEvent.patch similarity index 98% rename from patches/server/0181-Implement-extended-PaperServerListPingEvent.patch rename to patches/unapplied/server/0181-Implement-extended-PaperServerListPingEvent.patch index fa4ddb2052..efaa0d4e06 100644 --- a/patches/server/0181-Implement-extended-PaperServerListPingEvent.patch +++ b/patches/unapplied/server/0181-Implement-extended-PaperServerListPingEvent.patch @@ -190,7 +190,7 @@ index 67455a5ba75c9b816213e44d6872c5ddf8e27e98..23efad80934930beadf15e65781551d4 public ClientboundStatusResponsePacket(ServerStatus metadata) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3bd4b16da49a730326f5b9039649eb59e3043bd0..d65423b8d7b69db79de05587efba13008602f743 100644 +index b404a222e741064185269a42a102d3e4c1f481d7..3509785412395aec7d316fcf37d58fb7cb1a9e5f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2,6 +2,9 @@ package net.minecraft.server; @@ -213,7 +213,7 @@ index 3bd4b16da49a730326f5b9039649eb59e3043bd0..d65423b8d7b69db79de05587efba1300 for (int k = 0; k < agameprofile.length; ++k) { diff --git a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java -index a426adfba3fccf1815177e0b8065684c9497ef45..29a22da1b94d51300481c071aa16bfd8cd02178f 100644 +index 3d187753790d31cdf1ec0351f2003128f0efce34..f90eb6c50208879c4a2d5ad7e4181c06d38076f8 100644 --- a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java @@ -46,6 +46,8 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene diff --git a/patches/server/0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/server/0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/server/0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/unapplied/server/0182-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/server/0183-Player.setPlayerProfile-API.patch b/patches/unapplied/server/0183-Player.setPlayerProfile-API.patch similarity index 100% rename from patches/server/0183-Player.setPlayerProfile-API.patch rename to patches/unapplied/server/0183-Player.setPlayerProfile-API.patch diff --git a/patches/server/0184-getPlayerUniqueId-API.patch b/patches/unapplied/server/0184-getPlayerUniqueId-API.patch similarity index 94% rename from patches/server/0184-getPlayerUniqueId-API.patch rename to patches/unapplied/server/0184-getPlayerUniqueId-API.patch index 9a49d54845..8ce616d2f4 100644 --- a/patches/server/0184-getPlayerUniqueId-API.patch +++ b/patches/unapplied/server/0184-getPlayerUniqueId-API.patch @@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ca6bb66e8ba1e17f025b82091910ca223185ad3b..a60b93a15d5cf80745eb114b393465ff1c53f444 100644 +index bbf9550e7a7c78e961160ef09466e5f962172b6c..10070e017f6d8845e2533cd4bee8e9c37178d77d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1708,6 +1708,25 @@ public final class CraftServer implements Server { diff --git a/patches/server/0185-Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/0185-Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/server/0185-Improved-Async-Task-Scheduler.patch rename to patches/unapplied/server/0185-Improved-Async-Task-Scheduler.patch diff --git a/patches/server/0186-Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/0186-Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/server/0186-Make-legacy-ping-handler-more-reliable.patch rename to patches/unapplied/server/0186-Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/unapplied/server/0187-Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/server/0188-Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/0188-Flag-to-disable-the-channel-limit.patch similarity index 95% rename from patches/server/0188-Flag-to-disable-the-channel-limit.patch rename to patches/unapplied/server/0188-Flag-to-disable-the-channel-limit.patch index 3573578067..1c3bff4d26 100644 --- a/patches/server/0188-Flag-to-disable-the-channel-limit.patch +++ b/patches/unapplied/server/0188-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 aadc01662c07ab99466babc8f5ed5b3bef2c1a8e..cf967ce377aab7fd00bd096d68ef0b66697817bf 100644 +index 88f12c573ed26dbf83f61679bbee4f0fbf566a08..98741b2595ef9946e190dd8af4a4c07103e383b7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -173,6 +173,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0189-Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/server/0189-Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/server/0189-Add-openSign-method-to-HumanEntity.patch rename to patches/unapplied/server/0189-Add-openSign-method-to-HumanEntity.patch diff --git a/patches/server/0190-Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/0190-Configurable-sprint-interruption-on-attack.patch similarity index 92% rename from patches/server/0190-Configurable-sprint-interruption-on-attack.patch rename to patches/unapplied/server/0190-Configurable-sprint-interruption-on-attack.patch index 5f5e0d01bf..966545435d 100644 --- a/patches/server/0190-Configurable-sprint-interruption-on-attack.patch +++ b/patches/unapplied/server/0190-Configurable-sprint-interruption-on-attack.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack If the sprint interruption is disabled players continue sprinting when they attack entities. diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index b8cddd5616522a6b0fd8d70620f3c3fffbf003dc..25c3164c9ad3c43d866069fcccb579a282b1ab78 100644 +index 35fa3a714c1a0fad5f0ed6149b4a248deb02e213..0a5eafd628f720737288e0f6933204c156ad5267 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1302,7 +1302,11 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 94% rename from patches/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to patches/unapplied/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index 1dffd9f0c4..49c39c6d56 100644 --- a/patches/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/patches/unapplied/server/0191-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 90bd5c1a010a3a9d24328e5c719053603e206626..116dee1f1f9c489e6f85a8fa3b7f36267109d720 100644 +index b7d700c85d3a8c92e6c3cdd3d266f20f90fb8da8..f148e990bd66a9d8fec3210865386243a19c1a3e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3256,9 +3256,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0192-EndermanEscapeEvent.patch b/patches/unapplied/server/0192-EndermanEscapeEvent.patch similarity index 100% rename from patches/server/0192-EndermanEscapeEvent.patch rename to patches/unapplied/server/0192-EndermanEscapeEvent.patch diff --git a/patches/server/0193-Enderman.teleportRandomly.patch b/patches/unapplied/server/0193-Enderman.teleportRandomly.patch similarity index 100% rename from patches/server/0193-Enderman.teleportRandomly.patch rename to patches/unapplied/server/0193-Enderman.teleportRandomly.patch diff --git a/patches/server/0194-Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/0194-Block-Enderpearl-Travel-Exploit.patch similarity index 100% rename from patches/server/0194-Block-Enderpearl-Travel-Exploit.patch rename to patches/unapplied/server/0194-Block-Enderpearl-Travel-Exploit.patch diff --git a/patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 95% rename from patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/unapplied/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch index 64e817258b..54c60bea39 100644 --- a/patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/unapplied/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle. This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index c3d323595a2714c8274fddfbdddec3ea19fc0373..dcf611bf64eaf9156ece3a7d18cb42548c534ed8 100644 +index abfbbab15c83bd09e62525442aea1a2ef2d2a085..0bd670cb37614dfb09c1a81c9fa7526a7b16cac0 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1597,12 +1597,17 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -34,7 +34,7 @@ index c3d323595a2714c8274fddfbdddec3ea19fc0373..dcf611bf64eaf9156ece3a7d18cb4254 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 a75f4a1ecfe2790d727f5dda792c5ab4bb45554e..fee71f001933f9320daa865db433f3b5855278fa 100644 +index 2636ef8f827b30315693f1b406debcdea0716170..aa0b71fe6de57a6f537737ab458a4deb76576c95 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1809,11 +1809,17 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/unapplied/server/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 100% rename from patches/server/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to patches/unapplied/server/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch diff --git a/patches/server/0197-EndermanAttackPlayerEvent.patch b/patches/unapplied/server/0197-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/server/0197-EndermanAttackPlayerEvent.patch rename to patches/unapplied/server/0197-EndermanAttackPlayerEvent.patch diff --git a/patches/server/0198-WitchConsumePotionEvent.patch b/patches/unapplied/server/0198-WitchConsumePotionEvent.patch similarity index 100% rename from patches/server/0198-WitchConsumePotionEvent.patch rename to patches/unapplied/server/0198-WitchConsumePotionEvent.patch diff --git a/patches/server/0199-WitchThrowPotionEvent.patch b/patches/unapplied/server/0199-WitchThrowPotionEvent.patch similarity index 100% rename from patches/server/0199-WitchThrowPotionEvent.patch rename to patches/unapplied/server/0199-WitchThrowPotionEvent.patch diff --git a/patches/server/0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/unapplied/server/0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 100% rename from patches/server/0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to patches/unapplied/server/0200-Allow-spawning-Item-entities-with-World.spawnEntity.patch diff --git a/patches/server/0201-WitchReadyPotionEvent.patch b/patches/unapplied/server/0201-WitchReadyPotionEvent.patch similarity index 100% rename from patches/server/0201-WitchReadyPotionEvent.patch rename to patches/unapplied/server/0201-WitchReadyPotionEvent.patch diff --git a/patches/server/0202-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/0202-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/server/0202-ItemStack-getMaxItemUseDuration.patch rename to patches/unapplied/server/0202-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/server/0203-Implement-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/0203-Implement-EntityTeleportEndGatewayEvent.patch similarity index 95% rename from patches/server/0203-Implement-EntityTeleportEndGatewayEvent.patch rename to patches/unapplied/server/0203-Implement-EntityTeleportEndGatewayEvent.patch index b1a4699bbc..235d5638a6 100644 --- a/patches/server/0203-Implement-EntityTeleportEndGatewayEvent.patch +++ b/patches/unapplied/server/0203-Implement-EntityTeleportEndGatewayEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement EntityTeleportEndGatewayEvent diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java -index 8a65d379a67630967d07d97fdc528838453763a9..befd35b0edf4a76b119f711f8536369a02abc1ba 100644 +index 575e9ced37b6b865de342d305af2c5762ae6fcb9..9bb730b489006c7baaaf55194ef796ff20771dd3 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java @@ -224,9 +224,20 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity { diff --git a/patches/server/0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/unapplied/server/0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/server/0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/unapplied/server/0204-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/server/0205-Fix-CraftEntity-hashCode.patch b/patches/unapplied/server/0205-Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/server/0205-Fix-CraftEntity-hashCode.patch rename to patches/unapplied/server/0205-Fix-CraftEntity-hashCode.patch diff --git a/patches/server/0206-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/unapplied/server/0206-Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 100% rename from patches/server/0206-Configurable-Alternative-LootPool-Luck-Formula.patch rename to patches/unapplied/server/0206-Configurable-Alternative-LootPool-Luck-Formula.patch diff --git a/patches/server/0207-Print-Error-details-when-failing-to-save-player-data.patch b/patches/unapplied/server/0207-Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/server/0207-Print-Error-details-when-failing-to-save-player-data.patch rename to patches/unapplied/server/0207-Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/server/0208-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/0208-Make-shield-blocking-delay-configurable.patch similarity index 96% rename from patches/server/0208-Make-shield-blocking-delay-configurable.patch rename to patches/unapplied/server/0208-Make-shield-blocking-delay-configurable.patch index 7908d769f8..3fa42aca8e 100644 --- a/patches/server/0208-Make-shield-blocking-delay-configurable.patch +++ b/patches/unapplied/server/0208-Make-shield-blocking-delay-configurable.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make shield blocking delay configurable diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b1ad2db0b3e0f5b287621e8096fb5fc7dd5ce32d..dee8ae99220c84b969be18dd7e1ef05ce088b937 100644 +index e49803f36ffea3329a67542882ee58e4762a08e5..bc90eb2e644916f73f02d94de1dcc9f3f7307390 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3726,12 +3726,24 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0209-Improve-EntityShootBowEvent.patch b/patches/unapplied/server/0209-Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/server/0209-Improve-EntityShootBowEvent.patch rename to patches/unapplied/server/0209-Improve-EntityShootBowEvent.patch diff --git a/patches/server/0210-PlayerReadyArrowEvent.patch b/patches/unapplied/server/0210-PlayerReadyArrowEvent.patch similarity index 95% rename from patches/server/0210-PlayerReadyArrowEvent.patch rename to patches/unapplied/server/0210-PlayerReadyArrowEvent.patch index ccaaa2610b..1e81d62290 100644 --- a/patches/server/0210-PlayerReadyArrowEvent.patch +++ b/patches/unapplied/server/0210-PlayerReadyArrowEvent.patch @@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use. Plugins can skip selection of certain arrows and control which is used. diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 25c3164c9ad3c43d866069fcccb579a282b1ab78..6059bec9cafd69d622491222b67bc7ff78e13d7a 100644 +index 0a5eafd628f720737288e0f6933204c156ad5267..df899b3280c484dbeeebda4edfedcac3c4b4dae7 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -2254,6 +2254,17 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0211-Implement-EntityKnockbackByEntityEvent.patch b/patches/unapplied/server/0211-Implement-EntityKnockbackByEntityEvent.patch similarity index 96% rename from patches/server/0211-Implement-EntityKnockbackByEntityEvent.patch rename to patches/unapplied/server/0211-Implement-EntityKnockbackByEntityEvent.patch index 8fffb8f4b8..0b62961eb9 100644 --- a/patches/server/0211-Implement-EntityKnockbackByEntityEvent.patch +++ b/patches/unapplied/server/0211-Implement-EntityKnockbackByEntityEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent This event is called when an entity receives knockback by another entity. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index dee8ae99220c84b969be18dd7e1ef05ce088b937..30983979f3501c693c7d1f96c47d9cfa1eaa243a 100644 +index bc90eb2e644916f73f02d94de1dcc9f3f7307390..cc7cf6a8b610c72b72ba128c086df61371f59c25 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1456,7 +1456,7 @@ public abstract class LivingEntity extends Entity { @@ -56,7 +56,7 @@ index dee8ae99220c84b969be18dd7e1ef05ce088b937..30983979f3501c693c7d1f96c47d9cfa } diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index f0123009b27a763cee6761c46ecae354d3e54d65..8fdba296673def1e8f69d48c35b07e355a74c9a3 100644 +index 4f3d3bb811ea767bbcc4327eeefcdc6d58ed5230..debc0cd9a71002878c0f68409b936e14c4a4dfda 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1579,7 +1579,7 @@ public abstract class Mob extends LivingEntity { @@ -82,7 +82,7 @@ index 3380b95e0eff5a6b1b683b8233b8991eb817b638..de8485df1c23e903ff0721fdb682b98d serverLevel.playSound((Player)null, goat, this.getImpactSound.apply(goat), SoundSource.HOSTILE, 1.0F, 1.0F); } else if (this.hasRammedHornBreakingBlock(serverLevel, goat)) { diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 6059bec9cafd69d622491222b67bc7ff78e13d7a..702a5e524127f9655279a24b54b8d4248dec460e 100644 +index df899b3280c484dbeeebda4edfedcac3c4b4dae7..f230038801ec9535670c25ed6fd9e3e0ed29c483 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1296,7 +1296,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0212-Expand-Explosions-API.patch b/patches/unapplied/server/0212-Expand-Explosions-API.patch similarity index 93% rename from patches/server/0212-Expand-Explosions-API.patch rename to patches/unapplied/server/0212-Expand-Explosions-API.patch index f503a30fbc..a4381db1a7 100644 --- a/patches/server/0212-Expand-Explosions-API.patch +++ b/patches/unapplied/server/0212-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 fee71f001933f9320daa865db433f3b5855278fa..339baff7014e98cbe03806d9a689ec09e0b30a47 100644 +index aa0b71fe6de57a6f537737ab458a4deb76576c95..8d895c727987af82941c6519324262d7cb25ecd9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -703,6 +703,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0213-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/server/0213-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/server/0213-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/unapplied/server/0213-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/server/0214-RangedEntity-API.patch b/patches/unapplied/server/0214-RangedEntity-API.patch similarity index 100% rename from patches/server/0214-RangedEntity-API.patch rename to patches/unapplied/server/0214-RangedEntity-API.patch diff --git a/patches/server/0215-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/unapplied/server/0215-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/server/0215-Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/unapplied/server/0215-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/server/0216-Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/0216-Implement-World.getEntity-UUID-API.patch similarity index 91% rename from patches/server/0216-Implement-World.getEntity-UUID-API.patch rename to patches/unapplied/server/0216-Implement-World.getEntity-UUID-API.patch index 7f510f70db..283a3037ec 100644 --- a/patches/server/0216-Implement-World.getEntity-UUID-API.patch +++ b/patches/unapplied/server/0216-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 339baff7014e98cbe03806d9a689ec09e0b30a47..9849c255ed68309da27ba2c9156c50e89c29d498 100644 +index 8d895c727987af82941c6519324262d7cb25ecd9..0f15340a7757dd22c689649a4019a0991da33b2e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1037,6 +1037,15 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0217-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/0217-InventoryCloseEvent-Reason-API.patch similarity index 97% rename from patches/server/0217-InventoryCloseEvent-Reason-API.patch rename to patches/unapplied/server/0217-InventoryCloseEvent-Reason-API.patch index 436b32ccd4..500bed535a 100644 --- a/patches/server/0217-InventoryCloseEvent-Reason-API.patch +++ b/patches/unapplied/server/0217-InventoryCloseEvent-Reason-API.patch @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index eea1a5c22b6aebf1ff9f5746d1fd0c247ee2631d..54ec2d33bf0306e5d4f6be99a3d9b37c93b26aec 100644 +index 0bd670cb37614dfb09c1a81c9fa7526a7b16cac0..9a17624d684394ee956848fe9f36750d5962c980 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1270,7 +1270,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -75,7 +75,7 @@ index 81a0407256a3a37e8ccb136e7fd602d95106c590..bc0c4c2284d08ca88d4664bb39c744b3 this.doCloseContainer(); } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 116dee1f1f9c489e6f85a8fa3b7f36267109d720..ea2f283634c8794bda3e531a20f39f8a17e3e41c 100644 +index f148e990bd66a9d8fec3210865386243a19c1a3e..cc8f3a37313f54ec6ce6d73fc5cd1afd34464017 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -219,6 +219,7 @@ import org.bukkit.event.inventory.ClickType; @@ -117,7 +117,7 @@ index 4dcc44b925ac261aaa2f4ee84e321d6c8852e835..a462b33a35bf2e5ea9492eb37ac68983 PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : net.kyori.adventure.text.Component.text(entityplayer.getScoreboardName()))); diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 702a5e524127f9655279a24b54b8d4248dec460e..2520ba136cf17392120f6187a73015f438c302f1 100644 +index f230038801ec9535670c25ed6fd9e3e0ed29c483..cd27f30ededed40a7238b17e08d7d564767a9dab 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -271,7 +271,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0218-Vex-get-setSummoner-API.patch b/patches/unapplied/server/0218-Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/0218-Vex-get-setSummoner-API.patch rename to patches/unapplied/server/0218-Vex-get-setSummoner-API.patch diff --git a/patches/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/unapplied/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 94% rename from patches/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/unapplied/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch index 4879efd0d6..214862b01b 100644 --- a/patches/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch +++ b/patches/unapplied/server/0219-Refresh-player-inventory-when-cancelling-PlayerInter.patch @@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is cancelled to avoid this problem. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ea2f283634c8794bda3e531a20f39f8a17e3e41c..a517eb45cd06c130cbfe6ff6565825c492079287 100644 +index cc8f3a37313f54ec6ce6d73fc5cd1afd34464017..4fd16cc84b9edbadbbc073494656aa1fadb0c275 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2667,6 +2667,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0220-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/0220-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch similarity index 100% rename from patches/server/0220-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch rename to patches/unapplied/server/0220-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch diff --git a/patches/server/0221-add-more-information-to-Entity.toString.patch b/patches/unapplied/server/0221-add-more-information-to-Entity.toString.patch similarity index 100% rename from patches/server/0221-add-more-information-to-Entity.toString.patch rename to patches/unapplied/server/0221-add-more-information-to-Entity.toString.patch diff --git a/patches/server/0222-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/unapplied/server/0222-Add-CraftMagicNumbers.isSupportedApiVersion.patch similarity index 90% rename from patches/server/0222-Add-CraftMagicNumbers.isSupportedApiVersion.patch rename to patches/unapplied/server/0222-Add-CraftMagicNumbers.isSupportedApiVersion.patch index bd1e314930..fd8d0683cf 100644 --- a/patches/server/0222-Add-CraftMagicNumbers.isSupportedApiVersion.patch +++ b/patches/unapplied/server/0222-Add-CraftMagicNumbers.isSupportedApiVersion.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion() diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 3efc8fbf22d7ae4c642348468a3af959e49cd640..4d67e962e81d086f20624ee2ab9e921f9cd020e7 100644 +index 53eb440f1e2f9f9bbf2e67027414a3756d70cb6a..5cdf80e2a521bc665c9ff4474b91a2d683aa0eb8 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -431,6 +431,11 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0223-EnderDragon-Events.patch b/patches/unapplied/server/0223-EnderDragon-Events.patch similarity index 100% rename from patches/server/0223-EnderDragon-Events.patch rename to patches/unapplied/server/0223-EnderDragon-Events.patch diff --git a/patches/server/0224-PlayerElytraBoostEvent.patch b/patches/unapplied/server/0224-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/0224-PlayerElytraBoostEvent.patch rename to patches/unapplied/server/0224-PlayerElytraBoostEvent.patch diff --git a/patches/server/0225-PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/0225-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/0225-PlayerLaunchProjectileEvent.patch rename to patches/unapplied/server/0225-PlayerLaunchProjectileEvent.patch diff --git a/patches/server/0226-Improve-BlockPosition-inlining.patch b/patches/unapplied/server/0226-Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/0226-Improve-BlockPosition-inlining.patch rename to patches/unapplied/server/0226-Improve-BlockPosition-inlining.patch diff --git a/patches/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/unapplied/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 95% rename from patches/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/unapplied/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index 24e507e580..6c4d2fa91a 100644 --- a/patches/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/patches/unapplied/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option to prevent armor stands from doing entity lookups diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index ed698f3e3f9ed6003fe621c5f6f7e3a151a1a559..9897dbb03c343e1e1842f7ca6bc9b99b95d0b8be 100644 +index 4398a33df4e0f0e9d28c51af3d48e41d957d7c9e..3488c882c654a2cb7a470ed84066bcc0bbbbf9c4 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -336,6 +336,7 @@ public class ArmorStand extends LivingEntity { diff --git a/patches/server/0228-Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/0228-Vanished-players-don-t-have-rights.patch similarity index 98% rename from patches/server/0228-Vanished-players-don-t-have-rights.patch rename to patches/unapplied/server/0228-Vanished-players-don-t-have-rights.patch index cd8b1d5888..bf49c67b97 100644 --- a/patches/server/0228-Vanished-players-don-t-have-rights.patch +++ b/patches/unapplied/server/0228-Vanished-players-don-t-have-rights.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Vanished players don't have rights diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index f550686d1ae45a9ecb406e999d02dba0cf022c58..273e1a6f4fd117e98732c66d9b168cab1d588127 100644 +index 920825af18be4719d2057f164016cae95e22847b..7f787cd1fcdc71091973441844db6b7499417587 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java @@ -211,7 +211,14 @@ public abstract class Projectile extends Entity { diff --git a/patches/server/0229-Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/server/0229-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/server/0229-Allow-disabling-armour-stand-ticking.patch rename to patches/unapplied/server/0229-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/server/0230-SkeletonHorse-Additions.patch b/patches/unapplied/server/0230-SkeletonHorse-Additions.patch similarity index 97% rename from patches/server/0230-SkeletonHorse-Additions.patch rename to patches/unapplied/server/0230-SkeletonHorse-Additions.patch index 04e88ec3a1..db419cd39a 100644 --- a/patches/server/0230-SkeletonHorse-Additions.patch +++ b/patches/unapplied/server/0230-SkeletonHorse-Additions.patch @@ -32,7 +32,7 @@ index 43e481377ba1596e740eacefd21d9664b7807883..8fa4fb61d4a14b4cba6cef1b6633f9d2 this.horse.setTrap(false); diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java -index 33dd11d1a710d04d4bad0cc403a75086f98ec301..d124d06edc2261477019111c38bb8f816c5affe3 100644 +index abd74c6502e07857e0f64c5f99534b68975acd69..e994db4f81bb94b2e5e8e142e01c05e90a09fa26 100644 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java @@ -105,6 +105,28 @@ public interface EntityGetter { diff --git a/patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/unapplied/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch rename to patches/unapplied/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/patches/server/0232-Implement-Expanded-ArmorStand-API.patch b/patches/unapplied/server/0232-Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from patches/server/0232-Implement-Expanded-ArmorStand-API.patch rename to patches/unapplied/server/0232-Implement-Expanded-ArmorStand-API.patch diff --git a/patches/server/0233-AnvilDamageEvent.patch b/patches/unapplied/server/0233-AnvilDamageEvent.patch similarity index 100% rename from patches/server/0233-AnvilDamageEvent.patch rename to patches/unapplied/server/0233-AnvilDamageEvent.patch diff --git a/patches/server/0234-Add-TNTPrimeEvent.patch b/patches/unapplied/server/0234-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/0234-Add-TNTPrimeEvent.patch rename to patches/unapplied/server/0234-Add-TNTPrimeEvent.patch diff --git a/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 97% rename from patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/unapplied/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch index c211462524..51c37d3ccc 100644 --- a/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/patches/unapplied/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch @@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on plugins doing unsafe things. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a517eb45cd06c130cbfe6ff6565825c492079287..3b8fd0b7f9a5d215119c6507e1af3068c7f543a2 100644 +index 4fd16cc84b9edbadbbc073494656aa1fadb0c275..c50d2b797be6a69bb632a7e88bf353d0a134e676 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -262,6 +262,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0236-Fix-NBT-type-issues.patch b/patches/unapplied/server/0236-Fix-NBT-type-issues.patch similarity index 100% rename from patches/server/0236-Fix-NBT-type-issues.patch rename to patches/unapplied/server/0236-Fix-NBT-type-issues.patch diff --git a/patches/server/0237-Remove-unnecessary-itemmeta-handling.patch b/patches/unapplied/server/0237-Remove-unnecessary-itemmeta-handling.patch similarity index 100% rename from patches/server/0237-Remove-unnecessary-itemmeta-handling.patch rename to patches/unapplied/server/0237-Remove-unnecessary-itemmeta-handling.patch diff --git a/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/unapplied/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 96% rename from patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/unapplied/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index 0bde8a3c50..3b2452178e 100644 --- a/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/patches/unapplied/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -8,7 +8,7 @@ Add -Ddebug.entities=true to your JVM flags to gain more information 1.17: Needs to be reworked for new entity storage system diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 33e20bb8c7addbcf77b38abd837ca096880fc244..8b93af04aca46f59bed826e66ad9ee21cda38199 100644 +index 236e0f8cc271d1ca1a2cb64e333d59de1cb953ea..2b14841c23c9d9f4a6fe82fb2779cd5ff79a96f6 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -884,6 +884,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -29,7 +29,7 @@ index 33e20bb8c7addbcf77b38abd837ca096880fc244..8b93af04aca46f59bed826e66ad9ee21 protected void tick() { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 65cf330708b4667fd60fdb1094df5a808ae5c2f2..efc2db1b27e9ac4b1094b7e529c198a94d05b164 100644 +index 9a17624d684394ee956848fe9f36750d5962c980..672f74f89a643ef82d391c521ca45a2beb51a46e 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -216,6 +216,9 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -72,7 +72,7 @@ index 65cf330708b4667fd60fdb1094df5a808ae5c2f2..efc2db1b27e9ac4b1094b7e529c198a9 return false; } else { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2e988d59404c52cd9c290b96d21f886573cda0fa..0e632f9eabd0d55a4eaacff54abaf637660528dd 100644 +index f67480cc4ff05d23a16b63dbe986d0d96739496b..f174af45cd593d8f74205472e25db081b5289ee9 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -235,6 +235,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 97% rename from patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch index 672248547f..3818082b90 100644 --- a/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch @@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash. This will help diagnose what was going on in that time before the crash. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d65423b8d7b69db79de05587efba13008602f743..afce3acc552df092636b205964e06b399b7db8e2 100644 +index 3509785412395aec7d316fcf37d58fb7cb1a9e5f..25aac194eb486a5b8707aa0a655fd8259ad7409c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1044,6 +1044,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { return worldserver + " " + worldserver.dimension().location(); diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 4b41d2dd00c1b206c1419ba767a3474947664e53..5e0852c4656813272a7ee6cb9c2331410c1b7739 100644 +index b4fbe1f393e2c348bc0120bf6c55d57d61011787..2650deb381bae30593128fc003c042f42110802c 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -625,11 +625,12 @@ public final class ItemStack { diff --git a/patches/server/0334-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/server/0334-PlayerDeathEvent-shouldDropExperience.patch similarity index 91% rename from patches/server/0334-PlayerDeathEvent-shouldDropExperience.patch rename to patches/unapplied/server/0334-PlayerDeathEvent-shouldDropExperience.patch index d97c9ef24c..9bd7a18bef 100644 --- a/patches/server/0334-PlayerDeathEvent-shouldDropExperience.patch +++ b/patches/unapplied/server/0334-PlayerDeathEvent-shouldDropExperience.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index e56a6bdcc62f7d82447440ad20e72678a2d6852e..9cae5379d60c8d20ae6966850f7f13640742f9b7 100644 +index 7609ab90b8c870876bbaf927df635e2579abbdb7..fc05217186d0af6cb758a189f4287ac812625cd4 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -896,7 +896,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0335-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/unapplied/server/0335-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0335-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/unapplied/server/0335-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0336-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/unapplied/server/0336-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0336-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/unapplied/server/0336-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 94% rename from patches/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/unapplied/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch index 7018c6fabf..da583926f5 100644 --- a/patches/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch +++ b/patches/unapplied/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Guard against serializing mismatching chunk coordinate Should help if something dumb happens diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index e59910540458ca912efea64d9f7cd212d63d110a..f4bf0ecde863f1795d764d8cc8d6525af02356ea 100644 +index d0b7533b8ed16f062a4ed2f1389b79c3d0929fe1..648719a58e62105064ac6b51c6f5e7867ff0b7a9 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java @@ -92,6 +92,18 @@ public class ChunkSerializer { @@ -38,7 +38,7 @@ index e59910540458ca912efea64d9f7cd212d63d110a..f4bf0ecde863f1795d764d8cc8d6525a if (!Objects.equals(chunkPos, chunkcoordintpair1)) { ChunkSerializer.LOGGER.error("Chunk file at {} is in the wrong location; relocating. (Expected {}, got {})", new Object[]{chunkPos, chunkPos, chunkcoordintpair1}); diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java -index f2539f2aab4086bc6772db9985ca9f75ff6a7c71..aa915195d4aab3e931a92bf844f6dc18a0a59b9e 100644 +index c3305cb49741523724ff7b3c9254a0df2cf3d6c6..e276b2ceddbb269ef9a8625f26cc1847ded3862a 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java @@ -178,6 +178,13 @@ public class ChunkStorage implements AutoCloseable { diff --git a/patches/server/0338-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/unapplied/server/0338-Optimise-EntityGetter-getPlayerByUUID.patch similarity index 100% rename from patches/server/0338-Optimise-EntityGetter-getPlayerByUUID.patch rename to patches/unapplied/server/0338-Optimise-EntityGetter-getPlayerByUUID.patch diff --git a/patches/server/0339-Fix-items-not-falling-correctly.patch b/patches/unapplied/server/0339-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0339-Fix-items-not-falling-correctly.patch rename to patches/unapplied/server/0339-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0340-Lag-compensate-eating.patch b/patches/unapplied/server/0340-Lag-compensate-eating.patch similarity index 97% rename from patches/server/0340-Lag-compensate-eating.patch rename to patches/unapplied/server/0340-Lag-compensate-eating.patch index 7a36d29de2..aa9f516739 100644 --- a/patches/server/0340-Lag-compensate-eating.patch +++ b/patches/unapplied/server/0340-Lag-compensate-eating.patch @@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating. Change to also use a time check instead if it passes. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b85b98aaa1148c23232a633447c815003373c7c3..345b2d91cd7ac1746fb70bf28b596cce6746a693 100644 +index 35b5671e3bf0b14a073431095bf464f9ebfae843..9e76df6ac643eb7696a11c0c3bfc45a82e0e0ce4 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3567,6 +3567,11 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0341-Optimize-call-to-getFluid-for-explosions.patch b/patches/unapplied/server/0341-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0341-Optimize-call-to-getFluid-for-explosions.patch rename to patches/unapplied/server/0341-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0342-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/unapplied/server/0342-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0342-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/unapplied/server/0342-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0343-Add-effect-to-block-break-naturally.patch b/patches/unapplied/server/0343-Add-effect-to-block-break-naturally.patch similarity index 100% rename from patches/server/0343-Add-effect-to-block-break-naturally.patch rename to patches/unapplied/server/0343-Add-effect-to-block-break-naturally.patch diff --git a/patches/server/0344-Entity-Activation-Range-2.0.patch b/patches/unapplied/server/0344-Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/0344-Entity-Activation-Range-2.0.patch rename to patches/unapplied/server/0344-Entity-Activation-Range-2.0.patch diff --git a/patches/server/0345-Increase-Light-Queue-Size.patch b/patches/unapplied/server/0345-Increase-Light-Queue-Size.patch similarity index 100% rename from patches/server/0345-Increase-Light-Queue-Size.patch rename to patches/unapplied/server/0345-Increase-Light-Queue-Size.patch diff --git a/patches/server/0346-Anti-Xray.patch b/patches/unapplied/server/0346-Anti-Xray.patch similarity index 100% rename from patches/server/0346-Anti-Xray.patch rename to patches/unapplied/server/0346-Anti-Xray.patch diff --git a/patches/server/0347-Implement-alternative-item-despawn-rate.patch b/patches/unapplied/server/0347-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0347-Implement-alternative-item-despawn-rate.patch rename to patches/unapplied/server/0347-Implement-alternative-item-despawn-rate.patch diff --git a/patches/server/0348-Tracking-Range-Improvements.patch b/patches/unapplied/server/0348-Tracking-Range-Improvements.patch similarity index 97% rename from patches/server/0348-Tracking-Range-Improvements.patch rename to patches/unapplied/server/0348-Tracking-Range-Improvements.patch index 5c7541eb0c..5c60cc1077 100644 --- a/patches/server/0348-Tracking-Range-Improvements.patch +++ b/patches/unapplied/server/0348-Tracking-Range-Improvements.patch @@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code Also ignores Enderdragon, defaulting it to Mojang's setting diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 7c4eded1135e50f2ffea069de7bcd77bd80d0ac1..ec352a1916bea3893173375cfeaf84fc1c3cc52a 100644 +index 63d480e7c50bed3d5b00b09f789522ff9ea18776..1fe0e34df2f837515acfba9bbddeb3717d41fe80 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1285,6 +1285,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0349-Fix-items-vanishing-through-end-portal.patch b/patches/unapplied/server/0349-Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from patches/server/0349-Fix-items-vanishing-through-end-portal.patch rename to patches/unapplied/server/0349-Fix-items-vanishing-through-end-portal.patch diff --git a/patches/server/0350-implement-optional-per-player-mob-spawns.patch b/patches/unapplied/server/0350-implement-optional-per-player-mob-spawns.patch similarity index 99% rename from patches/server/0350-implement-optional-per-player-mob-spawns.patch rename to patches/unapplied/server/0350-implement-optional-per-player-mob-spawns.patch index 966c7b42be..7e992d4477 100644 --- a/patches/server/0350-implement-optional-per-player-mob-spawns.patch +++ b/patches/unapplied/server/0350-implement-optional-per-player-mob-spawns.patch @@ -252,7 +252,7 @@ index 0000000000000000000000000000000000000000..11de56afaf059b00fa5bec293516bcdc + } +} diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index b3dc360658ec7449c063e7f50b11fd188c5768a0..6a08bd2b13a2c9dcc47a469607d0dd8ff79c0328 100644 +index 1fe0e34df2f837515acfba9bbddeb3717d41fe80..6250615dbdb58e8d4e3937b2152b41751122dd56 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -145,6 +145,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -338,7 +338,7 @@ index b3dc360658ec7449c063e7f50b11fd188c5768a0..6a08bd2b13a2c9dcc47a469607d0dd8f double d0 = (double) SectionPos.sectionToBlockCoord(pos.x, 8); double d1 = (double) SectionPos.sectionToBlockCoord(pos.z, 8); diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 3a2cacbbba15d48428147842590851a57b3f3df7..8b8c8970e1d478edc3a0231556bf92f8263392c1 100644 +index 302667d7b6dca8528e7107255feaeb6d6f837cf3..46dfb4df27226263c7adacc13d0c99c422f90ac6 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -692,7 +692,18 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0351-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/unapplied/server/0351-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0351-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/unapplied/server/0351-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0352-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/unapplied/server/0352-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 96% rename from patches/server/0352-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/unapplied/server/0352-Optimise-getChunkAt-calls-for-loaded-chunks.patch index cad8b3acb6..691681e731 100644 --- a/patches/server/0352-Optimise-getChunkAt-calls-for-loaded-chunks.patch +++ b/patches/unapplied/server/0352-Optimise-getChunkAt-calls-for-loaded-chunks.patch @@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either, then unwrap it... diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 8b8c8970e1d478edc3a0231556bf92f8263392c1..800dc1f2f5ef6026704e17583421f7b54d2ac631 100644 +index 46dfb4df27226263c7adacc13d0c99c422f90ac6..78c009d0345fdcfc1a0ec719f3b25028524a284d 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -420,6 +420,12 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0353-Add-debug-for-sync-chunk-loads.patch b/patches/unapplied/server/0353-Add-debug-for-sync-chunk-loads.patch similarity index 98% rename from patches/server/0353-Add-debug-for-sync-chunk-loads.patch rename to patches/unapplied/server/0353-Add-debug-for-sync-chunk-loads.patch index 20706f23c6..258cd8f0ea 100644 --- a/patches/server/0353-Add-debug-for-sync-chunk-loads.patch +++ b/patches/unapplied/server/0353-Add-debug-for-sync-chunk-loads.patch @@ -308,7 +308,7 @@ index 0000000000000000000000000000000000000000..a73e35e7c71c1337c2846010b3ccd687 + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 800dc1f2f5ef6026704e17583421f7b54d2ac631..8a20fa6d1c357f6d9787032c31dd0d0f80bd74be 100644 +index 78c009d0345fdcfc1a0ec719f3b25028524a284d..f0ab91b93dabd0c77a8537e40c8b504200b261fd 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -444,6 +444,7 @@ public class ServerChunkCache extends ChunkSource { @@ -320,7 +320,7 @@ index 800dc1f2f5ef6026704e17583421f7b54d2ac631..8a20fa6d1c357f6d9787032c31dd0d0f chunkproviderserver_b.managedBlock(completablefuture::isDone); io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.popChunkWait(); // Paper - async chunk debug // Paper - rewrite chunk system diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 7aaa8e7bfc2a949346dc760a5ff1231f80d410d5..9abe233a02b6e5fdeda7a602223188897df5a2e4 100644 +index 1133928654269d3b9b794513b39526fe0accc3c3..d30885b0b85d78a312c142460e5d342fdbeada79 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -421,6 +421,12 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0354-Remove-garbage-Java-version-check.patch b/patches/unapplied/server/0354-Remove-garbage-Java-version-check.patch similarity index 100% rename from patches/server/0354-Remove-garbage-Java-version-check.patch rename to patches/unapplied/server/0354-Remove-garbage-Java-version-check.patch diff --git a/patches/server/0355-Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/0355-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0355-Add-ThrownEggHatchEvent.patch rename to patches/unapplied/server/0355-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0356-Entity-Jump-API.patch b/patches/unapplied/server/0356-Entity-Jump-API.patch similarity index 97% rename from patches/server/0356-Entity-Jump-API.patch rename to patches/unapplied/server/0356-Entity-Jump-API.patch index 8864fa36b1..b1f8ebb90a 100644 --- a/patches/server/0356-Entity-Jump-API.patch +++ b/patches/unapplied/server/0356-Entity-Jump-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity Jump API diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 345b2d91cd7ac1746fb70bf28b596cce6746a693..24a16dbfc0852a566dd527639974fcba44bd43fe 100644 +index 9e76df6ac643eb7696a11c0c3bfc45a82e0e0ce4..fc498652272cb4990668b3ac05d5aa1f0b627a67 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3243,8 +3243,10 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0357-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/unapplied/server/0357-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/server/0357-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/unapplied/server/0357-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/0358-Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/0358-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0358-Make-the-GUI-graph-fancier.patch rename to patches/unapplied/server/0358-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0359-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/0359-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0359-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/unapplied/server/0359-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0360-Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/0360-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0360-Validate-tripwire-hook-placement-before-update.patch rename to patches/unapplied/server/0360-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0361-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/unapplied/server/0361-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0361-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/unapplied/server/0361-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0362-Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/0362-Configurable-chance-of-villager-zombie-infection.patch similarity index 95% rename from patches/server/0362-Configurable-chance-of-villager-zombie-infection.patch rename to patches/unapplied/server/0362-Configurable-chance-of-villager-zombie-infection.patch index 1b328d76e2..59ae31aad7 100644 --- a/patches/server/0362-Configurable-chance-of-villager-zombie-infection.patch +++ b/patches/unapplied/server/0362-Configurable-chance-of-villager-zombie-infection.patch @@ -8,7 +8,7 @@ This allows you to solve an issue in vanilla behavior where: * On normal difficulty they will have a 50% of getting infected or dying. diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java -index 1ff02c66fcc291b6ccc456673ad4c6c09d47d69e..b2b396dd7c5face635595d527f132e0787ef7e26 100644 +index a8caf1a776deea8684d37406af11ab72c114b07d..473782e8b6a760aec492fa28270a7eb05a484e78 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java @@ -450,10 +450,14 @@ public class Zombie extends Monster { diff --git a/patches/server/0363-Optimise-Chunk-getFluid.patch b/patches/unapplied/server/0363-Optimise-Chunk-getFluid.patch similarity index 96% rename from patches/server/0363-Optimise-Chunk-getFluid.patch rename to patches/unapplied/server/0363-Optimise-Chunk-getFluid.patch index 8ddb1788ee..d28aa20cc0 100644 --- a/patches/server/0363-Optimise-Chunk-getFluid.patch +++ b/patches/unapplied/server/0363-Optimise-Chunk-getFluid.patch @@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it easier to inline due to code size diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index fb42b212805c8ea9ae5be8b2a515a37ecda28535..6b24417b73d42bbb92425e61d166ebf619277d3b 100644 +index afc443f36b26e9493fa0a530891b2edd7f3f6703..797d9d0d81f026479dda1ab4d72793025272a0f7 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -427,18 +427,20 @@ public class LevelChunk extends ChunkAccess { diff --git a/patches/server/0364-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/unapplied/server/0364-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0364-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/unapplied/server/0364-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0365-Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/0365-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0365-Add-tick-times-API-and-mspt-command.patch rename to patches/unapplied/server/0365-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0366-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/0366-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0366-Expose-MinecraftServer-isRunning.patch rename to patches/unapplied/server/0366-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0367-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/0367-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 96% rename from patches/server/0367-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/unapplied/server/0367-Add-Raw-Byte-ItemStack-Serialization.patch index baa4b0de1d..8da2eed2ce 100644 --- a/patches/server/0367-Add-Raw-Byte-ItemStack-Serialization.patch +++ b/patches/unapplied/server/0367-Add-Raw-Byte-ItemStack-Serialization.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add Raw Byte ItemStack Serialization Serializes using NBT which is safer for server data migrations than bukkits format. diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 4d67e962e81d086f20624ee2ab9e921f9cd020e7..be1e6c050a4d80f330bb4a5ea5f79da3aefb9510 100644 +index 5cdf80e2a521bc665c9ff4474b91a2d683aa0eb8..b38b2b3855583b26d7ed2ede041a73cf14cbe81c 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -436,6 +436,53 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0368-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/unapplied/server/0368-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 98% rename from patches/server/0368-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/unapplied/server/0368-Pillager-patrol-spawn-settings-and-per-player-option.patch index 3a8c274b7e..7f71a88704 100644 --- a/patches/server/0368-Pillager-patrol-spawn-settings-and-per-player-option.patch +++ b/patches/unapplied/server/0368-Pillager-patrol-spawn-settings-and-per-player-option.patch @@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per world and the world age for the start day. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f2808d62c15c586dff0313e6d27ef92d45f66dc7..db351747830079d13cabd0010e8906a5e5aa4e96 100644 +index ef03173f9399c6047985e4ed85ce6ef480d75cdf..d13785144365bf69c072213a2672d408a3f0be5f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -231,6 +231,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0369-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/0369-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0369-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/unapplied/server/0369-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0370-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/unapplied/server/0370-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0370-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/unapplied/server/0370-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0371-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/0371-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0371-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/unapplied/server/0371-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0372-Don-t-tick-dead-players.patch b/patches/unapplied/server/0372-Don-t-tick-dead-players.patch similarity index 91% rename from patches/server/0372-Don-t-tick-dead-players.patch rename to patches/unapplied/server/0372-Don-t-tick-dead-players.patch index b5386f7c8d..abaee20fe7 100644 --- a/patches/server/0372-Don-t-tick-dead-players.patch +++ b/patches/unapplied/server/0372-Don-t-tick-dead-players.patch @@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else. This is safe because Spectators are skipped in unloaded chunks too in vanilla. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index db351747830079d13cabd0010e8906a5e5aa4e96..8e4dff97dba9f8e1395113bed8f91b0cbb70b354 100644 +index d13785144365bf69c072213a2672d408a3f0be5f..1a34d1b75698960cd48f2632cafdca5f52e10d49 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -653,7 +653,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0373-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/unapplied/server/0373-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 90% rename from patches/server/0373-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/unapplied/server/0373-Dead-Player-s-shouldn-t-be-able-to-move.patch index 83aebd18e6..9229c28766 100644 --- a/patches/server/0373-Dead-Player-s-shouldn-t-be-able-to-move.patch +++ b/patches/unapplied/server/0373-Dead-Player-s-shouldn-t-be-able-to-move.patch @@ -7,7 +7,7 @@ This fixes a lot of game state issues where packets were delayed for processing due to 1.15's new queue but processed while dead. diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index d308c671ec1c4440777bccf1609ceca6670b98a8..0960e5ecc25fad3eb46a871c2749dd176b812460 100644 +index bd1da2cf2c6717d26b4bba0a1a96e0bbb89cc22e..8f9a5589e430c31de29d23d6c27757dd33e8bb86 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1172,7 +1172,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0374-Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/0374-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0374-Optimize-Collision-to-not-load-chunks.patch rename to patches/unapplied/server/0374-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0375-Don-t-move-existing-players-to-world-spawn.patch b/patches/unapplied/server/0375-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/0375-Don-t-move-existing-players-to-world-spawn.patch rename to patches/unapplied/server/0375-Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/0376-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/unapplied/server/0376-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0376-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/unapplied/server/0376-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0377-Improved-Watchdog-Support.patch b/patches/unapplied/server/0377-Improved-Watchdog-Support.patch similarity index 99% rename from patches/server/0377-Improved-Watchdog-Support.patch rename to patches/unapplied/server/0377-Improved-Watchdog-Support.patch index b019cbe10e..42375eb822 100644 --- a/patches/server/0377-Improved-Watchdog-Support.patch +++ b/patches/unapplied/server/0377-Improved-Watchdog-Support.patch @@ -282,7 +282,7 @@ index 55985d21fd89a753e0e10004bb01295655ac43d3..89d45ae9b2856aaed265d7333ba2e69a // Paper start - Remove from collideRule team if needed diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java -index 6fefa619299d3202158490630d62c16aef71e831..7a4ade1a4190bf4fbb048919ae2be230f7b80fff 100644 +index f5829ae484d93b547a5437b85a9621346384a11b..83701fbfaa56a232593ee8f11a3afb8941238bfa 100644 --- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java +++ b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java @@ -152,6 +152,7 @@ public abstract class BlockableEventLoop implements Profiler @@ -306,7 +306,7 @@ index 7e03e88dc7196d757ffcc6cdc2ca15c96abcc2a0..cff803e60a7592fc55fc4a76e39f2254 final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level.getWorld().getName(), entity.getX(), entity.getY(), entity.getZ()); MinecraftServer.LOGGER.error(msg, throwable); diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index 6b24417b73d42bbb92425e61d166ebf619277d3b..7e1f0c9f760d6f5cfb0138542252c8469534e152 100644 +index 797d9d0d81f026479dda1ab4d72793025272a0f7..b2d06181ad76b1db2abb1ddca075f4ec6dab55dc 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -1220,6 +1220,7 @@ public class LevelChunk extends ChunkAccess { diff --git a/patches/server/0378-Optimize-Pathfinding.patch b/patches/unapplied/server/0378-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0378-Optimize-Pathfinding.patch rename to patches/unapplied/server/0378-Optimize-Pathfinding.patch diff --git a/patches/server/0379-Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/0379-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0379-Reduce-Either-Optional-allocation.patch rename to patches/unapplied/server/0379-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0380-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/unapplied/server/0380-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0380-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/unapplied/server/0380-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0381-Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/0381-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0381-Prevent-opening-inventories-when-frozen.patch rename to patches/unapplied/server/0381-Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/0382-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/unapplied/server/0382-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 95% rename from patches/server/0382-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/unapplied/server/0382-Don-t-run-entity-collision-code-if-not-needed.patch index b6c845eef7..44e34f7cfe 100644 --- a/patches/server/0382-Don-t-run-entity-collision-code-if-not-needed.patch +++ b/patches/unapplied/server/0382-Don-t-run-entity-collision-code-if-not-needed.patch @@ -12,7 +12,7 @@ The entity's current team collision rule causes them to NEVER collide. Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 24a16dbfc0852a566dd527639974fcba44bd43fe..5c6ed31e0fa8b089c3962326f2a4973fa83701ac 100644 +index fc498652272cb4990668b3ac05d5aa1f0b627a67..67c3e02bf4ee61237a7d0ea72e7bb0260af159e9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3340,10 +3340,24 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0383-Implement-Player-Client-Options-API.patch b/patches/unapplied/server/0383-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0383-Implement-Player-Client-Options-API.patch rename to patches/unapplied/server/0383-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0384-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/unapplied/server/0384-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0384-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/unapplied/server/0384-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0385-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/unapplied/server/0385-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 98% rename from patches/server/0385-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/unapplied/server/0385-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch index 870ed9cafb..f2a58fb581 100644 --- a/patches/server/0385-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch +++ b/patches/unapplied/server/0385-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch @@ -31,7 +31,7 @@ delays anymore. public net.minecraft.server.level.ChunkMap addEntity(Lnet/minecraft/world/entity/Entity;)V diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 80009022bc7b9d3414b2af3a3b21192def243405..7e11a85cb826deedcf9aa22b849ced2c1240e64a 100644 +index 9fbdb834559df0da45ea4a61eb3963fa8e371af3..1bf18259505997c39e7880abf49e583cc763beb1 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1024,6 +1024,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0386-Load-Chunks-for-Login-Asynchronously.patch b/patches/unapplied/server/0386-Load-Chunks-for-Login-Asynchronously.patch similarity index 100% rename from patches/server/0386-Load-Chunks-for-Login-Asynchronously.patch rename to patches/unapplied/server/0386-Load-Chunks-for-Login-Asynchronously.patch diff --git a/patches/server/0387-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/unapplied/server/0387-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0387-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/unapplied/server/0387-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0388-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/0388-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 95% rename from patches/server/0388-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/unapplied/server/0388-Add-PlayerAttackEntityCooldownResetEvent.patch index 90feeaf645..5e4a101415 100644 --- a/patches/server/0388-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/patches/unapplied/server/0388-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8de0a71566d2b095e74c8f8cf15dfac26a5a31c2..d6071df933506bf3d55fc827483b33ecc5174834 100644 +index 67c3e02bf4ee61237a7d0ea72e7bb0260af159e9..df3aad08242b40fca5be719ae9fb13bc1c2e8091 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2115,7 +2115,16 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0389-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/unapplied/server/0389-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0389-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/unapplied/server/0389-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0390-Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/0390-Add-phantom-creative-and-insomniac-controls.patch similarity index 97% rename from patches/server/0390-Add-phantom-creative-and-insomniac-controls.patch rename to patches/unapplied/server/0390-Add-phantom-creative-and-insomniac-controls.patch index 66b47ed30d..307c92bd32 100644 --- a/patches/server/0390-Add-phantom-creative-and-insomniac-controls.patch +++ b/patches/unapplied/server/0390-Add-phantom-creative-and-insomniac-controls.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add phantom creative and insomniac controls diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java -index b91a61be7c4829fce0ff8da290eab580e20bb78d..22f36cd3df49160f1b6668befdd05c2268edaa49 100644 +index 6fd874a83a248e6a7d427d18d11fc608544662c5..302676ef78ed5b3b7fc1b04851447ca72eed10c0 100644 --- a/src/main/java/net/minecraft/world/entity/EntitySelector.java +++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java @@ -27,6 +27,7 @@ public final class EntitySelector { diff --git a/patches/server/0391-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/unapplied/server/0391-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 99% rename from patches/server/0391-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/unapplied/server/0391-Fix-numerous-item-duplication-issues-and-teleport-is.patch index 060d4e8c3d..2d059506de 100644 --- a/patches/server/0391-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/patches/unapplied/server/0391-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -80,7 +80,7 @@ index 58a8bbda3ddff1ed561d9035d45176c6ca689115..32623f90a5bc4fb6fe99897c682ef4f5 public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d6071df933506bf3d55fc827483b33ecc5174834..03194c5acd46f6014f0a1d964d079b114f86c951 100644 +index df3aad08242b40fca5be719ae9fb13bc1c2e8091..a337ce97a31998a63e7c329ac94cad9a5f783a5c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1646,9 +1646,9 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0392-Villager-Restocks-API.patch b/patches/unapplied/server/0392-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0392-Villager-Restocks-API.patch rename to patches/unapplied/server/0392-Villager-Restocks-API.patch diff --git a/patches/server/0393-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/0393-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 95% rename from patches/server/0393-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/unapplied/server/0393-Validate-PickItem-Packet-and-kick-for-invalid.patch index a84ea8c5a4..69c20e6f3b 100644 --- a/patches/server/0393-Validate-PickItem-Packet-and-kick-for-invalid.patch +++ b/patches/unapplied/server/0393-Validate-PickItem-Packet-and-kick-for-invalid.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fe722106e20e199eb914a09f8dbc1409e27f1d69..77cc62cc942687a40371741904525301a4ed5240 100644 +index 2a75c77ac51b620098f5cc49a8a6bebafdfc06a1..6c17ae02e3c076b738037454afb7ea08f0f0e79e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -967,7 +967,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0394-Expose-game-version.patch b/patches/unapplied/server/0394-Expose-game-version.patch similarity index 100% rename from patches/server/0394-Expose-game-version.patch rename to patches/unapplied/server/0394-Expose-game-version.patch diff --git a/patches/server/0395-Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/0395-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0395-Optimize-Voxel-Shape-Merging.patch rename to patches/unapplied/server/0395-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0396-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/0396-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0396-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/unapplied/server/0396-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0397-misc-debugging-dumps.patch b/patches/unapplied/server/0397-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0397-misc-debugging-dumps.patch rename to patches/unapplied/server/0397-misc-debugging-dumps.patch diff --git a/patches/server/0398-Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/0398-Prevent-teleporting-dead-entities.patch similarity index 92% rename from patches/server/0398-Prevent-teleporting-dead-entities.patch rename to patches/unapplied/server/0398-Prevent-teleporting-dead-entities.patch index bce03a0bd0..4addbfad39 100644 --- a/patches/server/0398-Prevent-teleporting-dead-entities.patch +++ b/patches/unapplied/server/0398-Prevent-teleporting-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 77cc62cc942687a40371741904525301a4ed5240..bbed54d5a0e3c363614d694950688f8edc02841d 100644 +index 6c17ae02e3c076b738037454afb7ea08f0f0e79e..8c8ccd61fb1592a9274e54ed6e06ec7737e942e0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1632,6 +1632,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0399-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/unapplied/server/0399-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 99% rename from patches/server/0399-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/unapplied/server/0399-Deobfuscate-stacktraces-in-log-messages-crash-report.patch index b0738b0ecd..246cea7f87 100644 --- a/patches/server/0399-Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/unapplied/server/0399-Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -473,7 +473,7 @@ index 65231daec99d36d9ad3c1ca8561b6dbc49efde10..6df4d02020a14d17d9c5b1971bb5640b } } diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index 593ea68037b467797aeeaee331a0349f7d57d800..bbedcdb71a326b3286805d0081e71c54a4312622 100644 +index 8bc8b6013ea5803e091cf3534130b72278b9c29e..dca0c978b30962d4216dc443d7d105e54a29ae1b 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -62,13 +62,13 @@ public class Connection extends SimpleChannelInboundHandler> { diff --git a/patches/server/0400-Implement-Mob-Goal-API.patch b/patches/unapplied/server/0400-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0400-Implement-Mob-Goal-API.patch rename to patches/unapplied/server/0400-Implement-Mob-Goal-API.patch diff --git a/patches/server/0401-Add-villager-reputation-API.patch b/patches/unapplied/server/0401-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0401-Add-villager-reputation-API.patch rename to patches/unapplied/server/0401-Add-villager-reputation-API.patch diff --git a/patches/server/0402-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/unapplied/server/0402-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/0402-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/unapplied/server/0402-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0403-ExperienceOrbMergeEvent.patch b/patches/unapplied/server/0403-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0403-ExperienceOrbMergeEvent.patch rename to patches/unapplied/server/0403-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0404-Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/0404-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0404-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/unapplied/server/0404-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0405-Optimize-brigadier-child-sorting-performance.patch b/patches/unapplied/server/0405-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0405-Optimize-brigadier-child-sorting-performance.patch rename to patches/unapplied/server/0405-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0406-Potential-bed-API.patch b/patches/unapplied/server/0406-Potential-bed-API.patch similarity index 100% rename from patches/server/0406-Potential-bed-API.patch rename to patches/unapplied/server/0406-Potential-bed-API.patch diff --git a/patches/server/0407-Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/0407-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0407-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/unapplied/server/0407-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0408-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/unapplied/server/0408-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0408-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/unapplied/server/0408-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0409-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/unapplied/server/0409-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0409-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/unapplied/server/0409-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0410-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/unapplied/server/0410-Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from patches/server/0410-Reduce-MutableInt-allocations-from-light-engine.patch rename to patches/unapplied/server/0410-Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/patches/server/0411-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/unapplied/server/0411-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 97% rename from patches/server/0411-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/unapplied/server/0411-Reduce-allocation-of-Vec3D-by-entity-tracker.patch index cb28946d0e..578741a729 100644 --- a/patches/server/0411-Reduce-allocation-of-Vec3D-by-entity-tracker.patch +++ b/patches/unapplied/server/0411-Reduce-allocation-of-Vec3D-by-entity-tracker.patch @@ -18,7 +18,7 @@ index 3167f5c6be39757e3cc42cbb17ab0cf13a2fe470..3768a71491ef7836b9739bdaec7a077c private static long encode(double value) { return Mth.lfloor(value * 4096.0D); diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 7e11a85cb826deedcf9aa22b849ced2c1240e64a..97f58099f310b1c6fe8f9a1c8247fb0648d5277b 100644 +index 1bf18259505997c39e7880abf49e583cc763beb1..2651e6d22658beea7247a93a6c73f99f1d258752 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1302,9 +1302,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0412-Ensure-safe-gateway-teleport.patch b/patches/unapplied/server/0412-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0412-Ensure-safe-gateway-teleport.patch rename to patches/unapplied/server/0412-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0413-Add-option-for-console-having-all-permissions.patch b/patches/unapplied/server/0413-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0413-Add-option-for-console-having-all-permissions.patch rename to patches/unapplied/server/0413-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0414-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/unapplied/server/0414-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 98% rename from patches/server/0414-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/unapplied/server/0414-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch index 77ad74e89b..f34e3c3ef7 100644 --- a/patches/server/0414-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch +++ b/patches/unapplied/server/0414-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch @@ -42,7 +42,7 @@ index 2ba3bb4e5670ece798a8882801a856d82851c00a..a61f55ed1fbe5aac5289014cb95cb695 this.newChunkHolder = newChunkHolder; // Paper - rewrite chunk system this.chunkToSaveHistory = null; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 999a675dd42c37b27e40d1a32b77641188b8d432..63536642f005b6936734397e2347c504084f3f6c 100644 +index 2651e6d22658beea7247a93a6c73f99f1d258752..c68be481bbedbe347651f73741bf378a501e450e 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -152,12 +152,24 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -262,7 +262,7 @@ index d3c3db919e9b0507e8543313d9028394e5163673..52cba8f68d274cce106304aef1249a95 public String getDebugStatus() { diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 8a20fa6d1c357f6d9787032c31dd0d0f80bd74be..67bcda3e1d343b59dd1842f5eb982a71859d4d7b 100644 +index f0ab91b93dabd0c77a8537e40c8b504200b261fd..324a99ea21bccdf27c15248ae2811048efaa2595 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -657,6 +657,37 @@ public class ServerChunkCache extends ChunkSource { @@ -333,7 +333,7 @@ index 8a20fa6d1c357f6d9787032c31dd0d0f80bd74be..67bcda3e1d343b59dd1842f5eb982a71 } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 84edbb30158b8ea7771b6fb33a660d9229e6b4a5..83d05b2546fe54485daede323a0f6343b62d278a 100644 +index 7ad1d2cd3b2d4b1f9b21f0de5ddbf2626aea0310..61904f4d3160d83f87d66fd9f86acf54ab31adc6 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -263,6 +263,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0415-Use-distance-map-to-optimise-entity-tracker.patch b/patches/unapplied/server/0415-Use-distance-map-to-optimise-entity-tracker.patch similarity index 99% rename from patches/server/0415-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/unapplied/server/0415-Use-distance-map-to-optimise-entity-tracker.patch index e77a5566d5..63fed4027e 100644 --- a/patches/server/0415-Use-distance-map-to-optimise-entity-tracker.patch +++ b/patches/unapplied/server/0415-Use-distance-map-to-optimise-entity-tracker.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use distance map to optimise entity tracker Use the distance map to find candidate players for tracking. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 63536642f005b6936734397e2347c504084f3f6c..ed6e0a186dba26bee5ebcc02120c24ecb38d6892 100644 +index c68be481bbedbe347651f73741bf378a501e450e..f337b380c443016fc593dc768e32b751b7c7aa96 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -66,6 +66,7 @@ import net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket; diff --git a/patches/server/0416-Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/0416-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0416-Fix-villager-trading-demand-MC-163962.patch rename to patches/unapplied/server/0416-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0417-Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/0417-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0417-Maps-shouldn-t-load-chunks.patch rename to patches/unapplied/server/0417-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0418-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/unapplied/server/0418-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0418-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/unapplied/server/0418-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0419-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/0419-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0419-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/unapplied/server/0419-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0420-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/0420-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 98% rename from patches/server/0420-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/unapplied/server/0420-Fix-piston-physics-inconsistency-MC-188840.patch index dcc303244a..5c7d480a24 100644 --- a/patches/server/0420-Fix-piston-physics-inconsistency-MC-188840.patch +++ b/patches/unapplied/server/0420-Fix-piston-physics-inconsistency-MC-188840.patch @@ -66,7 +66,7 @@ index 29755807fdb6c30e31c0ec2bbf33bed9afd5d478..8d73893100884c08aa552ff41c2a07a3 } diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java -index dda0b32a4989bbead35a2219a969a30ba0e975b0..7c59d44a3bafdc65f453d77ff3e25cffb742ad6c 100644 +index 1bcaed2abd1118804a362d6852e4a29d3064aa14..4b61602a1d2d6817272e02cfd282ac5dabbd976d 100644 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java @@ -285,7 +285,7 @@ public class PistonMovingBlockEntity extends BlockEntity { diff --git a/patches/server/0421-Fix-sand-duping.patch b/patches/unapplied/server/0421-Fix-sand-duping.patch similarity index 100% rename from patches/server/0421-Fix-sand-duping.patch rename to patches/unapplied/server/0421-Fix-sand-duping.patch diff --git a/patches/server/0422-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/unapplied/server/0422-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0422-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/unapplied/server/0422-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0423-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/unapplied/server/0423-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 94% rename from patches/server/0423-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/unapplied/server/0423-Prevent-position-desync-in-playerconnection-causing-.patch index ba844e85b3..67c1208b0d 100644 --- a/patches/server/0423-Prevent-position-desync-in-playerconnection-causing-.patch +++ b/patches/unapplied/server/0423-Prevent-position-desync-in-playerconnection-causing-.patch @@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside of the move call and into an appropriate place in the tick method. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index bbed54d5a0e3c363614d694950688f8edc02841d..30a69fa8f8266909fe98bea7ea781789c74bf50b 100644 +index 8c8ccd61fb1592a9274e54ed6e06ec7737e942e0..10efc010cf5c43d3e009972c1f5ee7c4083d21f8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1446,6 +1446,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0424-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/0424-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0424-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/unapplied/server/0424-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0425-Improve-Arrow-API.patch b/patches/unapplied/server/0425-Improve-Arrow-API.patch similarity index 100% rename from patches/server/0425-Improve-Arrow-API.patch rename to patches/unapplied/server/0425-Improve-Arrow-API.patch diff --git a/patches/server/0426-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/0426-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 95% rename from patches/server/0426-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/unapplied/server/0426-Add-and-implement-PlayerRecipeBookClickEvent.patch index 8c4d05e3c5..7c4e7cafb8 100644 --- a/patches/server/0426-Add-and-implement-PlayerRecipeBookClickEvent.patch +++ b/patches/unapplied/server/0426-Add-and-implement-PlayerRecipeBookClickEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 939eb9fee9d856ace268f89081e6a9777a452a8a..8df02b4fb9df21ce8185dd9a22235c13eb42463f 100644 +index 10efc010cf5c43d3e009972c1f5ee7c4083d21f8..496fdfcf3e6a80f9f2f073105bc2819ce127c8ef 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3229,9 +3229,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0427-Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/0427-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0427-Hide-sync-chunk-writes-behind-flag.patch rename to patches/unapplied/server/0427-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0428-Add-permission-for-command-blocks.patch b/patches/unapplied/server/0428-Add-permission-for-command-blocks.patch similarity index 98% rename from patches/server/0428-Add-permission-for-command-blocks.patch rename to patches/unapplied/server/0428-Add-permission-for-command-blocks.patch index 211e5736a2..52ec404d66 100644 --- a/patches/server/0428-Add-permission-for-command-blocks.patch +++ b/patches/unapplied/server/0428-Add-permission-for-command-blocks.patch @@ -18,7 +18,7 @@ index af00442931f9f6cf878bd61137c2f29fc7c8d0b1..431ff490760f54be76847c7b370dbbb4 return false; } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b7865696d9b939791b0315ab2a231e2dc5872de8..02b6cf65f6abedfd4933e4e64d254f190e061301 100644 +index 496fdfcf3e6a80f9f2f073105bc2819ce127c8ef..033c1038ccc5f4c340f853a89a72aeadbf15922e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -878,7 +878,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0429-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/unapplied/server/0429-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0429-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/unapplied/server/0429-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0430-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/0430-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 97% rename from patches/server/0430-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/unapplied/server/0430-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index 0cc2b96c65..629abccc39 100644 --- a/patches/server/0430-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/unapplied/server/0430-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -76,7 +76,7 @@ index e3a62579067209c447f2fdcb76b2a11e489a376b..a8e18a168e8288ebea95bacd61a38039 @Override diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 83d05b2546fe54485daede323a0f6343b62d278a..d8c77533a44e316693535ea66fe6ae7f4994de5f 100644 +index 61904f4d3160d83f87d66fd9f86acf54ab31adc6..c32f09e993ef25876373a34d148b0452ea03bcf0 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1129,7 +1129,7 @@ public class ServerPlayer extends Player { @@ -89,7 +89,7 @@ index 83d05b2546fe54485daede323a0f6343b62d278a..d8c77533a44e316693535ea66fe6ae7f playerlist.sendPlayerPermissionLevel(this); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d47cec95660d7754921d06f7316cc6ab4ab6016a..3526e4f179b36d1ab61488e4b9c2404d5754c258 100644 +index 033c1038ccc5f4c340f853a89a72aeadbf15922e..f6012bf8134f0606710511150dd296a1d677334d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3499,7 +3499,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0431-Paper-dumpitem-command.patch b/patches/unapplied/server/0431-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0431-Paper-dumpitem-command.patch rename to patches/unapplied/server/0431-Paper-dumpitem-command.patch diff --git a/patches/server/0432-Don-t-allow-null-UUID-s-for-chat.patch b/patches/unapplied/server/0432-Don-t-allow-null-UUID-s-for-chat.patch similarity index 100% rename from patches/server/0432-Don-t-allow-null-UUID-s-for-chat.patch rename to patches/unapplied/server/0432-Don-t-allow-null-UUID-s-for-chat.patch diff --git a/patches/server/0433-Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/0433-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0433-Improve-Legacy-Component-serialization-size.patch rename to patches/unapplied/server/0433-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0434-Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/0434-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0434-Optimize-Bit-Operations-by-inlining.patch rename to patches/unapplied/server/0434-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0435-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/unapplied/server/0435-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 98% rename from patches/server/0435-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/unapplied/server/0435-Add-Plugin-Tickets-to-API-Chunk-Methods.patch index 966d383561..fd149d8f21 100644 --- a/patches/server/0435-Add-Plugin-Tickets-to-API-Chunk-Methods.patch +++ b/patches/unapplied/server/0435-Add-Plugin-Tickets-to-API-Chunk-Methods.patch @@ -44,7 +44,7 @@ index 4c6c9aa8b3305f5ab4f7b8d356e860da169fb1db..2aab13270af76bcc1b62787e9910d23d 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 c3703933598ee96d856a18dcc0932061959c9791..20a08c79d4577d0eb36ab413b36811c828f4f084 100644 +index 298012beaf6f587a05d230b7208325ea8c3ad811..f19bfe6d6d4d915876cea3e6ef792639300fced1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -282,8 +282,21 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0436-incremental-chunk-and-player-saving.patch b/patches/unapplied/server/0436-incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/0436-incremental-chunk-and-player-saving.patch rename to patches/unapplied/server/0436-incremental-chunk-and-player-saving.patch diff --git a/patches/server/0437-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/unapplied/server/0437-Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from patches/server/0437-Stop-copy-on-write-operations-for-updating-light-dat.patch rename to patches/unapplied/server/0437-Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/patches/server/0438-Support-old-UUID-format-for-NBT.patch b/patches/unapplied/server/0438-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0438-Support-old-UUID-format-for-NBT.patch rename to patches/unapplied/server/0438-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0439-Clean-up-duplicated-GameProfile-Properties.patch b/patches/unapplied/server/0439-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/0439-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/unapplied/server/0439-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/0440-Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/0440-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0440-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/unapplied/server/0440-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0441-Remove-some-streams-from-structures.patch b/patches/unapplied/server/0441-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0441-Remove-some-streams-from-structures.patch rename to patches/unapplied/server/0441-Remove-some-streams-from-structures.patch diff --git a/patches/server/0442-Remove-streams-from-classes-related-villager-gossip.patch b/patches/unapplied/server/0442-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0442-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/unapplied/server/0442-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0443-Support-components-in-ItemMeta.patch b/patches/unapplied/server/0443-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0443-Support-components-in-ItemMeta.patch rename to patches/unapplied/server/0443-Support-components-in-ItemMeta.patch diff --git a/patches/server/0444-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/unapplied/server/0444-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch similarity index 100% rename from patches/server/0444-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch rename to patches/unapplied/server/0444-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch diff --git a/patches/server/0445-Add-entity-liquid-API.patch b/patches/unapplied/server/0445-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0445-Add-entity-liquid-API.patch rename to patches/unapplied/server/0445-Add-entity-liquid-API.patch diff --git a/patches/server/0446-Update-itemstack-legacy-name-and-lore.patch b/patches/unapplied/server/0446-Update-itemstack-legacy-name-and-lore.patch similarity index 97% rename from patches/server/0446-Update-itemstack-legacy-name-and-lore.patch rename to patches/unapplied/server/0446-Update-itemstack-legacy-name-and-lore.patch index b354241c07..49dc09d429 100644 --- a/patches/server/0446-Update-itemstack-legacy-name-and-lore.patch +++ b/patches/unapplied/server/0446-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 5e0852c4656813272a7ee6cb9c2331410c1b7739..cbcc90cffe38ea249cd0de4b0a90adc2a3ddeb0b 100644 +index 2650deb381bae30593128fc003c042f42110802c..85dead69d41ca10ad76fdab13da8548d359142b0 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -166,6 +166,44 @@ public final class ItemStack { diff --git a/patches/server/0447-Spawn-player-in-correct-world-on-login.patch b/patches/unapplied/server/0447-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0447-Spawn-player-in-correct-world-on-login.patch rename to patches/unapplied/server/0447-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0448-Add-PrepareResultEvent.patch b/patches/unapplied/server/0448-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0448-Add-PrepareResultEvent.patch rename to patches/unapplied/server/0448-Add-PrepareResultEvent.patch diff --git a/patches/server/0449-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/unapplied/server/0449-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 90% rename from patches/server/0449-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/unapplied/server/0449-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch index 278a3ba951..bb00d0c79c 100644 --- a/patches/server/0449-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch +++ b/patches/unapplied/server/0449-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 908d1c840301bfbd8aaed571e7cae7d1c16b5c19..8271a130fb14894259a4beb095627bd9f60bc48c 100644 +index a337ce97a31998a63e7c329ac94cad9a5f783a5c..9c5421b9aa35c5f90a51ed097e68c5143054e966 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3446,7 +3446,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0450-Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/0450-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0450-Optimize-NetworkManager-Exception-Handling.patch rename to patches/unapplied/server/0450-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0451-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/unapplied/server/0451-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from patches/server/0451-Optimize-the-advancement-data-player-iteration-to-be.patch rename to patches/unapplied/server/0451-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/patches/server/0452-Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/0452-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0452-Fix-arrows-never-despawning-MC-125757.patch rename to patches/unapplied/server/0452-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0453-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/0453-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0453-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/unapplied/server/0453-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0454-Fix-SPIGOT-5989.patch b/patches/unapplied/server/0454-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0454-Fix-SPIGOT-5989.patch rename to patches/unapplied/server/0454-Fix-SPIGOT-5989.patch diff --git a/patches/server/0455-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/0455-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0455-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/unapplied/server/0455-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0456-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/0456-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0456-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/unapplied/server/0456-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0457-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/unapplied/server/0457-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0457-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/unapplied/server/0457-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0458-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/unapplied/server/0458-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 90% rename from patches/server/0458-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to patches/unapplied/server/0458-Add-missing-strikeLighting-call-to-World-spigot-stri.patch index 2ba58a89b9..9ebf6d1aa9 100644 --- a/patches/server/0458-Add-missing-strikeLighting-call-to-World-spigot-stri.patch +++ b/patches/unapplied/server/0458-Add-missing-strikeLighting-call-to-World-spigot-stri.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing strikeLighting call to diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 20a08c79d4577d0eb36ab413b36811c828f4f084..fabd0ef0bef97bc7f14d6fae18028cca0709d3a6 100644 +index f19bfe6d6d4d915876cea3e6ef792639300fced1..643b682db12560fc3409ede861a4e0aea8fc5360 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2134,6 +2134,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0459-Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/0459-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0459-Fix-some-rails-connecting-improperly.patch rename to patches/unapplied/server/0459-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0460-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/unapplied/server/0460-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0460-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/unapplied/server/0460-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0461-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/0461-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 95% rename from patches/server/0461-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/unapplied/server/0461-Do-not-let-the-server-load-chunks-from-newer-version.patch index efa8bf5dc9..8e90d25da9 100644 --- a/patches/server/0461-Do-not-let-the-server-load-chunks-from-newer-version.patch +++ b/patches/unapplied/server/0461-Do-not-let-the-server-load-chunks-from-newer-version.patch @@ -9,7 +9,7 @@ the game, immediately stop the server to prevent data corruption. You can override this functionality at your own peril. diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index 3c61be19c65b2da9283b2aba2b4e66f84bac6e1c..31e552e1b4c3a6931a61a88a75965a0427d6de8d 100644 +index 89c367f542aee35ba9f596d678bfeb5412c1697d..4236cf65b893bc21d2597010a2f9745fc0e107a4 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java @@ -126,9 +126,22 @@ public class ChunkSerializer { diff --git a/patches/server/0462-Brand-support.patch b/patches/unapplied/server/0462-Brand-support.patch similarity index 97% rename from patches/server/0462-Brand-support.patch rename to patches/unapplied/server/0462-Brand-support.patch index a4020275ce..8e0ba7f0be 100644 --- a/patches/server/0462-Brand-support.patch +++ b/patches/unapplied/server/0462-Brand-support.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Brand support diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3526e4f179b36d1ab61488e4b9c2404d5754c258..35362ffc16eb8ed070d001ab3ca9037f78519a77 100644 +index f6012bf8134f0606710511150dd296a1d677334d..6e7d909bd87a1732e99c68d2baf57042d7e930fe 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -298,6 +298,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0463-Add-setMaxPlayers-API.patch b/patches/unapplied/server/0463-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0463-Add-setMaxPlayers-API.patch rename to patches/unapplied/server/0463-Add-setMaxPlayers-API.patch diff --git a/patches/server/0464-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/0464-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0464-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/unapplied/server/0464-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0465-Don-t-require-FACING-data.patch b/patches/unapplied/server/0465-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0465-Don-t-require-FACING-data.patch rename to patches/unapplied/server/0465-Don-t-require-FACING-data.patch diff --git a/patches/server/0466-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/unapplied/server/0466-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0466-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/unapplied/server/0466-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0467-Add-moon-phase-API.patch b/patches/unapplied/server/0467-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0467-Add-moon-phase-API.patch rename to patches/unapplied/server/0467-Add-moon-phase-API.patch diff --git a/patches/server/0468-Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/0468-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0468-Prevent-headless-pistons-from-being-created.patch rename to patches/unapplied/server/0468-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0469-Add-BellRingEvent.patch b/patches/unapplied/server/0469-Add-BellRingEvent.patch similarity index 94% rename from patches/server/0469-Add-BellRingEvent.patch rename to patches/unapplied/server/0469-Add-BellRingEvent.patch index 6b5fdae03d..cd1aafe4c3 100644 --- a/patches/server/0469-Add-BellRingEvent.patch +++ b/patches/unapplied/server/0469-Add-BellRingEvent.patch @@ -7,7 +7,7 @@ Add a new event, BellRingEvent, to trigger whenever a player rings a village bell. Passes along the bell block and the player who rang it. diff --git a/src/main/java/net/minecraft/world/level/block/BellBlock.java b/src/main/java/net/minecraft/world/level/block/BellBlock.java -index a4da6418c17e145333aa5efe427826ba53293e4d..3dfbc517e8867029b9821ec605dffb1ae476260a 100644 +index 8ccf71bddb2637a9e468e3d958665bbd58c37647..8878d8882d7aee4d44ad8339daff180812912649 100644 --- a/src/main/java/net/minecraft/world/level/block/BellBlock.java +++ b/src/main/java/net/minecraft/world/level/block/BellBlock.java @@ -3,6 +3,7 @@ package net.minecraft.world.level.block; diff --git a/patches/server/0470-Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/0470-Add-zombie-targets-turtle-egg-config.patch similarity index 91% rename from patches/server/0470-Add-zombie-targets-turtle-egg-config.patch rename to patches/unapplied/server/0470-Add-zombie-targets-turtle-egg-config.patch index da7839967c..47e5d7f8eb 100644 --- a/patches/server/0470-Add-zombie-targets-turtle-egg-config.patch +++ b/patches/unapplied/server/0470-Add-zombie-targets-turtle-egg-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add zombie targets turtle egg config diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java -index b2b396dd7c5face635595d527f132e0787ef7e26..15783f8c8a65820aa5a643bbd4866b1eb6bf980a 100644 +index 473782e8b6a760aec492fa28270a7eb05a484e78..d5633a869819b26376c01d38e08763457e3b7b68 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java @@ -107,7 +107,7 @@ public class Zombie extends Monster { diff --git a/patches/server/0471-Buffer-joins-to-world.patch b/patches/unapplied/server/0471-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0471-Buffer-joins-to-world.patch rename to patches/unapplied/server/0471-Buffer-joins-to-world.patch diff --git a/patches/server/0472-Eigencraft-redstone-implementation.patch b/patches/unapplied/server/0472-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0472-Eigencraft-redstone-implementation.patch rename to patches/unapplied/server/0472-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0473-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/unapplied/server/0473-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0473-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/unapplied/server/0473-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0474-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/unapplied/server/0474-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 97% rename from patches/server/0474-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/unapplied/server/0474-PortalCreateEvent-needs-to-know-its-entity.patch index 29df4d3231..377bf7e435 100644 --- a/patches/server/0474-PortalCreateEvent-needs-to-know-its-entity.patch +++ b/patches/unapplied/server/0474-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 cbcc90cffe38ea249cd0de4b0a90adc2a3ddeb0b..b4ad1610d30396be344a04f5f3a565ae2b8f2265 100644 +index 85dead69d41ca10ad76fdab13da8548d359142b0..0bd7b64bd1c468221d3354494527b456bc02437a 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -431,7 +431,7 @@ public final class ItemStack { @@ -104,7 +104,7 @@ index b2ab7749e3ddf124d5ef97271a76dc875a650771..97b0e820d353e8ab4ca9d9e2efd0a881 @Deprecated public void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean notify) { diff --git a/src/main/java/net/minecraft/world/level/portal/PortalShape.java b/src/main/java/net/minecraft/world/level/portal/PortalShape.java -index 768c39b265437641721d669d6aa85b3db49e5422..3414f3190e1a760c602613e82e551e797c3aa575 100644 +index 4d9023d1baa06802ab97af4be2739c13dee4f9b9..0ef049f0fac81312bee4f0e0c14dc3e74b09d272 100644 --- a/src/main/java/net/minecraft/world/level/portal/PortalShape.java +++ b/src/main/java/net/minecraft/world/level/portal/PortalShape.java @@ -10,6 +10,7 @@ import net.minecraft.server.level.ServerLevel; diff --git a/patches/server/0475-Fix-CraftTeam-null-check.patch b/patches/unapplied/server/0475-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0475-Fix-CraftTeam-null-check.patch rename to patches/unapplied/server/0475-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0476-Add-more-Evoker-API.patch b/patches/unapplied/server/0476-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0476-Add-more-Evoker-API.patch rename to patches/unapplied/server/0476-Add-more-Evoker-API.patch diff --git a/patches/server/0477-Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/0477-Add-methods-to-get-translation-keys.patch similarity index 98% rename from patches/server/0477-Add-methods-to-get-translation-keys.patch rename to patches/unapplied/server/0477-Add-methods-to-get-translation-keys.patch index 1b21cce4a5..7b0740446b 100644 --- a/patches/server/0477-Add-methods-to-get-translation-keys.patch +++ b/patches/unapplied/server/0477-Add-methods-to-get-translation-keys.patch @@ -46,7 +46,7 @@ index a859a675b4bc543e139358223cc92ad5eee3ddb5..31a22f26070059e5379730c1940ff1c5 public net.minecraft.world.item.enchantment.Enchantment getHandle() { diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index be1e6c050a4d80f330bb4a5ea5f79da3aefb9510..cb5cfcfc1a1ad5d4c0c07f187c8e36c4fc63248c 100644 +index b38b2b3855583b26d7ed2ede041a73cf14cbe81c..8b0090ba3359c68aa98c0cf74e0dc0b3e9143577 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -483,6 +483,30 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0478-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/0478-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0478-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/unapplied/server/0478-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0479-Cache-block-data-strings.patch b/patches/unapplied/server/0479-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0479-Cache-block-data-strings.patch rename to patches/unapplied/server/0479-Cache-block-data-strings.patch diff --git a/patches/server/0480-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/0480-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 96% rename from patches/server/0480-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/unapplied/server/0480-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index 9fd7a379f2..b6308e9346 100644 --- a/patches/server/0480-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/unapplied/server/0480-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch @@ -9,7 +9,7 @@ as this is how Vanilla teleports entities. Cancel any pending motion when teleported. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index da6a0171bd63ac68635de1c23fc9eafa732503bd..214771e661ca3303af167fda3b623d83f0f63055 100644 +index 6e7d909bd87a1732e99c68d2baf57042d7e930fe..434dc5ab5f02e66918f150c2db1d3cd35d58eece 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -760,7 +760,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -57,7 +57,7 @@ index 1582da75f92aed598c1c076af7b94af7ab48d10a..5a43e57d2e2146d324685808cfe98017 this.setYRot(yaw); this.setXRot(pitch); diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index 763b4049060b294345ef8a796c0f5b52575d644c..8d403b4a6db98cc5c3851d5f2c485560cf8b412f 100644 +index 2e28bbd75c689ab5a004f0a2de4a89cde7a807ec..572982353530663825ab2d576c3277197a5715a3 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -163,6 +163,7 @@ public abstract class BaseSpawner { diff --git a/patches/server/0481-Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/server/0481-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0481-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/unapplied/server/0481-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0482-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/unapplied/server/0482-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0482-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/unapplied/server/0482-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0483-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/unapplied/server/0483-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0483-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/unapplied/server/0483-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0484-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/server/0484-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 94% rename from patches/server/0484-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/unapplied/server/0484-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch index ecd5d521bb..6e3cfc1242 100644 --- a/patches/server/0484-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch +++ b/patches/unapplied/server/0484-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch @@ -21,7 +21,7 @@ index 5a43e57d2e2146d324685808cfe980178bde03a2..c99798ea88f7f6dd6db6c80666171e75 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index cb5cfcfc1a1ad5d4c0c07f187c8e36c4fc63248c..bcb61aefa3e42d4a1fd3d97116802197fe94ae21 100644 +index 8b0090ba3359c68aa98c0cf74e0dc0b3e9143577..78ea9d70d44cbf2a51172c5cd394c9ff17981961 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -507,6 +507,10 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0485-Lazily-track-plugin-scoreboards-by-default.patch b/patches/unapplied/server/0485-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0485-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/unapplied/server/0485-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0486-Entity-isTicking.patch b/patches/unapplied/server/0486-Entity-isTicking.patch similarity index 100% rename from patches/server/0486-Entity-isTicking.patch rename to patches/unapplied/server/0486-Entity-isTicking.patch diff --git a/patches/server/0487-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/unapplied/server/0487-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0487-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/unapplied/server/0487-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0488-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/unapplied/server/0488-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0488-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/unapplied/server/0488-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0489-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/unapplied/server/0489-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0489-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/unapplied/server/0489-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0490-Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/0490-Fix-for-large-move-vectors-crashing-server.patch similarity index 98% rename from patches/server/0490-Fix-for-large-move-vectors-crashing-server.patch rename to patches/unapplied/server/0490-Fix-for-large-move-vectors-crashing-server.patch index ab6165f75a..48aaeeea92 100644 --- a/patches/server/0490-Fix-for-large-move-vectors-crashing-server.patch +++ b/patches/unapplied/server/0490-Fix-for-large-move-vectors-crashing-server.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server Check movement distance also based on current position. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 214771e661ca3303af167fda3b623d83f0f63055..3d7d23a02e4aceb95ec36fbca9d02294f08c5780 100644 +index 434dc5ab5f02e66918f150c2db1d3cd35d58eece..3387fdf7e7345827dae63815de19b38a79f8ed4f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -575,9 +575,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0491-Optimise-getType-calls.patch b/patches/unapplied/server/0491-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0491-Optimise-getType-calls.patch rename to patches/unapplied/server/0491-Optimise-getType-calls.patch diff --git a/patches/server/0492-Villager-resetOffers.patch b/patches/unapplied/server/0492-Villager-resetOffers.patch similarity index 100% rename from patches/server/0492-Villager-resetOffers.patch rename to patches/unapplied/server/0492-Villager-resetOffers.patch diff --git a/patches/server/0493-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/unapplied/server/0493-Improve-inlinig-for-some-hot-IBlockData-methods.patch similarity index 100% rename from patches/server/0493-Improve-inlinig-for-some-hot-IBlockData-methods.patch rename to patches/unapplied/server/0493-Improve-inlinig-for-some-hot-IBlockData-methods.patch diff --git a/patches/server/0494-Retain-block-place-order-when-capturing-blockstates.patch b/patches/unapplied/server/0494-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0494-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/unapplied/server/0494-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0495-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/unapplied/server/0495-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0495-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/unapplied/server/0495-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0496-Fix-item-locations-dropped-from-campfires.patch b/patches/unapplied/server/0496-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0496-Fix-item-locations-dropped-from-campfires.patch rename to patches/unapplied/server/0496-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0497-Player-elytra-boost-API.patch b/patches/unapplied/server/0497-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0497-Player-elytra-boost-API.patch rename to patches/unapplied/server/0497-Player-elytra-boost-API.patch diff --git a/patches/server/0498-Fixed-TileEntityBell-memory-leak.patch b/patches/unapplied/server/0498-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0498-Fixed-TileEntityBell-memory-leak.patch rename to patches/unapplied/server/0498-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0499-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/unapplied/server/0499-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0499-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/unapplied/server/0499-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0500-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/0500-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0500-Add-getOfflinePlayerIfCached-String.patch rename to patches/unapplied/server/0500-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0501-Add-ignore-discounts-API.patch b/patches/unapplied/server/0501-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0501-Add-ignore-discounts-API.patch rename to patches/unapplied/server/0501-Add-ignore-discounts-API.patch diff --git a/patches/server/0502-Toggle-for-removing-existing-dragon.patch b/patches/unapplied/server/0502-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0502-Toggle-for-removing-existing-dragon.patch rename to patches/unapplied/server/0502-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0503-Fix-client-lag-on-advancement-loading.patch b/patches/unapplied/server/0503-Fix-client-lag-on-advancement-loading.patch similarity index 95% rename from patches/server/0503-Fix-client-lag-on-advancement-loading.patch rename to patches/unapplied/server/0503-Fix-client-lag-on-advancement-loading.patch index 11fb3e8d77..f81a2f02d3 100644 --- a/patches/server/0503-Fix-client-lag-on-advancement-loading.patch +++ b/patches/unapplied/server/0503-Fix-client-lag-on-advancement-loading.patch @@ -15,7 +15,7 @@ manually reload the advancement data for all players, which normally takes place as a part of the datapack reloading. diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index bcb61aefa3e42d4a1fd3d97116802197fe94ae21..5656b0380c8a74084f5ff366c09419171b66f172 100644 +index 78ea9d70d44cbf2a51172c5cd394c9ff17981961..2fdaf6661644c8601f310ae79d9f59920a2f3996 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -345,7 +345,13 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0504-Item-no-age-no-player-pickup.patch b/patches/unapplied/server/0504-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0504-Item-no-age-no-player-pickup.patch rename to patches/unapplied/server/0504-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0505-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/0505-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0505-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/unapplied/server/0505-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0506-Beacon-API-custom-effect-ranges.patch b/patches/unapplied/server/0506-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0506-Beacon-API-custom-effect-ranges.patch rename to patches/unapplied/server/0506-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0507-Add-API-for-quit-reason.patch b/patches/unapplied/server/0507-Add-API-for-quit-reason.patch similarity index 94% rename from patches/server/0507-Add-API-for-quit-reason.patch rename to patches/unapplied/server/0507-Add-API-for-quit-reason.patch index f868950487..6033f3d712 100644 --- a/patches/server/0507-Add-API-for-quit-reason.patch +++ b/patches/unapplied/server/0507-Add-API-for-quit-reason.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add API for quit reason diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index 22e2e314a4bb1b22758130d4e9065f9b87b0116e..de1fdb93e0e3acd58429b042629df8c00bfb65ad 100644 +index 3ae55dd6441b2dfdb67eb2f24ecf885bab89e7a6..f76ee2131c35a9dbf7ad9d086b51c9644b0a2462 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -170,12 +170,15 @@ public class Connection extends SimpleChannelInboundHandler> { @@ -25,7 +25,7 @@ index 22e2e314a4bb1b22758130d4e9065f9b87b0116e..de1fdb93e0e3acd58429b042629df8c0 Connection.LOGGER.debug("Failed to sent packet", throwable); ConnectionProtocol enumprotocol = this.getCurrentProtocol(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b39bb4b5a1612dac7d495f22e5ab3ec5fb00a058..c841cfba25d6f448fec929b3ca9653775d3e0ac9 100644 +index b41fddf5225b9d7cccf73b91dd0c14897c990346..67cf1cd5f3a83a52dca54781670dcfe0cf2a89c2 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -266,6 +266,7 @@ public class ServerPlayer extends Player { @@ -37,7 +37,7 @@ index b39bb4b5a1612dac7d495f22e5ab3ec5fb00a058..c841cfba25d6f448fec929b3ca965377 public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, @Nullable ProfilePublicKey publicKey) { super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile, publicKey); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3d7d23a02e4aceb95ec36fbca9d02294f08c5780..8e12c4d4b54c2f0a265dc627d7981282fc6fda6e 100644 +index 3387fdf7e7345827dae63815de19b38a79f8ed4f..d0f80dadb4e2dade8122c945bafe05ff7adf42a0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -515,6 +515,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0508-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/unapplied/server/0508-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0508-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/unapplied/server/0508-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0509-Expose-world-spawn-angle.patch b/patches/unapplied/server/0509-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0509-Expose-world-spawn-angle.patch rename to patches/unapplied/server/0509-Expose-world-spawn-angle.patch diff --git a/patches/server/0510-Add-Destroy-Speed-API.patch b/patches/unapplied/server/0510-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0510-Add-Destroy-Speed-API.patch rename to patches/unapplied/server/0510-Add-Destroy-Speed-API.patch diff --git a/patches/server/0511-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/unapplied/server/0511-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0511-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/unapplied/server/0511-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0512-Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/server/0512-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0512-Add-LivingEntity-clearActiveItem.patch rename to patches/unapplied/server/0512-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0513-Add-PlayerItemCooldownEvent.patch b/patches/unapplied/server/0513-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0513-Add-PlayerItemCooldownEvent.patch rename to patches/unapplied/server/0513-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0514-Significantly-improve-performance-of-the-end-generat.patch b/patches/unapplied/server/0514-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0514-Significantly-improve-performance-of-the-end-generat.patch rename to patches/unapplied/server/0514-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0515-More-lightning-API.patch b/patches/unapplied/server/0515-More-lightning-API.patch similarity index 100% rename from patches/server/0515-More-lightning-API.patch rename to patches/unapplied/server/0515-More-lightning-API.patch diff --git a/patches/server/0516-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/unapplied/server/0516-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 98% rename from patches/server/0516-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/unapplied/server/0516-Climbing-should-not-bypass-cramming-gamerule.patch index 4b6afc8021..0c836e07f2 100644 --- a/patches/server/0516-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/unapplied/server/0516-Climbing-should-not-bypass-cramming-gamerule.patch @@ -45,7 +45,7 @@ index 302676ef78ed5b3b7fc1b04851447ca72eed10c0..a00c3d96f2fc7131d1f4afa7af4e41ac } else if (entity.level.isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) { return false; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8271a130fb14894259a4beb095627bd9f60bc48c..75c76534e326255bbf432b6fe7ce2b9819846f06 100644 +index 9c5421b9aa35c5f90a51ed097e68c5143054e966..a01a6a2c869a973eb044fdb2084f151954599075 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3368,7 +3368,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0517-Added-missing-default-perms-for-commands.patch b/patches/unapplied/server/0517-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0517-Added-missing-default-perms-for-commands.patch rename to patches/unapplied/server/0517-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0518-Add-PlayerShearBlockEvent.patch b/patches/unapplied/server/0518-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0518-Add-PlayerShearBlockEvent.patch rename to patches/unapplied/server/0518-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0519-Fix-curing-zombie-villager-discount-exploit.patch b/patches/unapplied/server/0519-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0519-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/unapplied/server/0519-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0520-Limit-recipe-packets.patch b/patches/unapplied/server/0520-Limit-recipe-packets.patch similarity index 96% rename from patches/server/0520-Limit-recipe-packets.patch rename to patches/unapplied/server/0520-Limit-recipe-packets.patch index f8fd1bff8d..17632f4fd2 100644 --- a/patches/server/0520-Limit-recipe-packets.patch +++ b/patches/unapplied/server/0520-Limit-recipe-packets.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 83b98097f8664123448ad852ef94a4ff999b9d4f..d4454ecd2b67c1162a99b65af85b801a48471f86 100644 +index d0f80dadb4e2dade8122c945bafe05ff7adf42a0..e36b50f7467d14eaf0fb29e6c5ece87de9db085a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -263,6 +263,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0521-Fix-CraftSound-backwards-compatibility.patch b/patches/unapplied/server/0521-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0521-Fix-CraftSound-backwards-compatibility.patch rename to patches/unapplied/server/0521-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0522-Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/server/0522-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0522-Player-Chunk-Load-Unload-Events.patch rename to patches/unapplied/server/0522-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0523-Optimize-Dynamic-get-Missing-Keys.patch b/patches/unapplied/server/0523-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0523-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/unapplied/server/0523-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0524-Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/server/0524-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0524-Expose-LivingEntity-hurt-direction.patch rename to patches/unapplied/server/0524-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0525-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/server/0525-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0525-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/unapplied/server/0525-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0526-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/unapplied/server/0526-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0526-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/unapplied/server/0526-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0527-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/0527-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0527-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/unapplied/server/0527-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0528-Implement-TargetHitEvent.patch b/patches/unapplied/server/0528-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0528-Implement-TargetHitEvent.patch rename to patches/unapplied/server/0528-Implement-TargetHitEvent.patch diff --git a/patches/server/0529-MC-4-Fix-item-position-desync.patch b/patches/unapplied/server/0529-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0529-MC-4-Fix-item-position-desync.patch rename to patches/unapplied/server/0529-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0530-Additional-Block-Material-API-s.patch b/patches/unapplied/server/0530-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0530-Additional-Block-Material-API-s.patch rename to patches/unapplied/server/0530-Additional-Block-Material-API-s.patch diff --git a/patches/server/0531-Fix-harming-potion-dupe.patch b/patches/unapplied/server/0531-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0531-Fix-harming-potion-dupe.patch rename to patches/unapplied/server/0531-Fix-harming-potion-dupe.patch diff --git a/patches/server/0532-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/unapplied/server/0532-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0532-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/unapplied/server/0532-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0533-Cache-burn-durations.patch b/patches/unapplied/server/0533-Cache-burn-durations.patch similarity index 100% rename from patches/server/0533-Cache-burn-durations.patch rename to patches/unapplied/server/0533-Cache-burn-durations.patch diff --git a/patches/server/0534-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/unapplied/server/0534-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 91% rename from patches/server/0534-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/unapplied/server/0534-Allow-disabling-mob-spawner-spawn-egg-transformation.patch index b11735c5d7..6d66e59fe4 100644 --- a/patches/server/0534-Allow-disabling-mob-spawner-spawn-egg-transformation.patch +++ b/patches/unapplied/server/0534-Allow-disabling-mob-spawner-spawn-egg-transformation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling mob spawner spawn egg transformation diff --git a/src/main/java/net/minecraft/world/item/SpawnEggItem.java b/src/main/java/net/minecraft/world/item/SpawnEggItem.java -index b518c5d18c2d3486382ed4e59941b155d5534014..6df94a75b7c4c2593598088d84cf0a4a57e3fd99 100644 +index d222d9932af4b23af5d182259143d2d7f27675c5..a6c8833102a89ffacc817343285343ec4f8fa9bf 100644 --- a/src/main/java/net/minecraft/world/item/SpawnEggItem.java +++ b/src/main/java/net/minecraft/world/item/SpawnEggItem.java @@ -61,7 +61,7 @@ public class SpawnEggItem extends Item { diff --git a/patches/server/0535-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/unapplied/server/0535-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 96% rename from patches/server/0535-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/unapplied/server/0535-Fix-Not-a-string-Map-Conversion-spam.patch index 8967f3f735..7f8fe4769a 100644 --- a/patches/server/0535-Fix-Not-a-string-Map-Conversion-spam.patch +++ b/patches/unapplied/server/0535-Fix-Not-a-string-Map-Conversion-spam.patch @@ -12,7 +12,7 @@ requesting the world. Track spigot issue to see when fixed: https://hub.spigotmc.org/jira/browse/SPIGOT-6181 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 913fabc7f42c05ccec6501247a5e8d1d481756ee..4acbcafc158cf11af51d9518ba5b83aaa75f52a1 100644 +index 7254e7a42c58737cfc04f09aaca2fe1ebeec6d08..2a7c4b70f3d4442b33fa3d005da0da5da9756e83 100644 --- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java +++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java @@ -15,6 +15,8 @@ import net.minecraft.core.BlockPos; diff --git a/patches/server/0536-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/server/0536-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0536-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/unapplied/server/0536-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0537-Fix-interact-event-not-being-called-in-adventure.patch b/patches/unapplied/server/0537-Fix-interact-event-not-being-called-in-adventure.patch similarity index 95% rename from patches/server/0537-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/unapplied/server/0537-Fix-interact-event-not-being-called-in-adventure.patch index 8cd15192dc..138b9c9df1 100644 --- a/patches/server/0537-Fix-interact-event-not-being-called-in-adventure.patch +++ b/patches/unapplied/server/0537-Fix-interact-event-not-being-called-in-adventure.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix interact event not being called in adventure Call PlayerInteractEvent when left-clicking on a block in adventure mode diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 32227020d0cba1aba3ec0fcda5f4b4cd4b1ce394..c0cca7442d3bb7df393088d66c5962bcda78e609 100644 +index e36b50f7467d14eaf0fb29e6c5ece87de9db085a..4083f437704e586bfc1cf1e321f0b44febf7c44b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1852,7 +1852,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0538-Zombie-API-breaking-doors.patch b/patches/unapplied/server/0538-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0538-Zombie-API-breaking-doors.patch rename to patches/unapplied/server/0538-Zombie-API-breaking-doors.patch diff --git a/patches/server/0539-Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/0539-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0539-Fix-nerfed-slime-when-splitting.patch rename to patches/unapplied/server/0539-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0540-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/0540-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0540-Add-EntityLoadCrossbowEvent.patch rename to patches/unapplied/server/0540-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0541-Guardian-beam-workaround.patch b/patches/unapplied/server/0541-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0541-Guardian-beam-workaround.patch rename to patches/unapplied/server/0541-Guardian-beam-workaround.patch diff --git a/patches/server/0542-Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/0542-Added-WorldGameRuleChangeEvent.patch similarity index 96% rename from patches/server/0542-Added-WorldGameRuleChangeEvent.patch rename to patches/unapplied/server/0542-Added-WorldGameRuleChangeEvent.patch index e31546e7aa..d30f6720de 100644 --- a/patches/server/0542-Added-WorldGameRuleChangeEvent.patch +++ b/patches/unapplied/server/0542-Added-WorldGameRuleChangeEvent.patch @@ -18,7 +18,7 @@ index 1b66c33a55a9516269c80f5052fb103418b11367..745b8724b7536a5b2c2c94ae8fd703ea return t0.getCommandResult(); } diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java -index 800325a544bb9f228ccbeb0a52d7f380a8c6083e..3c93bfeb94168f832904a8462ae23b06e81e080d 100644 +index 17f8a46622b97b94e4b5da4c2c303e09a1162c21..392ab42d3c4fa6ef1815279a02b1fce236f725fa 100644 --- a/src/main/java/net/minecraft/world/level/GameRules.java +++ b/src/main/java/net/minecraft/world/level/GameRules.java @@ -262,10 +262,10 @@ public class GameRules { @@ -64,7 +64,7 @@ index 800325a544bb9f228ccbeb0a52d7f380a8c6083e..3c93bfeb94168f832904a8462ae23b06 public int get() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 37c7eb9357d897e1d5aefd355460d6fe76762d9d..55f07a9675f4a1fde183f2009b46a4a09a8fb1c7 100644 +index ca768eea4f4ad7196f6f595516683b28372de71a..9bc547020f56ddbb766d31f27081a59f75ea2c1a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1793,8 +1793,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0543-Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/0543-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0543-Added-ServerResourcesReloadedEvent.patch rename to patches/unapplied/server/0543-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0544-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/unapplied/server/0544-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 95% rename from patches/server/0544-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/unapplied/server/0544-Added-world-settings-for-mobs-picking-up-loot.patch index 8227b41958..45af88e50c 100644 --- a/patches/server/0544-Added-world-settings-for-mobs-picking-up-loot.patch +++ b/patches/unapplied/server/0544-Added-world-settings-for-mobs-picking-up-loot.patch @@ -18,7 +18,7 @@ index 60064770f08cbee19eeb43bf7c144b6eefbc4888..c2a26b91d9065fdb52a1ded6c3295093 LocalDate localdate = LocalDate.now(); int i = localdate.get(ChronoField.DAY_OF_MONTH); diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java -index 15783f8c8a65820aa5a643bbd4866b1eb6bf980a..e4bd194998b14fa4f6212ec978afc8dc7921bb9f 100644 +index d5633a869819b26376c01d38e08763457e3b7b68..a1a24982163023c3a75267366cc6a0d53401c094 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java @@ -508,7 +508,7 @@ public class Zombie extends Monster { diff --git a/patches/server/0545-Implemented-BlockFailedDispenseEvent.patch b/patches/unapplied/server/0545-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0545-Implemented-BlockFailedDispenseEvent.patch rename to patches/unapplied/server/0545-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0546-Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/server/0546-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0546-Added-PlayerLecternPageChangeEvent.patch rename to patches/unapplied/server/0546-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0547-Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/server/0547-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0547-Added-PlayerLoomPatternSelectEvent.patch rename to patches/unapplied/server/0547-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0548-Configurable-door-breaking-difficulty.patch b/patches/unapplied/server/0548-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0548-Configurable-door-breaking-difficulty.patch rename to patches/unapplied/server/0548-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0549-Empty-commands-shall-not-be-dispatched.patch b/patches/unapplied/server/0549-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0549-Empty-commands-shall-not-be-dispatched.patch rename to patches/unapplied/server/0549-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0550-Implement-API-to-expose-exact-interaction-point.patch b/patches/unapplied/server/0550-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0550-Implement-API-to-expose-exact-interaction-point.patch rename to patches/unapplied/server/0550-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0551-Remove-stale-POIs.patch b/patches/unapplied/server/0551-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0551-Remove-stale-POIs.patch rename to patches/unapplied/server/0551-Remove-stale-POIs.patch diff --git a/patches/server/0552-Fix-villager-boat-exploit.patch b/patches/unapplied/server/0552-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0552-Fix-villager-boat-exploit.patch rename to patches/unapplied/server/0552-Fix-villager-boat-exploit.patch diff --git a/patches/server/0553-Add-sendOpLevel-API.patch b/patches/unapplied/server/0553-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0553-Add-sendOpLevel-API.patch rename to patches/unapplied/server/0553-Add-sendOpLevel-API.patch diff --git a/patches/server/0554-Add-PaperRegistry.patch b/patches/unapplied/server/0554-Add-PaperRegistry.patch similarity index 99% rename from patches/server/0554-Add-PaperRegistry.patch rename to patches/unapplied/server/0554-Add-PaperRegistry.patch index 0b33804e74..e3ec55a71b 100644 --- a/patches/server/0554-Add-PaperRegistry.patch +++ b/patches/unapplied/server/0554-Add-PaperRegistry.patch @@ -205,7 +205,7 @@ index 17e0425a520bd95074bf34c262c36c5603266ea7..f05f5d13f23599dbb95a7062ebbb4133 // Paper start if (Thread.currentThread() != this.serverThread) { diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 5656b0380c8a74084f5ff366c09419171b66f172..bd6a65a15e581e0f342d7dd9572651fa21ce3961 100644 +index 2fdaf6661644c8601f310ae79d9f59920a2f3996..55301058555e0062aa349ff91cdd11c4be49ec55 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -517,6 +517,11 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0555-Add-StructuresLocateEvent.patch b/patches/unapplied/server/0555-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0555-Add-StructuresLocateEvent.patch rename to patches/unapplied/server/0555-Add-StructuresLocateEvent.patch diff --git a/patches/server/0556-Collision-option-for-requiring-a-player-participant.patch b/patches/unapplied/server/0556-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0556-Collision-option-for-requiring-a-player-participant.patch rename to patches/unapplied/server/0556-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0557-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/unapplied/server/0557-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0557-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/unapplied/server/0557-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0558-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/server/0558-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0558-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/unapplied/server/0558-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0559-Make-schedule-command-per-world.patch b/patches/unapplied/server/0559-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0559-Make-schedule-command-per-world.patch rename to patches/unapplied/server/0559-Make-schedule-command-per-world.patch diff --git a/patches/server/0560-Configurable-max-leash-distance.patch b/patches/unapplied/server/0560-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0560-Configurable-max-leash-distance.patch rename to patches/unapplied/server/0560-Configurable-max-leash-distance.patch diff --git a/patches/server/0561-Implement-BlockPreDispenseEvent.patch b/patches/unapplied/server/0561-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0561-Implement-BlockPreDispenseEvent.patch rename to patches/unapplied/server/0561-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0562-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/server/0562-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0562-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/unapplied/server/0562-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0563-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/unapplied/server/0563-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0563-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/unapplied/server/0563-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0564-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/server/0564-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0564-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/unapplied/server/0564-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0565-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/server/0565-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 98% rename from patches/server/0565-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/unapplied/server/0565-Add-dropLeash-variable-to-EntityUnleashEvent.patch index 134418ef42..fc222ef2b8 100644 --- a/patches/server/0565-Add-dropLeash-variable-to-EntityUnleashEvent.patch +++ b/patches/unapplied/server/0565-Add-dropLeash-variable-to-EntityUnleashEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 2ae973d77d0b088cf7dc7a2338b8b7461e585dca..513bfbd0775ee0a880a031baaaf1bfe1f3788dc3 100644 +index b9db51b07ba3b867d80a48e5106c2b38ea0b72ee..965dd5564d64c094ffc1347621a45d50c6c5f1e3 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1248,12 +1248,15 @@ public abstract class Mob extends LivingEntity { diff --git a/patches/server/0566-Reset-shield-blocking-on-dimension-change.patch b/patches/unapplied/server/0566-Reset-shield-blocking-on-dimension-change.patch similarity index 89% rename from patches/server/0566-Reset-shield-blocking-on-dimension-change.patch rename to patches/unapplied/server/0566-Reset-shield-blocking-on-dimension-change.patch index f15ef83553..6fdfb3f1c2 100644 --- a/patches/server/0566-Reset-shield-blocking-on-dimension-change.patch +++ b/patches/unapplied/server/0566-Reset-shield-blocking-on-dimension-change.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 826dcafaf65cef8bbff4f231f71305e851de0902..becbe9c488577e1acea8ae1dac9792f4a25c2c66 100644 +index e74d4523caa4d2d4b33e22145f7b2dcb63dba9fc..781bad6dd4279eddeaa2d55eaf513ef725729d26 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1166,6 +1166,11 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0567-add-DragonEggFormEvent.patch b/patches/unapplied/server/0567-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0567-add-DragonEggFormEvent.patch rename to patches/unapplied/server/0567-add-DragonEggFormEvent.patch diff --git a/patches/server/0568-EntityMoveEvent.patch b/patches/unapplied/server/0568-EntityMoveEvent.patch similarity index 95% rename from patches/server/0568-EntityMoveEvent.patch rename to patches/unapplied/server/0568-EntityMoveEvent.patch index 17db772399..ebc7d0fc79 100644 --- a/patches/server/0568-EntityMoveEvent.patch +++ b/patches/unapplied/server/0568-EntityMoveEvent.patch @@ -17,7 +17,7 @@ index f05f5d13f23599dbb95a7062ebbb41334ec21f14..2f8026fffde9976e28d3263cbc4296a5 this.profiler.push(() -> { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 0a0727b5c6900bd7299a0caf1e1125d809880423..44dc48d663e384161cd2a2b3de5464ee4b068dbf 100644 +index 1bb87c81c57a8d28712ff82b8211b7cc2e32c2a6..38b2b6b1a3068abd6432d866fe582935d144fb89 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -217,6 +217,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -29,7 +29,7 @@ index 0a0727b5c6900bd7299a0caf1e1125d809880423..44dc48d663e384161cd2a2b3de5464ee final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date()); io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 0896cbe04be6a5471088c321296506415fccbed6..cc930b8a22b3e3540b9fb24c6eaa329895c075cb 100644 +index a01a6a2c869a973eb044fdb2084f151954599075..39d3fecfa120aaae98237417b7ea0e9123085183 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3306,6 +3306,20 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0569-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/unapplied/server/0569-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0569-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/unapplied/server/0569-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0570-Inline-shift-direction-fields.patch b/patches/unapplied/server/0570-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0570-Inline-shift-direction-fields.patch rename to patches/unapplied/server/0570-Inline-shift-direction-fields.patch diff --git a/patches/server/0571-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/server/0571-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0571-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/unapplied/server/0571-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0572-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/server/0572-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0572-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/unapplied/server/0572-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0573-living-entity-allow-attribute-registration.patch b/patches/unapplied/server/0573-living-entity-allow-attribute-registration.patch similarity index 96% rename from patches/server/0573-living-entity-allow-attribute-registration.patch rename to patches/unapplied/server/0573-living-entity-allow-attribute-registration.patch index 8db0430432..65829db430 100644 --- a/patches/server/0573-living-entity-allow-attribute-registration.patch +++ b/patches/unapplied/server/0573-living-entity-allow-attribute-registration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] living entity allow attribute registration diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java -index 4d2c02a1e1b4a8fad12894a7439ec7e53a67d97a..c770ee21b7b699522941f6a1584d532001c04082 100644 +index bd078de8ed93d7325ad204789c765c689f8df939..692524a69d43dcf52ae1b0f7f593fc53f3878137 100644 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java @@ -132,4 +132,12 @@ public class AttributeMap { diff --git a/patches/server/0574-fix-dead-slime-setSize-invincibility.patch b/patches/unapplied/server/0574-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0574-fix-dead-slime-setSize-invincibility.patch rename to patches/unapplied/server/0574-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0575-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/unapplied/server/0575-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0575-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/unapplied/server/0575-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0576-Add-support-for-hex-color-codes-in-console.patch b/patches/unapplied/server/0576-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0576-Add-support-for-hex-color-codes-in-console.patch rename to patches/unapplied/server/0576-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0577-Expose-Tracked-Players.patch b/patches/unapplied/server/0577-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0577-Expose-Tracked-Players.patch rename to patches/unapplied/server/0577-Expose-Tracked-Players.patch diff --git a/patches/server/0578-Remove-streams-from-SensorNearest.patch b/patches/unapplied/server/0578-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0578-Remove-streams-from-SensorNearest.patch rename to patches/unapplied/server/0578-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0579-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/unapplied/server/0579-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0579-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/unapplied/server/0579-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0580-Improve-ServerGUI.patch b/patches/unapplied/server/0580-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0580-Improve-ServerGUI.patch rename to patches/unapplied/server/0580-Improve-ServerGUI.patch diff --git a/patches/server/0581-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/unapplied/server/0581-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0581-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/unapplied/server/0581-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0582-fix-converting-txt-to-json-file.patch b/patches/unapplied/server/0582-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0582-fix-converting-txt-to-json-file.patch rename to patches/unapplied/server/0582-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0583-Add-worldborder-events.patch b/patches/unapplied/server/0583-Add-worldborder-events.patch similarity index 100% rename from patches/server/0583-Add-worldborder-events.patch rename to patches/unapplied/server/0583-Add-worldborder-events.patch diff --git a/patches/server/0584-added-PlayerNameEntityEvent.patch b/patches/unapplied/server/0584-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0584-added-PlayerNameEntityEvent.patch rename to patches/unapplied/server/0584-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0585-Prevent-grindstones-from-overstacking-items.patch b/patches/unapplied/server/0585-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0585-Prevent-grindstones-from-overstacking-items.patch rename to patches/unapplied/server/0585-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0586-Add-recipe-to-cook-events.patch b/patches/unapplied/server/0586-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0586-Add-recipe-to-cook-events.patch rename to patches/unapplied/server/0586-Add-recipe-to-cook-events.patch diff --git a/patches/server/0587-Add-Block-isValidTool.patch b/patches/unapplied/server/0587-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0587-Add-Block-isValidTool.patch rename to patches/unapplied/server/0587-Add-Block-isValidTool.patch diff --git a/patches/server/0588-Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/0588-Allow-using-signs-inside-spawn-protection.patch similarity index 94% rename from patches/server/0588-Allow-using-signs-inside-spawn-protection.patch rename to patches/unapplied/server/0588-Allow-using-signs-inside-spawn-protection.patch index e2dfe62f54..d08ec6896b 100644 --- a/patches/server/0588-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/unapplied/server/0588-Allow-using-signs-inside-spawn-protection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c0cca7442d3bb7df393088d66c5962bcda78e609..6c64270b9d87ae3d08400ddd4effa689ce58070f 100644 +index 4083f437704e586bfc1cf1e321f0b44febf7c44b..bdd268acc850f92b27ff6035ee577f16894608a7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1844,7 +1844,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0589-Expand-world-key-API.patch b/patches/unapplied/server/0589-Expand-world-key-API.patch similarity index 97% rename from patches/server/0589-Expand-world-key-API.patch rename to patches/unapplied/server/0589-Expand-world-key-API.patch index f4537dd863..82098b9936 100644 --- a/patches/server/0589-Expand-world-key-API.patch +++ b/patches/unapplied/server/0589-Expand-world-key-API.patch @@ -67,7 +67,7 @@ index 462ffe647b11185001a08b09e74773b8831a3b46..e90ef57567928fdfd08fd16ce84503b0 // Check if a World already exists with the UID. if (this.getWorld(world.getUID()) != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index bd6a65a15e581e0f342d7dd9572651fa21ce3961..45cf2df36af20e36ba8026f94e5598d1b5583d4b 100644 +index 55301058555e0062aa349ff91cdd11c4be49ec55..2f00fa822e72b38ad2f15ed84ffa1f3998667177 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -522,6 +522,11 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0590-Add-fast-alternative-constructor-for-Rotations.patch b/patches/unapplied/server/0590-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0590-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/unapplied/server/0590-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0591-Item-Rarity-API.patch b/patches/unapplied/server/0591-Item-Rarity-API.patch similarity index 96% rename from patches/server/0591-Item-Rarity-API.patch rename to patches/unapplied/server/0591-Item-Rarity-API.patch index 68c2da6fd7..2eb7a72cb1 100644 --- a/patches/server/0591-Item-Rarity-API.patch +++ b/patches/unapplied/server/0591-Item-Rarity-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Item Rarity API public net.minecraft.world.item.Item rarity diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 45cf2df36af20e36ba8026f94e5598d1b5583d4b..cef2946c0fc5e52896635396dea4153b61da612e 100644 +index 2f00fa822e72b38ad2f15ed84ffa1f3998667177..1f511696a21bee2ada502b5f0389368f25c45e5a 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -527,6 +527,20 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0592-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/unapplied/server/0592-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 97% rename from patches/server/0592-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/unapplied/server/0592-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch index 7ad8f56595..2898008081 100644 --- a/patches/server/0592-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch +++ b/patches/unapplied/server/0592-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch @@ -31,7 +31,7 @@ index fdefccfa07227f315259f636076e36a120c72917..7e9f2a128639c1b80c008f1203a4a41b if (t0 != null) { worldserver.addFreshEntityWithPassengers(t0, spawnReason); diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -index dc1762ad344bf49fda4c891f38ef20639f353a45..9162f3e5752a7bee825e7ae21e9fb950cf4eb644 100644 +index e594cf4b8084b7448c29208a2070e766e391713d..d6c583d668abdc9302ccedba42b9b4e2f6180c56 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java @@ -59,7 +59,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill diff --git a/patches/server/0593-copy-TESign-isEditable-from-snapshots.patch b/patches/unapplied/server/0593-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0593-copy-TESign-isEditable-from-snapshots.patch rename to patches/unapplied/server/0593-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0594-Drop-carried-item-when-player-has-disconnected.patch b/patches/unapplied/server/0594-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0594-Drop-carried-item-when-player-has-disconnected.patch rename to patches/unapplied/server/0594-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0595-forced-whitelist-use-configurable-kick-message.patch b/patches/unapplied/server/0595-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0595-forced-whitelist-use-configurable-kick-message.patch rename to patches/unapplied/server/0595-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0596-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/0596-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 91% rename from patches/server/0596-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/unapplied/server/0596-Don-t-ignore-result-of-PlayerEditBookEvent.patch index 661e62955f..6ffd76bfc4 100644 --- a/patches/server/0596-Don-t-ignore-result-of-PlayerEditBookEvent.patch +++ b/patches/unapplied/server/0596-Don-t-ignore-result-of-PlayerEditBookEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6c64270b9d87ae3d08400ddd4effa689ce58070f..63649e0d5547d1b904a6605868dfad52214c7b3c 100644 +index bdd268acc850f92b27ff6035ee577f16894608a7..6e04920319740d31111d17800bb0e577cda8627f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1294,7 +1294,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0597-Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/0597-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0597-Entity-load-save-limit-per-chunk.patch rename to patches/unapplied/server/0597-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0598-Expose-protocol-version.patch b/patches/unapplied/server/0598-Expose-protocol-version.patch similarity index 91% rename from patches/server/0598-Expose-protocol-version.patch rename to patches/unapplied/server/0598-Expose-protocol-version.patch index a86638c110..5f05bd2005 100644 --- a/patches/server/0598-Expose-protocol-version.patch +++ b/patches/unapplied/server/0598-Expose-protocol-version.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose protocol version diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index cef2946c0fc5e52896635396dea4153b61da612e..a01c4790d56bfae3f8dd4b4e8c54b9725d92b410 100644 +index 1f511696a21bee2ada502b5f0389368f25c45e5a..69ea448975077a1c254185925987bcd9599d252a 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -541,6 +541,11 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0599-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/unapplied/server/0599-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0599-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/unapplied/server/0599-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0600-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/unapplied/server/0600-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 92% rename from patches/server/0600-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/unapplied/server/0600-Fix-PlayerItemConsumeEvent-cancelling-properly.patch index 555a3729a6..0b0b417b58 100644 --- a/patches/server/0600-Fix-PlayerItemConsumeEvent-cancelling-properly.patch +++ b/patches/unapplied/server/0600-Fix-PlayerItemConsumeEvent-cancelling-properly.patch @@ -9,7 +9,7 @@ till their item is switched. This patch clears the active item when the event is cancelled diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 427326d1795bd5262ac96bfeb30de0e02c48e04e..901075b2a494efa54c4468336f2aa85ef31a0d64 100644 +index 39d3fecfa120aaae98237417b7ea0e9123085183..d8aee7c5980055d32960aa1af80fcf4353481b88 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3789,6 +3789,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0601-Add-bypass-host-check.patch b/patches/unapplied/server/0601-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0601-Add-bypass-host-check.patch rename to patches/unapplied/server/0601-Add-bypass-host-check.patch diff --git a/patches/server/0602-Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/0602-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0602-Set-area-affect-cloud-rotation.patch rename to patches/unapplied/server/0602-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0603-add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/server/0603-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0603-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/unapplied/server/0603-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0604-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/server/0604-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0604-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/unapplied/server/0604-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0605-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/server/0605-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0605-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/unapplied/server/0605-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0606-fix-PigZombieAngerEvent-cancellation.patch b/patches/unapplied/server/0606-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0606-fix-PigZombieAngerEvent-cancellation.patch rename to patches/unapplied/server/0606-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0607-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/unapplied/server/0607-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0607-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/unapplied/server/0607-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0608-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/0608-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 93% rename from patches/server/0608-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/unapplied/server/0608-fix-PlayerItemHeldEvent-firing-twice.patch index 3840306aa1..e331fd28df 100644 --- a/patches/server/0608-fix-PlayerItemHeldEvent-firing-twice.patch +++ b/patches/unapplied/server/0608-fix-PlayerItemHeldEvent-firing-twice.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 63649e0d5547d1b904a6605868dfad52214c7b3c..917aa2bd63db9a63c75267564d0c3602b0f01392 100644 +index 6e04920319740d31111d17800bb0e577cda8627f..27b3a9476e4c1d75d19f1e6f52ee98140bfa73dd 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2054,6 +2054,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0609-Added-PlayerDeepSleepEvent.patch b/patches/unapplied/server/0609-Added-PlayerDeepSleepEvent.patch similarity index 91% rename from patches/server/0609-Added-PlayerDeepSleepEvent.patch rename to patches/unapplied/server/0609-Added-PlayerDeepSleepEvent.patch index b7989ecad1..7813956e8c 100644 --- a/patches/server/0609-Added-PlayerDeepSleepEvent.patch +++ b/patches/unapplied/server/0609-Added-PlayerDeepSleepEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added PlayerDeepSleepEvent diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 0960e5ecc25fad3eb46a871c2749dd176b812460..a6bd94ed379ef1ab0ffe71183aef3cf3061fd092 100644 +index 8f9a5589e430c31de29d23d6c27757dd33e8bb86..350d6a987fcebde60154e8ffde9372490090075d 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -254,6 +254,11 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0610-More-World-API.patch b/patches/unapplied/server/0610-More-World-API.patch similarity index 97% rename from patches/server/0610-More-World-API.patch rename to patches/unapplied/server/0610-More-World-API.patch index fbd013415f..d46322280d 100644 --- a/patches/server/0610-More-World-API.patch +++ b/patches/unapplied/server/0610-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 55f07a9675f4a1fde183f2009b46a4a09a8fb1c7..888090b2548fb23089dcd05e9de2b1f09dc5876a 100644 +index 9bc547020f56ddbb766d31f27081a59f75ea2c1a..c801ba30f7d5fc891adc3dad7ee8e2d78e7ac359 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2035,6 +2035,65 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0611-Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/server/0611-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0611-Added-PlayerBedFailEnterEvent.patch rename to patches/unapplied/server/0611-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0612-Implement-methods-to-convert-between-Component-and-B.patch b/patches/unapplied/server/0612-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0612-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/unapplied/server/0612-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0613-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/unapplied/server/0613-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0613-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/unapplied/server/0613-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0614-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/0614-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0614-Introduce-beacon-activation-deactivation-events.patch rename to patches/unapplied/server/0614-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0615-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/server/0615-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 97% rename from patches/server/0615-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/unapplied/server/0615-add-RespawnFlags-to-PlayerRespawnEvent.patch index 02b477915e..4819d08133 100644 --- a/patches/server/0615-add-RespawnFlags-to-PlayerRespawnEvent.patch +++ b/patches/unapplied/server/0615-add-RespawnFlags-to-PlayerRespawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 405ea7deeb1033d45f9bd14be3d5305d2ba3522f..542ab2799681e711e7330794693ade5bd3fda554 100644 +index 27b3a9476e4c1d75d19f1e6f52ee98140bfa73dd..c326ce013828a68d5edc14efeabce3464475daa9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2895,7 +2895,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0616-Add-Channel-initialization-listeners.patch b/patches/unapplied/server/0616-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0616-Add-Channel-initialization-listeners.patch rename to patches/unapplied/server/0616-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0617-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/unapplied/server/0617-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0617-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/unapplied/server/0617-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0618-Add-more-WanderingTrader-API.patch b/patches/unapplied/server/0618-Add-more-WanderingTrader-API.patch similarity index 97% rename from patches/server/0618-Add-more-WanderingTrader-API.patch rename to patches/unapplied/server/0618-Add-more-WanderingTrader-API.patch index 65d351d6df..a541485c99 100644 --- a/patches/server/0618-Add-more-WanderingTrader-API.patch +++ b/patches/unapplied/server/0618-Add-more-WanderingTrader-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add more WanderingTrader API diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -index abb2c5c4ac481c7529aa29322babb1929235e15a..86e1ba898d6b92735258419fa74352e5116226dc 100644 +index d6c583d668abdc9302ccedba42b9b4e2f6180c56..8a4107067938f7ca990a7edd1e271d57cfdb0545 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java @@ -56,6 +56,10 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill diff --git a/patches/server/0619-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/0619-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0619-Add-EntityBlockStorage-clearEntities.patch rename to patches/unapplied/server/0619-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0620-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/0620-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0620-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/unapplied/server/0620-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0621-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0621-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0621-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/unapplied/server/0621-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0622-Inventory-close.patch b/patches/unapplied/server/0622-Inventory-close.patch similarity index 100% rename from patches/server/0622-Inventory-close.patch rename to patches/unapplied/server/0622-Inventory-close.patch diff --git a/patches/server/0623-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/server/0623-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0623-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/unapplied/server/0623-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0624-Fix-CraftPotionBrewer-cache.patch b/patches/unapplied/server/0624-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0624-Fix-CraftPotionBrewer-cache.patch rename to patches/unapplied/server/0624-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0625-Add-basic-Datapack-API.patch b/patches/unapplied/server/0625-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0625-Add-basic-Datapack-API.patch rename to patches/unapplied/server/0625-Add-basic-Datapack-API.patch diff --git a/patches/server/0626-Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/0626-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0626-Add-environment-variable-to-disable-server-gui.patch rename to patches/unapplied/server/0626-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0627-additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/0627-additions-to-PlayerGameModeChangeEvent.patch similarity index 98% rename from patches/server/0627-additions-to-PlayerGameModeChangeEvent.patch rename to patches/unapplied/server/0627-additions-to-PlayerGameModeChangeEvent.patch index 03838f2d6c..e9c6ccf855 100644 --- a/patches/server/0627-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/unapplied/server/0627-additions-to-PlayerGameModeChangeEvent.patch @@ -126,7 +126,7 @@ index 32746dfbc2fdfc150583676b1bf0762398b76d75..1ad1f958a9b6e1bc21f1c505aa7ea549 } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 542ab2799681e711e7330794693ade5bd3fda554..cf5aac0c7bb719246b49a0ee08148141a381a16a 100644 +index c326ce013828a68d5edc14efeabce3464475daa9..83a044061f77260a67023839b99915bd3abd8448 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2904,7 +2904,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0628-ItemStack-repair-check-API.patch b/patches/unapplied/server/0628-ItemStack-repair-check-API.patch similarity index 97% rename from patches/server/0628-ItemStack-repair-check-API.patch rename to patches/unapplied/server/0628-ItemStack-repair-check-API.patch index 4a0ab9cc96..9cec6dcbee 100644 --- a/patches/server/0628-ItemStack-repair-check-API.patch +++ b/patches/unapplied/server/0628-ItemStack-repair-check-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index a01c4790d56bfae3f8dd4b4e8c54b9725d92b410..ec896bd1ce2b0fb101dcf3316a9981c92fbebcea 100644 +index 69ea448975077a1c254185925987bcd9599d252a..ec779868f37c1e8b22cd195fb458ed55fbb3aeb7 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -542,6 +542,14 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0629-More-Enchantment-API.patch b/patches/unapplied/server/0629-More-Enchantment-API.patch similarity index 100% rename from patches/server/0629-More-Enchantment-API.patch rename to patches/unapplied/server/0629-More-Enchantment-API.patch diff --git a/patches/server/0630-Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/0630-Move-range-check-for-block-placing-up.patch similarity index 92% rename from patches/server/0630-Move-range-check-for-block-placing-up.patch rename to patches/unapplied/server/0630-Move-range-check-for-block-placing-up.patch index 063490f935..582c587f8b 100644 --- a/patches/server/0630-Move-range-check-for-block-placing-up.patch +++ b/patches/unapplied/server/0630-Move-range-check-for-block-placing-up.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index cf5aac0c7bb719246b49a0ee08148141a381a16a..3fcd92c408258a60de049437478f6dab010f1fb1 100644 +index 83a044061f77260a67023839b99915bd3abd8448..4296b7b0c2e0ec3f9737b93a436e7d425d0ee0af 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1830,6 +1830,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0631-Fix-and-optimise-world-force-upgrading.patch b/patches/unapplied/server/0631-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0631-Fix-and-optimise-world-force-upgrading.patch rename to patches/unapplied/server/0631-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0632-Add-Mob-lookAt-API.patch b/patches/unapplied/server/0632-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0632-Add-Mob-lookAt-API.patch rename to patches/unapplied/server/0632-Add-Mob-lookAt-API.patch diff --git a/patches/server/0633-Add-Unix-domain-socket-support.patch b/patches/unapplied/server/0633-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0633-Add-Unix-domain-socket-support.patch rename to patches/unapplied/server/0633-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0634-Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/0634-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0634-Add-EntityInsideBlockEvent.patch rename to patches/unapplied/server/0634-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0635-Attributes-API-for-item-defaults.patch b/patches/unapplied/server/0635-Attributes-API-for-item-defaults.patch similarity index 94% rename from patches/server/0635-Attributes-API-for-item-defaults.patch rename to patches/unapplied/server/0635-Attributes-API-for-item-defaults.patch index 9a1775d18c..3e1c85c9cc 100644 --- a/patches/server/0635-Attributes-API-for-item-defaults.patch +++ b/patches/unapplied/server/0635-Attributes-API-for-item-defaults.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Attributes API for item defaults diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index ec896bd1ce2b0fb101dcf3316a9981c92fbebcea..4a2903d8cb7523abba2efd7024662d0d56871a43 100644 +index ec779868f37c1e8b22cd195fb458ed55fbb3aeb7..6b2df5d9aa2c7a7be0d18816cfddf381b71bbe36 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -550,6 +550,19 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0636-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/0636-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0636-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/unapplied/server/0636-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0637-More-Lidded-Block-API.patch b/patches/unapplied/server/0637-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0637-More-Lidded-Block-API.patch rename to patches/unapplied/server/0637-More-Lidded-Block-API.patch diff --git a/patches/server/0638-Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/0638-Limit-item-frame-cursors-on-maps.patch similarity index 93% rename from patches/server/0638-Limit-item-frame-cursors-on-maps.patch rename to patches/unapplied/server/0638-Limit-item-frame-cursors-on-maps.patch index 4e2cd3bfa2..d4916fb1f4 100644 --- a/patches/server/0638-Limit-item-frame-cursors-on-maps.patch +++ b/patches/unapplied/server/0638-Limit-item-frame-cursors-on-maps.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit item frame cursors on maps 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 4acbcafc158cf11af51d9518ba5b83aaa75f52a1..67b88da702b780f79c0496cb17f1e6f1f8dd6c2b 100644 +index 2a7c4b70f3d4442b33fa3d005da0da5da9756e83..ed96f092febd5a589b4d94368d6921ac0a71f7d6 100644 --- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java +++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java @@ -295,8 +295,12 @@ public class MapItemSavedData extends SavedData { diff --git a/patches/server/0639-Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/0639-Add-PlayerKickEvent-causes.patch similarity index 99% rename from patches/server/0639-Add-PlayerKickEvent-causes.patch rename to patches/unapplied/server/0639-Add-PlayerKickEvent-causes.patch index 7303e3383d..ba52268ac5 100644 --- a/patches/server/0639-Add-PlayerKickEvent-causes.patch +++ b/patches/unapplied/server/0639-Add-PlayerKickEvent-causes.patch @@ -57,7 +57,7 @@ index 65637a33ba171a4b598f70cd943d24b0ee44a69f..57a9146bf2dee7a60aab16716e25348f } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1ac8490d9a935a1816147363fb35fc12dbbb72fc..c809098218b7676bf9609f53129957361b36776a 100644 +index 4296b7b0c2e0ec3f9737b93a436e7d425d0ee0af..db43e6c4673a4f679132869b7cb22911cb015ee2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -369,7 +369,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0640-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/0640-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0640-Add-PufferFishStateChangeEvent.patch rename to patches/unapplied/server/0640-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0641-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/0641-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0641-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/unapplied/server/0641-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0642-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/unapplied/server/0642-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0642-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/unapplied/server/0642-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0643-Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/0643-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0643-Add-option-to-fix-items-merging-through-walls.patch rename to patches/unapplied/server/0643-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0644-Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/0644-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0644-Add-BellRevealRaiderEvent.patch rename to patches/unapplied/server/0644-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0645-Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/0645-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0645-Fix-invulnerable-end-crystals.patch rename to patches/unapplied/server/0645-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0646-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/0646-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0646-Add-ElderGuardianAppearanceEvent.patch rename to patches/unapplied/server/0646-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0647-Fix-dangerous-end-portal-logic.patch b/patches/unapplied/server/0647-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0647-Fix-dangerous-end-portal-logic.patch rename to patches/unapplied/server/0647-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0648-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/unapplied/server/0648-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0648-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/unapplied/server/0648-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0649-Make-item-validations-configurable.patch b/patches/unapplied/server/0649-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0649-Make-item-validations-configurable.patch rename to patches/unapplied/server/0649-Make-item-validations-configurable.patch diff --git a/patches/server/0650-Line-Of-Sight-Changes.patch b/patches/unapplied/server/0650-Line-Of-Sight-Changes.patch similarity index 98% rename from patches/server/0650-Line-Of-Sight-Changes.patch rename to patches/unapplied/server/0650-Line-Of-Sight-Changes.patch index 926a8563ca..941f8ed350 100644 --- a/patches/server/0650-Line-Of-Sight-Changes.patch +++ b/patches/unapplied/server/0650-Line-Of-Sight-Changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 901075b2a494efa54c4468336f2aa85ef31a0d64..aeb1d0559e58d6839aa9fcfc899f5ad7ba33e891 100644 +index d8aee7c5980055d32960aa1af80fcf4353481b88..7f0107757c03126b54104f8446577ef417de52fe 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3517,7 +3517,8 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0651-add-per-world-spawn-limits.patch b/patches/unapplied/server/0651-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0651-add-per-world-spawn-limits.patch rename to patches/unapplied/server/0651-add-per-world-spawn-limits.patch diff --git a/patches/server/0652-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/unapplied/server/0652-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0652-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/unapplied/server/0652-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0653-Add-more-LimitedRegion-API.patch b/patches/unapplied/server/0653-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0653-Add-more-LimitedRegion-API.patch rename to patches/unapplied/server/0653-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0654-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/0654-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 94% rename from patches/server/0654-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/unapplied/server/0654-Fix-PlayerDropItemEvent-using-wrong-item.patch index d9e8222524..082bf083be 100644 --- a/patches/server/0654-Fix-PlayerDropItemEvent-using-wrong-item.patch +++ b/patches/unapplied/server/0654-Fix-PlayerDropItemEvent-using-wrong-item.patch @@ -18,7 +18,7 @@ index f033a1a2bb3e44d30107bf1494b315cdc0c94b56..5bbc8f5f1f5c66ae6d1128d87fb7dde0 this.awardStat(Stats.DROP); diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index a6bd94ed379ef1ab0ffe71183aef3cf3061fd092..92a5aadef076cb905962dab86f32d4ff253fef93 100644 +index 350d6a987fcebde60154e8ffde9372490090075d..e44351546f25421c959e091d0831197621553b41 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -723,6 +723,11 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0655-Missing-Entity-Behavior-API.patch b/patches/unapplied/server/0655-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0655-Missing-Entity-Behavior-API.patch rename to patches/unapplied/server/0655-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0656-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/0656-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 92% rename from patches/server/0656-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/unapplied/server/0656-Ensure-disconnect-for-book-edit-is-called-on-main.patch index 3ef312f324..79fad9c132 100644 --- a/patches/server/0656-Ensure-disconnect-for-book-edit-is-called-on-main.patch +++ b/patches/unapplied/server/0656-Ensure-disconnect-for-book-edit-is-called-on-main.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1673082e5badbc0f3057b11544fb39be0ed84a44..8d41767c0bbd55c3c3f291fee8ba92622c3cc881 100644 +index db43e6c4673a4f679132869b7cb22911cb015ee2..cda39f4ba09e5c9aabf68bd2df4f593554201ff9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1213,7 +1213,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0657-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/0657-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0657-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/unapplied/server/0657-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0658-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/0658-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0658-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/unapplied/server/0658-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0659-Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/0659-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0659-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/unapplied/server/0659-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0660-Adds-PlayerArmSwingEvent.patch b/patches/unapplied/server/0660-Adds-PlayerArmSwingEvent.patch similarity index 93% rename from patches/server/0660-Adds-PlayerArmSwingEvent.patch rename to patches/unapplied/server/0660-Adds-PlayerArmSwingEvent.patch index 933614f011..9276ee0939 100644 --- a/patches/server/0660-Adds-PlayerArmSwingEvent.patch +++ b/patches/unapplied/server/0660-Adds-PlayerArmSwingEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8d41767c0bbd55c3c3f291fee8ba92622c3cc881..42f525b6e7bccca420abccfc2da80ead20966559 100644 +index cda39f4ba09e5c9aabf68bd2df4f593554201ff9..20fdebcabbeb008b3e412d471fd6b471d99d0614 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2631,7 +2631,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0661-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/0661-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 98% rename from patches/server/0661-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/unapplied/server/0661-Fixes-kick-event-leave-message-not-being-sent.patch index 0d770eaae9..7f901f87c1 100644 --- a/patches/server/0661-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/unapplied/server/0661-Fixes-kick-event-leave-message-not-being-sent.patch @@ -17,7 +17,7 @@ index 5bbc8f5f1f5c66ae6d1128d87fb7dde0b546387e..e505fa3a6f90efec32e408a08a31295a public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 42f525b6e7bccca420abccfc2da80ead20966559..ff31434e372693f6cf3d6a94815abd2ceb76f2d0 100644 +index 20fdebcabbeb008b3e412d471fd6b471d99d0614..1a2446afabce39a488d680f66c5e5b581863b4ae 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -522,7 +522,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0662-Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/0662-Add-config-for-mobs-immune-to-default-effects.patch similarity index 97% rename from patches/server/0662-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/unapplied/server/0662-Add-config-for-mobs-immune-to-default-effects.patch index 5f83ae240c..9a5036a4d1 100644 --- a/patches/server/0662-Add-config-for-mobs-immune-to-default-effects.patch +++ b/patches/unapplied/server/0662-Add-config-for-mobs-immune-to-default-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 914fa03592e006c86c35c4ef1f3879130ad6ee00..cba73b4bf817a164726863aecada7c05c5975591 100644 +index 7f0107757c03126b54104f8446577ef417de52fe..530b94a864536f4bfd3c5250a2ffe40069b5bac2 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1153,7 +1153,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0663-Fix-incorrect-message-for-outdated-client.patch b/patches/unapplied/server/0663-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0663-Fix-incorrect-message-for-outdated-client.patch rename to patches/unapplied/server/0663-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0664-Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/0664-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0664-Don-t-apply-cramming-damage-to-players.patch rename to patches/unapplied/server/0664-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0665-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/0665-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0665-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/unapplied/server/0665-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0666-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/unapplied/server/0666-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0666-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/unapplied/server/0666-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0667-Stinger-API.patch b/patches/unapplied/server/0667-Stinger-API.patch similarity index 100% rename from patches/server/0667-Stinger-API.patch rename to patches/unapplied/server/0667-Stinger-API.patch diff --git a/patches/server/0668-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/unapplied/server/0668-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0668-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/unapplied/server/0668-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0669-Add-System.out-err-catcher.patch b/patches/unapplied/server/0669-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0669-Add-System.out-err-catcher.patch rename to patches/unapplied/server/0669-Add-System.out-err-catcher.patch diff --git a/patches/server/0670-Fix-test-not-bootstrapping.patch b/patches/unapplied/server/0670-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0670-Fix-test-not-bootstrapping.patch rename to patches/unapplied/server/0670-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0671-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/server/0671-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0671-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/unapplied/server/0671-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0672-Improve-boat-collision-performance.patch b/patches/unapplied/server/0672-Improve-boat-collision-performance.patch similarity index 97% rename from patches/server/0672-Improve-boat-collision-performance.patch rename to patches/unapplied/server/0672-Improve-boat-collision-performance.patch index d2d89fa7a9..4fa9e978df 100644 --- a/patches/server/0672-Improve-boat-collision-performance.patch +++ b/patches/unapplied/server/0672-Improve-boat-collision-performance.patch @@ -17,7 +17,7 @@ index 0773447354542925826369625f21e26aa30ebff4..adb1c48f42157fb127be4fd9f0a6f378 }; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index cba73b4bf817a164726863aecada7c05c5975591..327dc44770656932879ffe58d9bbacb6ca3d0713 100644 +index 530b94a864536f4bfd3c5250a2ffe40069b5bac2..8b377ca58a0e4d11701a831c5f976e61f642f8a8 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1341,7 +1341,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0673-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/0673-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0673-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/unapplied/server/0673-Prevent-AFK-kick-while-watching-end-credits.patch index 6a5b1cb883..ab586e72f9 100644 --- a/patches/server/0673-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/unapplied/server/0673-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ff31434e372693f6cf3d6a94815abd2ceb76f2d0..847011d143efb3f3af815d87dcc9c923d95a43c7 100644 +index 1a2446afabce39a488d680f66c5e5b581863b4ae..131577917ef0420f6b75a3cfa896ba4306ded3e7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -438,7 +438,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0674-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/0674-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0674-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/unapplied/server/0674-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0675-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/0675-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0675-Add-PlayerSetSpawnEvent.patch rename to patches/unapplied/server/0675-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0676-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/0676-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0676-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/unapplied/server/0676-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0677-Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/0677-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0677-Optimize-entity-tracker-passenger-checks.patch rename to patches/unapplied/server/0677-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0678-Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/0678-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0678-Config-option-for-Piglins-guarding-chests.patch rename to patches/unapplied/server/0678-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0679-Added-EntityDamageItemEvent.patch b/patches/unapplied/server/0679-Added-EntityDamageItemEvent.patch similarity index 97% rename from patches/server/0679-Added-EntityDamageItemEvent.patch rename to patches/unapplied/server/0679-Added-EntityDamageItemEvent.patch index ec43bd00c9..569af38f9d 100644 --- a/patches/server/0679-Added-EntityDamageItemEvent.patch +++ b/patches/unapplied/server/0679-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 b4ad1610d30396be344a04f5f3a565ae2b8f2265..5c987e863a6ef257caebf8321fa3048dfc7a93c5 100644 +index 0bd7b64bd1c468221d3354494527b456bc02437a..8ed905d4ef43e2314c64758d0ed075cb969a075c 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -547,7 +547,7 @@ public final class ItemStack { diff --git a/patches/server/0680-Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/0680-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0680-Optimize-indirect-passenger-iteration.patch rename to patches/unapplied/server/0680-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0681-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/unapplied/server/0681-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0681-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/unapplied/server/0681-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0682-Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/0682-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0682-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/unapplied/server/0682-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0683-Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/server/0683-Make-EntityUnleashEvent-cancellable.patch similarity index 96% rename from patches/server/0683-Make-EntityUnleashEvent-cancellable.patch rename to patches/unapplied/server/0683-Make-EntityUnleashEvent-cancellable.patch index 77152eb4db..d2f86ad28c 100644 --- a/patches/server/0683-Make-EntityUnleashEvent-cancellable.patch +++ b/patches/unapplied/server/0683-Make-EntityUnleashEvent-cancellable.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make EntityUnleashEvent cancellable diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 513bfbd0775ee0a880a031baaaf1bfe1f3788dc3..b9685fa96bb59b4b080ffd0ac53e4c5581aaeb8b 100644 +index 965dd5564d64c094ffc1347621a45d50c6c5f1e3..147ec41ae4a3b9e9ad495ab4309c9f7306122749 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1488,7 +1488,7 @@ public abstract class Mob extends LivingEntity { diff --git a/patches/server/0684-Clear-bucket-NBT-after-dispense.patch b/patches/unapplied/server/0684-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0684-Clear-bucket-NBT-after-dispense.patch rename to patches/unapplied/server/0684-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0685-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/0685-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0685-Change-EnderEye-target-without-changing-other-things.patch rename to patches/unapplied/server/0685-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0686-Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/0686-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0686-Add-BlockBreakBlockEvent.patch rename to patches/unapplied/server/0686-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0687-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/server/0687-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0687-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/unapplied/server/0687-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0688-More-CommandBlock-API.patch b/patches/unapplied/server/0688-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0688-More-CommandBlock-API.patch rename to patches/unapplied/server/0688-More-CommandBlock-API.patch diff --git a/patches/server/0689-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/0689-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0689-Add-missing-team-sidebar-display-slots.patch rename to patches/unapplied/server/0689-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0690-Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/0690-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0690-Add-back-EntityPortalExitEvent.patch rename to patches/unapplied/server/0690-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0691-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/0691-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0691-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/unapplied/server/0691-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0692-Get-entity-default-attributes.patch b/patches/unapplied/server/0692-Get-entity-default-attributes.patch similarity index 98% rename from patches/server/0692-Get-entity-default-attributes.patch rename to patches/unapplied/server/0692-Get-entity-default-attributes.patch index 9da876b3a8..5d86f86083 100644 --- a/patches/server/0692-Get-entity-default-attributes.patch +++ b/patches/unapplied/server/0692-Get-entity-default-attributes.patch @@ -81,7 +81,7 @@ index 0000000000000000000000000000000000000000..cf9d28ea97d93cec05c9fb768d59e283 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 4a2903d8cb7523abba2efd7024662d0d56871a43..6f4f95b000efb1270eda94d218e628b50921a272 100644 +index 6b2df5d9aa2c7a7be0d18816cfddf381b71bbe36..7b4a0df8bf6b10699a9ef7ea5b1165ef79655a0e 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -567,6 +567,18 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0693-Left-handed-API.patch b/patches/unapplied/server/0693-Left-handed-API.patch similarity index 100% rename from patches/server/0693-Left-handed-API.patch rename to patches/unapplied/server/0693-Left-handed-API.patch diff --git a/patches/server/0694-Add-more-advancement-API.patch b/patches/unapplied/server/0694-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0694-Add-more-advancement-API.patch rename to patches/unapplied/server/0694-Add-more-advancement-API.patch diff --git a/patches/server/0695-Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/server/0695-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0695-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/unapplied/server/0695-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0696-Add-critical-damage-API.patch b/patches/unapplied/server/0696-Add-critical-damage-API.patch similarity index 98% rename from patches/server/0696-Add-critical-damage-API.patch rename to patches/unapplied/server/0696-Add-critical-damage-API.patch index dcd4bfe384..cd683c4c04 100644 --- a/patches/server/0696-Add-critical-damage-API.patch +++ b/patches/unapplied/server/0696-Add-critical-damage-API.patch @@ -29,7 +29,7 @@ index 752f9f11227a47b7bed675b93e95af89c6732f63..67bce77093dcc126098731047447da20 public static DamageSource sting(LivingEntity attacker) { return new EntityDamageSource("sting", attacker); diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 92a5aadef076cb905962dab86f32d4ff253fef93..5451b1d61ae2ee4fa461c2a334bfe8f794868030 100644 +index e44351546f25421c959e091d0831197621553b41..860636642707e09f76d01ee566b5ceab6512159f 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1274,7 +1274,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0697-Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/0697-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0697-Fix-issues-with-mob-conversion.patch rename to patches/unapplied/server/0697-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0698-Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/server/0698-Add-isCollidable-methods-to-various-places.patch similarity index 96% rename from patches/server/0698-Add-isCollidable-methods-to-various-places.patch rename to patches/unapplied/server/0698-Add-isCollidable-methods-to-various-places.patch index 0d6b6950ca..98a23cf0fd 100644 --- a/patches/server/0698-Add-isCollidable-methods-to-various-places.patch +++ b/patches/unapplied/server/0698-Add-isCollidable-methods-to-various-places.patch @@ -39,7 +39,7 @@ index 7b9e943b391c061782fccd2b8d705ceec8db50fe..966ac60daebb7bb211ab8096fc0c5f33 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 6f4f95b000efb1270eda94d218e628b50921a272..7b6231f7696fa949c657e05a1d35d0d7e482284e 100644 +index 7b4a0df8bf6b10699a9ef7ea5b1165ef79655a0e..8d1212436f3a70986dae9868e80fa5b7fe893541 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -579,6 +579,12 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0699-Goat-ram-API.patch b/patches/unapplied/server/0699-Goat-ram-API.patch similarity index 100% rename from patches/server/0699-Goat-ram-API.patch rename to patches/unapplied/server/0699-Goat-ram-API.patch diff --git a/patches/server/0700-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/0700-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0700-Add-API-for-resetting-a-single-score.patch rename to patches/unapplied/server/0700-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0701-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/0701-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0701-Add-Raw-Byte-Entity-Serialization.patch rename to patches/unapplied/server/0701-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0702-Vanilla-command-permission-fixes.patch b/patches/unapplied/server/0702-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0702-Vanilla-command-permission-fixes.patch rename to patches/unapplied/server/0702-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0703-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/0703-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0703-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/unapplied/server/0703-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0704-Fix-GameProfileCache-concurrency.patch b/patches/unapplied/server/0704-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0704-Fix-GameProfileCache-concurrency.patch rename to patches/unapplied/server/0704-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0705-Log-when-the-async-catcher-is-tripped.patch b/patches/unapplied/server/0705-Log-when-the-async-catcher-is-tripped.patch similarity index 100% rename from patches/server/0705-Log-when-the-async-catcher-is-tripped.patch rename to patches/unapplied/server/0705-Log-when-the-async-catcher-is-tripped.patch diff --git a/patches/server/0706-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/0706-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 99% rename from patches/server/0706-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/unapplied/server/0706-Add-paper-mobcaps-and-paper-playermobcaps.patch index 081ae6f3dc..18e367f038 100644 --- a/patches/server/0706-Add-paper-mobcaps-and-paper-playermobcaps.patch +++ b/patches/unapplied/server/0706-Add-paper-mobcaps-and-paper-playermobcaps.patch @@ -265,7 +265,7 @@ index 0000000000000000000000000000000000000000..2e02d94e2903c48f6d08e743c1cf8bad + } +} diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 25256c422a3274ed75c9a9cd20fbbb709c8b298e..edd32b6d5a96a6fffe641a23c27921e6dcf37a54 100644 +index b031dece541d2765f9488a5ffcb0d339c38ccc9e..21941af701eab308f87ca64b2801c55444814acb 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -191,6 +191,16 @@ public final class NaturalSpawner { diff --git a/patches/server/0707-Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/0707-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0707-Sanitize-ResourceLocation-error-logging.patch rename to patches/unapplied/server/0707-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0708-Allow-controlled-flushing-for-network-manager.patch b/patches/unapplied/server/0708-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0708-Allow-controlled-flushing-for-network-manager.patch rename to patches/unapplied/server/0708-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0709-Optimise-general-POI-access.patch b/patches/unapplied/server/0709-Optimise-general-POI-access.patch similarity index 99% rename from patches/server/0709-Optimise-general-POI-access.patch rename to patches/unapplied/server/0709-Optimise-general-POI-access.patch index e80bb92689..5587bc9aea 100644 --- a/patches/server/0709-Optimise-general-POI-access.patch +++ b/patches/unapplied/server/0709-Optimise-general-POI-access.patch @@ -974,7 +974,7 @@ index e921e3cce8c746e28d73e1a7e67a7efe656ec09f..8241320f5f01d0b093024ca27f6d8bdb private boolean isValid; public final Optional noAllocateOptional = Optional.of(this); // Paper - rewrite chunk system diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java -index 27f766fc72d779cff1b5a88a79961aa7ef91b11f..2d208f1b85193497027c4d04ab9e8cb16fed9b47 100644 +index c396076bfb1d41cc0f8248d6f3aa4fc3f7d1c998..d783072bc964e45c308197e6f79874eb4a09f871 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java @@ -71,11 +71,11 @@ public class SectionStorage extends RegionFileStorage implements AutoCloseabl diff --git a/patches/server/0710-Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/0710-Optimise-chunk-tick-iteration.patch similarity index 98% rename from patches/server/0710-Optimise-chunk-tick-iteration.patch rename to patches/unapplied/server/0710-Optimise-chunk-tick-iteration.patch index bbcb493d0c..d571907ab6 100644 --- a/patches/server/0710-Optimise-chunk-tick-iteration.patch +++ b/patches/unapplied/server/0710-Optimise-chunk-tick-iteration.patch @@ -72,7 +72,7 @@ index a61f55ed1fbe5aac5289014cb95cb6950b4c77fa..e11ec87e8007979a1c6932b414bcd70c int i = 0; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index a488c33ce546cd29b30fcff9748869c20fc835aa..d91dbffab2c541bd3ca5542026f1a000f9b114d3 100644 +index f337b380c443016fc593dc768e32b751b7c7aa96..f2a8a1a47080cd3c62ece108d34f05cf48973472 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -110,6 +110,8 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator; @@ -93,7 +93,7 @@ index a488c33ce546cd29b30fcff9748869c20fc835aa..d91dbffab2c541bd3ca5542026f1a000 // Paper - rewrite chunk system diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index a05e8d136dfeb41fb6008cba4d3b4abcddbd9557..4e73960a77165a959e989249fd25a7c5376e50bb 100644 +index 998c333c0b7064e9077c2b30d6b36623ffc419c7..ef9ae57072e1b558c1a4a81b71196832ce974505 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -47,6 +47,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemp diff --git a/patches/server/0711-Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/0711-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0711-Execute-chunk-tasks-mid-tick.patch rename to patches/unapplied/server/0711-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0712-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/0712-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0712-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/unapplied/server/0712-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0713-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/unapplied/server/0713-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0713-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/unapplied/server/0713-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0714-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/0714-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0714-Detail-more-information-in-watchdog-dumps.patch rename to patches/unapplied/server/0714-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0715-Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/0715-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0715-Manually-inline-methods-in-BlockPosition.patch rename to patches/unapplied/server/0715-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0716-Distance-manager-tick-timings.patch b/patches/unapplied/server/0716-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0716-Distance-manager-tick-timings.patch rename to patches/unapplied/server/0716-Distance-manager-tick-timings.patch diff --git a/patches/server/0717-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/0717-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0717-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/unapplied/server/0717-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0718-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/0718-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0718-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/unapplied/server/0718-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0719-Add-packet-limiter-config.patch b/patches/unapplied/server/0719-Add-packet-limiter-config.patch similarity index 98% rename from patches/server/0719-Add-packet-limiter-config.patch rename to patches/unapplied/server/0719-Add-packet-limiter-config.patch index ae0b03d36f..b300d4feee 100644 --- a/patches/server/0719-Add-packet-limiter-config.patch +++ b/patches/unapplied/server/0719-Add-packet-limiter-config.patch @@ -24,7 +24,7 @@ and an action can be defined: DROP or KICK If interval or rate are less-than 0, the limit is ignored diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index 489ab7c7a66969501e60fbd44c16ba4cdc180d46..28e91d015cf0034cd7ca952440fd4f915c34d489 100644 +index 31dee6fbf50db4b1fe779a8ad67ac771ac7148b7..c3abb615ab3be179a53fc6de8085df7b6a854a0b 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -154,6 +154,22 @@ public class Connection extends SimpleChannelInboundHandler> { diff --git a/patches/server/0720-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/unapplied/server/0720-Use-correct-LevelStem-registry-when-loading-default-.patch similarity index 100% rename from patches/server/0720-Use-correct-LevelStem-registry-when-loading-default-.patch rename to patches/unapplied/server/0720-Use-correct-LevelStem-registry-when-loading-default-.patch diff --git a/patches/server/0721-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/0721-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 93% rename from patches/server/0721-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/unapplied/server/0721-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch index 112bd2a090..82eb44e066 100644 --- a/patches/server/0721-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch +++ b/patches/unapplied/server/0721-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch @@ -8,7 +8,7 @@ Lighting is purged on update anyways, so let's not add more into the conversion process diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java -index 84ad2f6dfe33d747453365656c1a0114ea6d2a54..6e9af1401918995e3c268eea7d4a74af94707242 100644 +index 6289858d54a6affd504533b1a280718a01446ebb..5a425be023d77f0370d102dfb52427147849ac1a 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java @@ -51,6 +51,7 @@ public class ChunkStorage implements AutoCloseable { diff --git a/patches/server/0722-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/unapplied/server/0722-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 96% rename from patches/server/0722-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/unapplied/server/0722-Consolidate-flush-calls-for-entity-tracker-packets.patch index 8565ca71fe..72fc653534 100644 --- a/patches/server/0722-Consolidate-flush-calls-for-entity-tracker-packets.patch +++ b/patches/unapplied/server/0722-Consolidate-flush-calls-for-entity-tracker-packets.patch @@ -22,7 +22,7 @@ With this change I could get all 200 on at 0ms ping. So in general this patch should reduce Netty I/O thread load. diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 44ea29c42d660cc92481a78990b5cdb7a23ef2a9..be97d38f45046a7f6d2337d879651f04cf9ff825 100644 +index 2aba72cd7a87b8b999cfbc7a2e7a58ea95717c19..4ff563d903633f181e1268daa77f250cfec204a0 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -804,7 +804,24 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0723-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/unapplied/server/0723-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0723-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/unapplied/server/0723-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0724-Time-scoreboard-search.patch b/patches/unapplied/server/0724-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0724-Time-scoreboard-search.patch rename to patches/unapplied/server/0724-Time-scoreboard-search.patch diff --git a/patches/server/0725-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/0725-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0725-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/unapplied/server/0725-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0726-Do-not-run-raytrace-logic-for-AIR.patch b/patches/unapplied/server/0726-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0726-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/unapplied/server/0726-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0727-Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/0727-Oprimise-map-impl-for-tracked-players.patch similarity index 92% rename from patches/server/0727-Oprimise-map-impl-for-tracked-players.patch rename to patches/unapplied/server/0727-Oprimise-map-impl-for-tracked-players.patch index 26977cfb0b..3276261701 100644 --- a/patches/server/0727-Oprimise-map-impl-for-tracked-players.patch +++ b/patches/unapplied/server/0727-Oprimise-map-impl-for-tracked-players.patch @@ -7,7 +7,7 @@ Reference2BooleanOpenHashMap is going to have better lookups than HashMap. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index d91dbffab2c541bd3ca5542026f1a000f9b114d3..b93d98b8ce576508b051a904e83cb4d19b87017b 100644 +index f2a8a1a47080cd3c62ece108d34f05cf48973472..315fec3941d71ee29c8f2fdc864c227bde54a0ca 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1360,7 +1360,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0728-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/0728-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0728-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/unapplied/server/0728-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0729-Optimise-random-block-ticking.patch b/patches/unapplied/server/0729-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0729-Optimise-random-block-ticking.patch rename to patches/unapplied/server/0729-Optimise-random-block-ticking.patch diff --git a/patches/server/0730-Optimise-non-flush-packet-sending.patch b/patches/unapplied/server/0730-Optimise-non-flush-packet-sending.patch similarity index 96% rename from patches/server/0730-Optimise-non-flush-packet-sending.patch rename to patches/unapplied/server/0730-Optimise-non-flush-packet-sending.patch index 96cf3ab27b..ad457141ff 100644 --- a/patches/server/0730-Optimise-non-flush-packet-sending.patch +++ b/patches/unapplied/server/0730-Optimise-non-flush-packet-sending.patch @@ -20,7 +20,7 @@ up on this optimisation before he came along. Locally this patch drops the entity tracker tick by a full 1.5x. diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index 28e91d015cf0034cd7ca952440fd4f915c34d489..08b74302e99e596a99f142856ae33ee29a9b1b77 100644 +index c3abb615ab3be179a53fc6de8085df7b6a854a0b..2bc49ccf7eb2f1f3f956da365340e958dbb076a7 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -46,6 +46,8 @@ import org.slf4j.Logger; diff --git a/patches/server/0731-Optimise-nearby-player-lookups.patch b/patches/unapplied/server/0731-Optimise-nearby-player-lookups.patch similarity index 100% rename from patches/server/0731-Optimise-nearby-player-lookups.patch rename to patches/unapplied/server/0731-Optimise-nearby-player-lookups.patch diff --git a/patches/server/0732-Remove-streams-for-villager-AI.patch b/patches/unapplied/server/0732-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0732-Remove-streams-for-villager-AI.patch rename to patches/unapplied/server/0732-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0733-Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/0733-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0733-Use-Velocity-compression-and-cipher-natives.patch rename to patches/unapplied/server/0733-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0734-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/unapplied/server/0734-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0734-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/unapplied/server/0734-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0735-Async-catch-modifications-to-critical-entity-state.patch b/patches/unapplied/server/0735-Async-catch-modifications-to-critical-entity-state.patch similarity index 98% rename from patches/server/0735-Async-catch-modifications-to-critical-entity-state.patch rename to patches/unapplied/server/0735-Async-catch-modifications-to-critical-entity-state.patch index 94d6bcf59c..38f61896e0 100644 --- a/patches/server/0735-Async-catch-modifications-to-critical-entity-state.patch +++ b/patches/unapplied/server/0735-Async-catch-modifications-to-critical-entity-state.patch @@ -8,7 +8,7 @@ Now in 1.17, this state is _even more_ critical than it was before, so these must exist to catch stupid plugins. diff --git a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java -index 21e1d86bd287c5e90db43c9c0247d6b7ee1425ae..8d2143dc2a4a20c585e84cfd3c218d8b5a95e165 100644 +index 038abf2ac104ceecaab11b10d466ea69ec86623e..a77985b2dd7137d8eea03909403fc08e89376d73 100644 --- a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java +++ b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java @@ -77,6 +77,7 @@ public class PersistentEntitySectionManager implements A diff --git a/patches/server/0736-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/unapplied/server/0736-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0736-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/unapplied/server/0736-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0737-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/0737-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0737-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/unapplied/server/0737-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0738-Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/0738-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0738-Check-requirement-before-suggesting-root-nodes.patch rename to patches/unapplied/server/0738-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0739-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/0739-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 92% rename from patches/server/0739-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/unapplied/server/0739-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index fbc13dfc7d..900fc0f6cf 100644 --- a/patches/server/0739-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/patches/unapplied/server/0739-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 847011d143efb3f3af815d87dcc9c923d95a43c7..f9e2392e705a0168b9dc359313e68cbca08b2d3a 100644 +index 131577917ef0420f6b75a3cfa896ba4306ded3e7..eab752600a2711a73516fa029b8eca17d52fde3c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -847,6 +847,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0740-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/0740-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0740-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/unapplied/server/0740-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0741-Ensure-valid-vehicle-status.patch b/patches/unapplied/server/0741-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0741-Ensure-valid-vehicle-status.patch rename to patches/unapplied/server/0741-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0742-Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/0742-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0742-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/unapplied/server/0742-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0743-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/0743-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0743-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/unapplied/server/0743-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0744-Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/0744-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0744-Don-t-log-debug-logging-being-disabled.patch rename to patches/unapplied/server/0744-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0745-fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/0745-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0745-fix-various-menus-with-empty-level-accesses.patch rename to patches/unapplied/server/0745-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0746-Preserve-overstacked-loot.patch b/patches/unapplied/server/0746-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0746-Preserve-overstacked-loot.patch rename to patches/unapplied/server/0746-Preserve-overstacked-loot.patch diff --git a/patches/server/0747-Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/0747-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0747-Update-head-rotation-in-missing-places.patch rename to patches/unapplied/server/0747-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0748-prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/0748-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0748-prevent-unintended-light-block-manipulation.patch rename to patches/unapplied/server/0748-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0749-Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/0749-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0749-Fix-CraftCriteria-defaults-map.patch rename to patches/unapplied/server/0749-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0750-Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/0750-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0750-Fix-upstreams-block-state-factories.patch rename to patches/unapplied/server/0750-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0751-Add-config-option-for-logging-player-ip-addresses.patch b/patches/unapplied/server/0751-Add-config-option-for-logging-player-ip-addresses.patch similarity index 100% rename from patches/server/0751-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/unapplied/server/0751-Add-config-option-for-logging-player-ip-addresses.patch diff --git a/patches/server/0752-Configurable-feature-seeds.patch b/patches/unapplied/server/0752-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0752-Configurable-feature-seeds.patch rename to patches/unapplied/server/0752-Configurable-feature-seeds.patch diff --git a/patches/server/0753-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/unapplied/server/0753-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0753-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/unapplied/server/0753-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0754-Add-root-admin-user-detection.patch b/patches/unapplied/server/0754-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0754-Add-root-admin-user-detection.patch rename to patches/unapplied/server/0754-Add-root-admin-user-detection.patch diff --git a/patches/server/0755-Always-allow-item-changing-in-Fireball.patch b/patches/unapplied/server/0755-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0755-Always-allow-item-changing-in-Fireball.patch rename to patches/unapplied/server/0755-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0756-don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/0756-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0756-don-t-attempt-to-teleport-dead-entities.patch rename to patches/unapplied/server/0756-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0757-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/0757-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 94% rename from patches/server/0757-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/unapplied/server/0757-Prevent-excessive-velocity-through-repeated-crits.patch index d912af4b12..72489b8a6a 100644 --- a/patches/server/0757-Prevent-excessive-velocity-through-repeated-crits.patch +++ b/patches/unapplied/server/0757-Prevent-excessive-velocity-through-repeated-crits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 327dc44770656932879ffe58d9bbacb6ca3d0713..49718f6fbdd4ffe38afe4b5001d9de69097976f4 100644 +index 8b377ca58a0e4d11701a831c5f976e61f642f8a8..2aefacac58212d9ba76cf449455241d9c1fd36db 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2651,14 +2651,27 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0758-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/unapplied/server/0758-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0758-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/unapplied/server/0758-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0759-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/unapplied/server/0759-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 96% rename from patches/server/0759-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/unapplied/server/0759-Always-parse-protochunk-light-sources-unless-it-is-m.patch index be1ba0eb32..2b0620b8d6 100644 --- a/patches/server/0759-Always-parse-protochunk-light-sources-unless-it-is-m.patch +++ b/patches/unapplied/server/0759-Always-parse-protochunk-light-sources-unless-it-is-m.patch @@ -8,7 +8,7 @@ Chunks not marked as lit will always go through the light engine, so they should always have their block sources parsed. diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index 0254b71ab9af6d74640aa5dc0533afa386e5f57f..34e351e04ac57e47e3cea671c61cc01d17983b77 100644 +index 6e39c2c1556f41140b92064a6fa3a38427504aee..577eefd0990b0d6ae237dd685976975d3532d7fa 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java @@ -325,16 +325,33 @@ public class ChunkSerializer { diff --git a/patches/server/0760-Fix-removing-recipes-from-RecipeIterator.patch b/patches/unapplied/server/0760-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0760-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/unapplied/server/0760-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0761-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/unapplied/server/0761-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 95% rename from patches/server/0761-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/unapplied/server/0761-Prevent-sending-oversized-item-data-in-equipment-and.patch index 33e70220d1..1403f86eff 100644 --- a/patches/server/0761-Prevent-sending-oversized-item-data-in-equipment-and.patch +++ b/patches/unapplied/server/0761-Prevent-sending-oversized-item-data-in-equipment-and.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent sending oversized item data in equipment and metadata diff --git a/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java b/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java -index 0c79613597e9ed1fbeeb36e9cb60a70bbda17bb9..79593d42ef881aa96eab7ea1e50683fa48ff4896 100644 +index dc6773ac18bc36ac69e7debf15315776033702ee..adaac498f3277e645d615775d8ca8d055d6d6652 100644 --- a/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java +++ b/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java @@ -38,7 +38,7 @@ public class EntityDataSerializers { @@ -34,7 +34,7 @@ index 523a4963b644cec57c7338cdda72b5e17247f49a..715b49e5e00231e7bd4270534039d520 } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 49718f6fbdd4ffe38afe4b5001d9de69097976f4..8a393cc4165c2aec51dcb26f7447dcc796528241 100644 +index 2aefacac58212d9ba76cf449455241d9c1fd36db..1074ce38a92231bf6c08b1b8e4332dec7b1e04e9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3137,7 +3137,10 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0762-Hide-unnecessary-itemmeta-from-clients.patch b/patches/unapplied/server/0762-Hide-unnecessary-itemmeta-from-clients.patch similarity index 97% rename from patches/server/0762-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/unapplied/server/0762-Hide-unnecessary-itemmeta-from-clients.patch index 50e17c3dd9..69a4e5bc16 100644 --- a/patches/server/0762-Hide-unnecessary-itemmeta-from-clients.patch +++ b/patches/unapplied/server/0762-Hide-unnecessary-itemmeta-from-clients.patch @@ -18,7 +18,7 @@ index 715b49e5e00231e7bd4270534039d520b6549c72..036d7478c477ce1e794b8311d94f47c4 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f9e2392e705a0168b9dc359313e68cbca08b2d3a..2db7071d80a2d288d864ae32f250435d63b5ac45 100644 +index eab752600a2711a73516fa029b8eca17d52fde3c..3ba1af93aabbaa635aae60977abe1ed3f1474044 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2817,8 +2817,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -33,7 +33,7 @@ index f9e2392e705a0168b9dc359313e68cbca08b2d3a..2db7071d80a2d288d864ae32f250435d } } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8a393cc4165c2aec51dcb26f7447dcc796528241..8bf7d54cbdbc1dc2ec0482855d7f531b2dc648be 100644 +index 1074ce38a92231bf6c08b1b8e4332dec7b1e04e9..6b01f56aadda10a89796f2b017d0fca3e10dfd98 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3139,7 +3139,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0763-Fix-Spigot-growth-modifiers.patch b/patches/unapplied/server/0763-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0763-Fix-Spigot-growth-modifiers.patch rename to patches/unapplied/server/0763-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0764-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/unapplied/server/0764-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0764-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/unapplied/server/0764-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0765-Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/server/0765-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0765-Add-PlayerItemFrameChangeEvent.patch rename to patches/unapplied/server/0765-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0766-Add-player-health-update-API.patch b/patches/unapplied/server/0766-Add-player-health-update-API.patch similarity index 100% rename from patches/server/0766-Add-player-health-update-API.patch rename to patches/unapplied/server/0766-Add-player-health-update-API.patch diff --git a/patches/server/0767-Optimize-HashMapPalette.patch b/patches/unapplied/server/0767-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0767-Optimize-HashMapPalette.patch rename to patches/unapplied/server/0767-Optimize-HashMapPalette.patch diff --git a/patches/server/0768-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/0768-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0768-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/unapplied/server/0768-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0769-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/unapplied/server/0769-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 99% rename from patches/server/0769-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/unapplied/server/0769-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch index 4053b40c49..7a1080497f 100644 --- a/patches/server/0769-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch +++ b/patches/unapplied/server/0769-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch @@ -1471,7 +1471,7 @@ index 56d94c94fb0d4dc468bb5d69be655ddd5c6b5360..d7d396ad73866a97cd9f63b34ad8c587 List getEntityCollisions(@Nullable Entity entity, AABB box); diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java -index c0817ef8927f00e2fd3fbf3289f8041fcb494049..3f458ddd4dc04ed28510a212be76bb19e7f6a61e 100644 +index e994db4f81bb94b2e5e8e142e01c05e90a09fa26..87beea39636b641dc5b46c2755a00285b7671ac5 100644 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java @@ -49,7 +49,7 @@ public interface EntityGetter { diff --git a/patches/server/0770-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/0770-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 99% rename from patches/server/0770-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/unapplied/server/0770-Optimise-collision-checking-in-player-move-packet-ha.patch index 3637b95a07..8596577e59 100644 --- a/patches/server/0770-Optimise-collision-checking-in-player-move-packet-ha.patch +++ b/patches/unapplied/server/0770-Optimise-collision-checking-in-player-move-packet-ha.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise collision checking in player move packet handling Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2db7071d80a2d288d864ae32f250435d63b5ac45..1962550a1d8ca5302025438d95e1e50eeb3e2f68 100644 +index 3ba1af93aabbaa635aae60977abe1ed3f1474044..d4a9c03c557c14069a0227363c61c36977f3eae7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -655,7 +655,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0771-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/unapplied/server/0771-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0771-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/unapplied/server/0771-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0772-Update-Log4j.patch b/patches/unapplied/server/0772-Update-Log4j.patch similarity index 100% rename from patches/server/0772-Update-Log4j.patch rename to patches/unapplied/server/0772-Update-Log4j.patch diff --git a/patches/server/0773-Add-more-Campfire-API.patch b/patches/unapplied/server/0773-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0773-Add-more-Campfire-API.patch rename to patches/unapplied/server/0773-Add-more-Campfire-API.patch diff --git a/patches/server/0774-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/unapplied/server/0774-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 97% rename from patches/server/0774-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/unapplied/server/0774-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch index b7ed484259..c5bfc50ff7 100644 --- a/patches/server/0774-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch +++ b/patches/unapplied/server/0774-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch @@ -8,7 +8,7 @@ This ensures at least a valid version of the chunk exists on disk, even if outdated diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index 8ff8855c5267379b3a5f5d8baa4a275ffee2c4bf..fc3442b4c7e1f22080fe6bf36d4fade162d6709e 100644 +index 9bae47f99336c377beb72c4b50b7f01cb4db15da..dcfe090c269d4cbcc2eb1b6f85392848bb34656c 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java @@ -1004,6 +1004,9 @@ public class RegionFile implements AutoCloseable { diff --git a/patches/server/0775-Fix-tripwire-state-inconsistency.patch b/patches/unapplied/server/0775-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0775-Fix-tripwire-state-inconsistency.patch rename to patches/unapplied/server/0775-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0776-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/unapplied/server/0776-Fix-fluid-logging-on-Block-breakNaturally.patch similarity index 100% rename from patches/server/0776-Fix-fluid-logging-on-Block-breakNaturally.patch rename to patches/unapplied/server/0776-Fix-fluid-logging-on-Block-breakNaturally.patch diff --git a/patches/server/0777-Forward-CraftEntity-in-teleport-command.patch b/patches/unapplied/server/0777-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0777-Forward-CraftEntity-in-teleport-command.patch rename to patches/unapplied/server/0777-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0778-Improve-scoreboard-entries.patch b/patches/unapplied/server/0778-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0778-Improve-scoreboard-entries.patch rename to patches/unapplied/server/0778-Improve-scoreboard-entries.patch diff --git a/patches/server/0779-Entity-powdered-snow-API.patch b/patches/unapplied/server/0779-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0779-Entity-powdered-snow-API.patch rename to patches/unapplied/server/0779-Entity-powdered-snow-API.patch diff --git a/patches/server/0780-Add-API-for-item-entity-health.patch b/patches/unapplied/server/0780-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0780-Add-API-for-item-entity-health.patch rename to patches/unapplied/server/0780-Add-API-for-item-entity-health.patch diff --git a/patches/server/0781-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/unapplied/server/0781-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0781-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/unapplied/server/0781-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0782-Configurable-max-block-light-for-monster-spawning.patch b/patches/unapplied/server/0782-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0782-Configurable-max-block-light-for-monster-spawning.patch rename to patches/unapplied/server/0782-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0783-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/unapplied/server/0783-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0783-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/unapplied/server/0783-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0784-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/unapplied/server/0784-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0784-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/unapplied/server/0784-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0785-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/server/0785-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0785-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/unapplied/server/0785-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0786-Fix-bees-aging-inside-hives.patch b/patches/unapplied/server/0786-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0786-Fix-bees-aging-inside-hives.patch rename to patches/unapplied/server/0786-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0787-Bucketable-API.patch b/patches/unapplied/server/0787-Bucketable-API.patch similarity index 100% rename from patches/server/0787-Bucketable-API.patch rename to patches/unapplied/server/0787-Bucketable-API.patch diff --git a/patches/server/0788-Validate-usernames.patch b/patches/unapplied/server/0788-Validate-usernames.patch similarity index 100% rename from patches/server/0788-Validate-usernames.patch rename to patches/unapplied/server/0788-Validate-usernames.patch diff --git a/patches/server/0789-Make-water-animal-spawn-height-configurable.patch b/patches/unapplied/server/0789-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0789-Make-water-animal-spawn-height-configurable.patch rename to patches/unapplied/server/0789-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0790-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/server/0790-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 98% rename from patches/server/0790-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/unapplied/server/0790-Expose-vanilla-BiomeProvider-from-WorldInfo.patch index 63a0b01416..69fe5912b1 100644 --- a/patches/server/0790-Expose-vanilla-BiomeProvider-from-WorldInfo.patch +++ b/patches/unapplied/server/0790-Expose-vanilla-BiomeProvider-from-WorldInfo.patch @@ -18,7 +18,7 @@ index 75651db840072806bb4ef15c4de370fdf6b46c05..2699381f72ff00bb0a9711e3b286e820 biomeProvider = gen.getDefaultBiomeProvider(worldInfo); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ed3f27e605a6d9454953a6fd8b0e784b1b89acf3..94961c271b4fc1b8b2b6c4d35e9c2ac685ac3268 100644 +index 6a264ba85ca10f34ccda5287f8c2c4d492413ae9..74440a86dd163d5d624b483a5a8b2b993d53e2fb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1212,7 +1212,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0791-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/unapplied/server/0791-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0791-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/unapplied/server/0791-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0792-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/unapplied/server/0792-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0792-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/unapplied/server/0792-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0793-Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/server/0793-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0793-Multiple-Entries-with-Scoreboards.patch rename to patches/unapplied/server/0793-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0794-Reset-placed-block-on-exception.patch b/patches/unapplied/server/0794-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0794-Reset-placed-block-on-exception.patch rename to patches/unapplied/server/0794-Reset-placed-block-on-exception.patch diff --git a/patches/server/0795-Add-configurable-height-for-slime-spawn.patch b/patches/unapplied/server/0795-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0795-Add-configurable-height-for-slime-spawn.patch rename to patches/unapplied/server/0795-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0796-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0796-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0796-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/unapplied/server/0796-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0797-Fix-xp-reward-for-baby-zombies.patch b/patches/unapplied/server/0797-Fix-xp-reward-for-baby-zombies.patch similarity index 92% rename from patches/server/0797-Fix-xp-reward-for-baby-zombies.patch rename to patches/unapplied/server/0797-Fix-xp-reward-for-baby-zombies.patch index a9cae82e96..e5cc876754 100644 --- a/patches/server/0797-Fix-xp-reward-for-baby-zombies.patch +++ b/patches/unapplied/server/0797-Fix-xp-reward-for-baby-zombies.patch @@ -9,7 +9,7 @@ so this resets it after each call to Zombie#getExperienceReward diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java -index c5b6236c58485351fb2866197b55d2c8809105c7..dc9402e343d3bc0b0d38e3a7834521a976f89c39 100644 +index bbaf3e5d29814ce49de68be63411517de3fd320f..e0e16d3b4ba0afc3cfc66b93ecf5f889599f48dd 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java @@ -173,11 +173,16 @@ public class Zombie extends Monster { diff --git a/patches/server/0798-Kick-on-main-for-illegal-chat.patch b/patches/unapplied/server/0798-Kick-on-main-for-illegal-chat.patch similarity index 97% rename from patches/server/0798-Kick-on-main-for-illegal-chat.patch rename to patches/unapplied/server/0798-Kick-on-main-for-illegal-chat.patch index 565db94e11..57f7fe897f 100644 --- a/patches/server/0798-Kick-on-main-for-illegal-chat.patch +++ b/patches/unapplied/server/0798-Kick-on-main-for-illegal-chat.patch @@ -7,7 +7,7 @@ Makes the PlayerKickEvent fire on the main thread for illegal characters or chat out-of-order errors. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1962550a1d8ca5302025438d95e1e50eeb3e2f68..f138aef5182724aaa87d526172cacb9cc248006f 100644 +index d4a9c03c557c14069a0227363c61c36977f3eae7..913ef8c087aea0dbb1e9cd7bcbfd4c2397cb301f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2175,7 +2175,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0799-Multi-Block-Change-API-Implementation.patch b/patches/unapplied/server/0799-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0799-Multi-Block-Change-API-Implementation.patch rename to patches/unapplied/server/0799-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0800-Fix-NotePlayEvent.patch b/patches/unapplied/server/0800-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0800-Fix-NotePlayEvent.patch rename to patches/unapplied/server/0800-Fix-NotePlayEvent.patch diff --git a/patches/server/0801-Freeze-Tick-Lock-API.patch b/patches/unapplied/server/0801-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0801-Freeze-Tick-Lock-API.patch rename to patches/unapplied/server/0801-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0802-Dolphin-API.patch b/patches/unapplied/server/0802-Dolphin-API.patch similarity index 100% rename from patches/server/0802-Dolphin-API.patch rename to patches/unapplied/server/0802-Dolphin-API.patch diff --git a/patches/server/0803-More-PotionEffectType-API.patch b/patches/unapplied/server/0803-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0803-More-PotionEffectType-API.patch rename to patches/unapplied/server/0803-More-PotionEffectType-API.patch diff --git a/patches/server/0804-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/unapplied/server/0804-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0804-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/unapplied/server/0804-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0805-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/server/0805-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 98% rename from patches/server/0805-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/unapplied/server/0805-API-for-creating-command-sender-which-forwards-feedb.patch index ea80c8f423..72e18036d6 100644 --- a/patches/server/0805-API-for-creating-command-sender-which-forwards-feedb.patch +++ b/patches/unapplied/server/0805-API-for-creating-command-sender-which-forwards-feedb.patch @@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 94961c271b4fc1b8b2b6c4d35e9c2ac685ac3268..cabcddbf3f3db301a0827767b1f8917d011b8ae7 100644 +index 74440a86dd163d5d624b483a5a8b2b993d53e2fb..9ff71bff0d67a46a4e1317daa918809136885a66 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1990,6 +1990,13 @@ public final class CraftServer implements Server { diff --git a/patches/server/0806-Add-missing-structure-set-seed-configs.patch b/patches/unapplied/server/0806-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0806-Add-missing-structure-set-seed-configs.patch rename to patches/unapplied/server/0806-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0807-Implement-regenerateChunk.patch b/patches/unapplied/server/0807-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0807-Implement-regenerateChunk.patch rename to patches/unapplied/server/0807-Implement-regenerateChunk.patch diff --git a/patches/server/0808-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/unapplied/server/0808-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 96% rename from patches/server/0808-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/unapplied/server/0808-Fix-cancelled-powdered-snow-bucket-placement.patch index c6754ee3e6..cbc7d7ec3b 100644 --- a/patches/server/0808-Fix-cancelled-powdered-snow-bucket-placement.patch +++ b/patches/unapplied/server/0808-Fix-cancelled-powdered-snow-bucket-placement.patch @@ -20,7 +20,7 @@ index 00d31df5ba7e147b4b969a89cfc2b5088a988169..62d6c5b7590ff4faef5d8c7a8be03155 } 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 5c987e863a6ef257caebf8321fa3048dfc7a93c5..67626e7faa4d0854d31b41c0a702edbeb6ce4270 100644 +index 8ed905d4ef43e2314c64758d0ed075cb969a075c..0611db371b013738a88e5a6c61623a77ea15652e 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -337,7 +337,7 @@ public final class ItemStack { diff --git a/patches/server/0809-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/unapplied/server/0809-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 91% rename from patches/server/0809-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/unapplied/server/0809-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch index 68fab906bc..98cfb96a13 100644 --- a/patches/server/0809-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch +++ b/patches/unapplied/server/0809-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit Copies appropriate checks from CraftWorld#getSpawnLimit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index cabcddbf3f3db301a0827767b1f8917d011b8ae7..08b171f08313da411a6ab036851b4435963477f4 100644 +index 9ff71bff0d67a46a4e1317daa918809136885a66..1c2c848edcd95f1d187d9036852b08887fdbf311 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2164,6 +2164,8 @@ public final class CraftServer implements Server { diff --git a/patches/server/0810-Add-GameEvent-tags.patch b/patches/unapplied/server/0810-Add-GameEvent-tags.patch similarity index 97% rename from patches/server/0810-Add-GameEvent-tags.patch rename to patches/unapplied/server/0810-Add-GameEvent-tags.patch index ee6eeb562d..f7ebc617b1 100644 --- a/patches/server/0810-Add-GameEvent-tags.patch +++ b/patches/unapplied/server/0810-Add-GameEvent-tags.patch @@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..cb78a3d4e21376ea24347187478525d5 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 08b171f08313da411a6ab036851b4435963477f4..07fab4c97e0a873b2a81ad9fd3a3f97cbb6a92f3 100644 +index 1c2c848edcd95f1d187d9036852b08887fdbf311..049ce463c8da4f0730edf5a03439685eb547433e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2575,6 +2575,15 @@ public final class CraftServer implements Server { diff --git a/patches/server/0811-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/unapplied/server/0811-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0811-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/unapplied/server/0811-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0812-Furnace-RecipesUsed-API.patch b/patches/unapplied/server/0812-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0812-Furnace-RecipesUsed-API.patch rename to patches/unapplied/server/0812-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0813-Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/server/0813-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0813-Configurable-sculk-sensor-listener-range.patch rename to patches/unapplied/server/0813-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0814-Add-missing-block-data-mins-and-maxes.patch b/patches/unapplied/server/0814-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0814-Add-missing-block-data-mins-and-maxes.patch rename to patches/unapplied/server/0814-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0815-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/unapplied/server/0815-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0815-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/unapplied/server/0815-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0816-Put-world-into-worldlist-before-initing-the-world.patch b/patches/unapplied/server/0816-Put-world-into-worldlist-before-initing-the-world.patch similarity index 95% rename from patches/server/0816-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/unapplied/server/0816-Put-world-into-worldlist-before-initing-the-world.patch index cb8234093b..c134a0186b 100644 --- a/patches/server/0816-Put-world-into-worldlist-before-initing-the-world.patch +++ b/patches/unapplied/server/0816-Put-world-into-worldlist-before-initing-the-world.patch @@ -23,7 +23,7 @@ index 8ac653bbf61015a38343d54f1009c1d935833546..b3e272bf7329a17094850e2fac9ee0c6 if (worlddata.getCustomBossEvents() != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 07fab4c97e0a873b2a81ad9fd3a3f97cbb6a92f3..d577623aef69a0b93946301a6500e9009b9b4ab6 100644 +index 049ce463c8da4f0730edf5a03439685eb547433e..793eae3ab4d144b90ad01099a2c0e90afc53a641 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1241,10 +1241,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0817-Fix-Entity-Position-Desync.patch b/patches/unapplied/server/0817-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0817-Fix-Entity-Position-Desync.patch rename to patches/unapplied/server/0817-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0818-Custom-Potion-Mixes.patch b/patches/unapplied/server/0818-Custom-Potion-Mixes.patch similarity index 99% rename from patches/server/0818-Custom-Potion-Mixes.patch rename to patches/unapplied/server/0818-Custom-Potion-Mixes.patch index ecd6b788a4..8dc7e8dad6 100644 --- a/patches/server/0818-Custom-Potion-Mixes.patch +++ b/patches/unapplied/server/0818-Custom-Potion-Mixes.patch @@ -164,7 +164,7 @@ index 3d688e334c7287f41460bd866bfd1155e8bb55d2..55006724ccec9f3de828ec18693728e9 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d577623aef69a0b93946301a6500e9009b9b4ab6..5522f9ef3416c666447b466c6aecc2b6e37dd5a5 100644 +index 793eae3ab4d144b90ad01099a2c0e90afc53a641..f26ef8db95292a73e99b0cbb2c25128087ff9346 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -285,6 +285,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0819-Fix-Fluid-tags-isTagged-method.patch b/patches/unapplied/server/0819-Fix-Fluid-tags-isTagged-method.patch similarity index 94% rename from patches/server/0819-Fix-Fluid-tags-isTagged-method.patch rename to patches/unapplied/server/0819-Fix-Fluid-tags-isTagged-method.patch index b683c49c88..c772a627d9 100644 --- a/patches/server/0819-Fix-Fluid-tags-isTagged-method.patch +++ b/patches/unapplied/server/0819-Fix-Fluid-tags-isTagged-method.patch @@ -18,7 +18,7 @@ index 89cb1ec575c0f58e9934d98b056621348dbbe27a..cdd474e9b0363641839a66d3e61fec46 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index d0c3b2582aba507dce69eb91d6c0803a4bb6ea06..747a6bfdf5555d82a07e55e600ae59d8172704bf 100644 +index 2f71e549c5c3f7e8ebfd10a7b0c8601fcc1d9c49..f833213ce3aceffa7771e55659987e126e28cf50 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -206,7 +206,7 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0820-Force-close-world-loading-screen.patch b/patches/unapplied/server/0820-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0820-Force-close-world-loading-screen.patch rename to patches/unapplied/server/0820-Force-close-world-loading-screen.patch diff --git a/patches/server/0821-Fix-falling-block-spawn-methods.patch b/patches/unapplied/server/0821-Fix-falling-block-spawn-methods.patch similarity index 97% rename from patches/server/0821-Fix-falling-block-spawn-methods.patch rename to patches/unapplied/server/0821-Fix-falling-block-spawn-methods.patch index bda70a2684..27b804ce28 100644 --- a/patches/server/0821-Fix-falling-block-spawn-methods.patch +++ b/patches/unapplied/server/0821-Fix-falling-block-spawn-methods.patch @@ -11,7 +11,7 @@ Restores the API behavior from previous versions of the server public net.minecraft.world.entity.item.FallingBlockEntity (Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index d1fca0e3227b5f37c11367548be362f5a49b6a71..5628940cd3c3566c5db2beda506d4f20b6e3cbae 100644 +index 11ee6a2b264b570b61facec5625f6257259432bd..4f7fa1d7b7f90c8326011f58825b4cca0da152bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -566,7 +566,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0822-Expose-furnace-minecart-push-values.patch b/patches/unapplied/server/0822-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0822-Expose-furnace-minecart-push-values.patch rename to patches/unapplied/server/0822-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0823-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/unapplied/server/0823-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0823-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/unapplied/server/0823-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0824-More-Projectile-API.patch b/patches/unapplied/server/0824-More-Projectile-API.patch similarity index 100% rename from patches/server/0824-More-Projectile-API.patch rename to patches/unapplied/server/0824-More-Projectile-API.patch diff --git a/patches/server/0825-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/unapplied/server/0825-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0825-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/unapplied/server/0825-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0826-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/unapplied/server/0826-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 93% rename from patches/server/0826-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/unapplied/server/0826-Don-t-allow-vehicle-movement-from-players-while-tele.patch index e445bd19dc..0d7894a11f 100644 --- a/patches/server/0826-Don-t-allow-vehicle-movement-from-players-while-tele.patch +++ b/patches/unapplied/server/0826-Don-t-allow-vehicle-movement-from-players-while-tele.patch @@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the regular player move packet. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f138aef5182724aaa87d526172cacb9cc248006f..c29e3d867a4a4ed30a075c07cfafc58d21b6e709 100644 +index 913ef8c087aea0dbb1e9cd7bcbfd4c2397cb301f..cf5ef052a262a910ed5348ba83ccf9274450a030 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -585,6 +585,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0827-Implement-getComputedBiome-API.patch b/patches/unapplied/server/0827-Implement-getComputedBiome-API.patch similarity index 97% rename from patches/server/0827-Implement-getComputedBiome-API.patch rename to patches/unapplied/server/0827-Implement-getComputedBiome-API.patch index b6a274bb77..3653f116c2 100644 --- a/patches/server/0827-Implement-getComputedBiome-API.patch +++ b/patches/unapplied/server/0827-Implement-getComputedBiome-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement getComputedBiome API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index 5628940cd3c3566c5db2beda506d4f20b6e3cbae..6445c2e4c97860e1c98f5263188d309cf55936f0 100644 +index 4f7fa1d7b7f90c8326011f58825b4cca0da152bc..d5cc47eb1fd1ea9a0638827483b03165f6a7e10c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -211,6 +211,13 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0828-Make-some-itemstacks-nonnull.patch b/patches/unapplied/server/0828-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0828-Make-some-itemstacks-nonnull.patch rename to patches/unapplied/server/0828-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0829-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/unapplied/server/0829-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch similarity index 100% rename from patches/server/0829-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch rename to patches/unapplied/server/0829-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch diff --git a/patches/server/0830-Implement-enchantWithLevels-API.patch b/patches/unapplied/server/0830-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0830-Implement-enchantWithLevels-API.patch rename to patches/unapplied/server/0830-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0831-Fix-saving-in-unloadWorld.patch b/patches/unapplied/server/0831-Fix-saving-in-unloadWorld.patch similarity index 90% rename from patches/server/0831-Fix-saving-in-unloadWorld.patch rename to patches/unapplied/server/0831-Fix-saving-in-unloadWorld.patch index 295a67bcb6..57b7aaeaf9 100644 --- a/patches/server/0831-Fix-saving-in-unloadWorld.patch +++ b/patches/unapplied/server/0831-Fix-saving-in-unloadWorld.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5522f9ef3416c666447b466c6aecc2b6e37dd5a5..962d3fb3479047f798f6392d7f4e1983ee6d001e 100644 +index f26ef8db95292a73e99b0cbb2c25128087ff9346..acb82138d7b375dc7ef1e02e63a60c8d420995eb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1289,7 +1289,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0832-Buffer-OOB-setBlock-calls.patch b/patches/unapplied/server/0832-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0832-Buffer-OOB-setBlock-calls.patch rename to patches/unapplied/server/0832-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0833-Add-TameableDeathMessageEvent.patch b/patches/unapplied/server/0833-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0833-Add-TameableDeathMessageEvent.patch rename to patches/unapplied/server/0833-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0834-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/unapplied/server/0834-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0834-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/unapplied/server/0834-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0835-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/unapplied/server/0835-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0835-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/unapplied/server/0835-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0836-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/unapplied/server/0836-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0836-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/unapplied/server/0836-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0837-Guard-against-invalid-entity-positions.patch b/patches/unapplied/server/0837-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0837-Guard-against-invalid-entity-positions.patch rename to patches/unapplied/server/0837-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0838-cache-resource-keys.patch b/patches/unapplied/server/0838-cache-resource-keys.patch similarity index 100% rename from patches/server/0838-cache-resource-keys.patch rename to patches/unapplied/server/0838-cache-resource-keys.patch diff --git a/patches/server/0839-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/unapplied/server/0839-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0839-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/unapplied/server/0839-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0840-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/unapplied/server/0840-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0840-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/unapplied/server/0840-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0841-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/unapplied/server/0841-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0841-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/unapplied/server/0841-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0842-Prevent-tile-entity-copies-loading-chunks.patch b/patches/unapplied/server/0842-Prevent-tile-entity-copies-loading-chunks.patch similarity index 93% rename from patches/server/0842-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/unapplied/server/0842-Prevent-tile-entity-copies-loading-chunks.patch index afc63fb49b..efde8a8da3 100644 --- a/patches/server/0842-Prevent-tile-entity-copies-loading-chunks.patch +++ b/patches/unapplied/server/0842-Prevent-tile-entity-copies-loading-chunks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c29e3d867a4a4ed30a075c07cfafc58d21b6e709..e2860b34354d374bc02f874eae5436d3d0c9a84e 100644 +index cf5ef052a262a910ed5348ba83ccf9274450a030..e783dbe494b85928d67a0490a664e4b7dbef832c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3412,7 +3412,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0843-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/unapplied/server/0843-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0843-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/unapplied/server/0843-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0844-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/unapplied/server/0844-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0844-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/unapplied/server/0844-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0845-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/unapplied/server/0845-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 98% rename from patches/server/0845-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/unapplied/server/0845-Pass-ServerLevel-for-gamerule-callbacks.patch index 63a579eb9e..c48bca0b63 100644 --- a/patches/server/0845-Pass-ServerLevel-for-gamerule-callbacks.patch +++ b/patches/unapplied/server/0845-Pass-ServerLevel-for-gamerule-callbacks.patch @@ -18,7 +18,7 @@ index c399aaeee89e12a7da4e054acd877fe033676dfd..ff3eced0e20c39b825586897ee2fed01 if (dedicatedserverproperties.enableQuery) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e2860b34354d374bc02f874eae5436d3d0c9a84e..86e0853ac450bdd9a5478a6edb8ebc490133066c 100644 +index e783dbe494b85928d67a0490a664e4b7dbef832c..7ef7a9203f6376cd13e6a9803dd01522d217f700 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3008,7 +3008,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -31,7 +31,7 @@ index e2860b34354d374bc02f874eae5436d3d0c9a84e..86e0853ac450bdd9a5478a6edb8ebc49 } break; diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java -index 3c93bfeb94168f832904a8462ae23b06e81e080d..468c635d31cfa8051666bbefce8df4b448e9ed93 100644 +index 392ab42d3c4fa6ef1815279a02b1fce236f725fa..2c500cfdd594e24b039d698bced1f9f9537722e3 100644 --- a/src/main/java/net/minecraft/world/level/GameRules.java +++ b/src/main/java/net/minecraft/world/level/GameRules.java @@ -51,7 +51,7 @@ public class GameRules { diff --git a/patches/server/0846-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/unapplied/server/0846-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 93% rename from patches/server/0846-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/unapplied/server/0846-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch index fff84c5a62..7016bfb7cb 100644 --- a/patches/server/0846-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch +++ b/patches/unapplied/server/0846-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 67626e7faa4d0854d31b41c0a702edbeb6ce4270..c18a0bc94d0210396046f4475e49a739088593f3 100644 +index 0611db371b013738a88e5a6c61623a77ea15652e..6eda115b5cd3312123784e758b59973e0a55773c 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -563,10 +563,11 @@ public final class ItemStack { diff --git a/patches/server/0847-WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/server/0847-WorldCreator-keepSpawnLoaded.patch similarity index 91% rename from patches/server/0847-WorldCreator-keepSpawnLoaded.patch rename to patches/unapplied/server/0847-WorldCreator-keepSpawnLoaded.patch index 7e5a1f094b..091473ac19 100644 --- a/patches/server/0847-WorldCreator-keepSpawnLoaded.patch +++ b/patches/unapplied/server/0847-WorldCreator-keepSpawnLoaded.patch @@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 962d3fb3479047f798f6392d7f4e1983ee6d001e..252139711a2bf63449e03c5593a81f2f7ed3e7c9 100644 +index acb82138d7b375dc7ef1e02e63a60c8d420995eb..0f3156c2dd1884bc5952708636ec559307bb61ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1248,6 +1248,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0848-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/unapplied/server/0848-Fix-NPE-for-BlockDataMeta-getBlockData.patch similarity index 100% rename from patches/server/0848-Fix-NPE-for-BlockDataMeta-getBlockData.patch rename to patches/unapplied/server/0848-Fix-NPE-for-BlockDataMeta-getBlockData.patch diff --git a/patches/server/0849-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/unapplied/server/0849-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0849-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/unapplied/server/0849-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0850-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/server/0850-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0850-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/unapplied/server/0850-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0851-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/unapplied/server/0851-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0851-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/unapplied/server/0851-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0852-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/unapplied/server/0852-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0852-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/unapplied/server/0852-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0853-Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/server/0853-Add-PlayerStopUsingItemEvent.patch similarity index 91% rename from patches/server/0853-Add-PlayerStopUsingItemEvent.patch rename to patches/unapplied/server/0853-Add-PlayerStopUsingItemEvent.patch index e707eaac32..7480a44cc6 100644 --- a/patches/server/0853-Add-PlayerStopUsingItemEvent.patch +++ b/patches/unapplied/server/0853-Add-PlayerStopUsingItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 38a07f42c339d57f96ec4ff502c810f8367a5c11..2dc3c151192d755e5e518ada9e79c9eb378423c7 100644 +index 655253c267925a704e55abe23f1142c15ecb8d2e..5463b2fd9fdb8c979baa49479e3dbd7eb2d6dda7 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3949,6 +3949,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0854-FallingBlock-auto-expire-setting.patch b/patches/unapplied/server/0854-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0854-FallingBlock-auto-expire-setting.patch rename to patches/unapplied/server/0854-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0855-Don-t-tick-markers.patch b/patches/unapplied/server/0855-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0855-Don-t-tick-markers.patch rename to patches/unapplied/server/0855-Don-t-tick-markers.patch diff --git a/patches/server/0856-Do-not-accept-invalid-client-settings.patch b/patches/unapplied/server/0856-Do-not-accept-invalid-client-settings.patch similarity index 93% rename from patches/server/0856-Do-not-accept-invalid-client-settings.patch rename to patches/unapplied/server/0856-Do-not-accept-invalid-client-settings.patch index 4f7fd70440..ab175a55c1 100644 --- a/patches/server/0856-Do-not-accept-invalid-client-settings.patch +++ b/patches/unapplied/server/0856-Do-not-accept-invalid-client-settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 86e0853ac450bdd9a5478a6edb8ebc490133066c..a630bc98e5cfb82c1a706214344c4d73d9fc6c1a 100644 +index 7ef7a9203f6376cd13e6a9803dd01522d217f700..7a46f1148216102dc02b9a3e74b9113cb285a89d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3591,6 +3591,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0857-Add-support-for-Proxy-Protocol.patch b/patches/unapplied/server/0857-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0857-Add-support-for-Proxy-Protocol.patch rename to patches/unapplied/server/0857-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0858-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/unapplied/server/0858-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0858-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/unapplied/server/0858-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0859-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/unapplied/server/0859-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0859-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/unapplied/server/0859-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0860-Sanitize-Sent-BlockEntity-NBT.patch b/patches/unapplied/server/0860-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0860-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/unapplied/server/0860-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0861-Prevent-entity-loading-causing-async-lookups.patch b/patches/unapplied/server/0861-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0861-Prevent-entity-loading-causing-async-lookups.patch rename to patches/unapplied/server/0861-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0862-Disable-component-selector-resolving-in-books-by-def.patch b/patches/unapplied/server/0862-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0862-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/unapplied/server/0862-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0863-Throw-exception-on-world-create-while-being-ticked.patch b/patches/unapplied/server/0863-Throw-exception-on-world-create-while-being-ticked.patch similarity index 97% rename from patches/server/0863-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/unapplied/server/0863-Throw-exception-on-world-create-while-being-ticked.patch index 01dcadbd3d..06f8f3032b 100644 --- a/patches/server/0863-Throw-exception-on-world-create-while-being-ticked.patch +++ b/patches/unapplied/server/0863-Throw-exception-on-world-create-while-being-ticked.patch @@ -45,7 +45,7 @@ index 300f6af9e01ce966ca03110c444139f1ae7e691c..5113e04bae5b1a1944b3e80889d99859 this.profiler.popPush("connection"); MinecraftTimings.connectionTimer.startTiming(); // Spigot diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 252139711a2bf63449e03c5593a81f2f7ed3e7c9..f511e3824d59a8de3ab00737ffc98147742964e5 100644 +index 0f3156c2dd1884bc5952708636ec559307bb61ba..36239f5c3074a2043442bd0d76a7d6ab68c67020 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -855,6 +855,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0864-Add-Alternate-Current-redstone-implementation.patch b/patches/unapplied/server/0864-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0864-Add-Alternate-Current-redstone-implementation.patch rename to patches/unapplied/server/0864-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0865-Dont-resent-entity-on-art-update.patch b/patches/unapplied/server/0865-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0865-Dont-resent-entity-on-art-update.patch rename to patches/unapplied/server/0865-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0866-Add-missing-spawn-eggs.patch b/patches/unapplied/server/0866-Add-missing-spawn-eggs.patch similarity index 96% rename from patches/server/0866-Add-missing-spawn-eggs.patch rename to patches/unapplied/server/0866-Add-missing-spawn-eggs.patch index ba88344787..a23528037d 100644 --- a/patches/server/0866-Add-missing-spawn-eggs.patch +++ b/patches/unapplied/server/0866-Add-missing-spawn-eggs.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add missing spawn eggs diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index ce64286ac5b836283318ac1ac0bd4afb29db9bb7..09b6475b77ebc7f43c13861aa2af26e2f6e6a8b5 100644 +index 8e5bc2bf5fed1f70a9fdcdeb4b23468aa0c7fb8e..760628349ca1ba49d660485b01492cdec7411d72 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -196,6 +196,12 @@ public final class CraftItemFactory implements ItemFactory { diff --git a/patches/server/0867-Add-WardenAngerChangeEvent.patch b/patches/unapplied/server/0867-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0867-Add-WardenAngerChangeEvent.patch rename to patches/unapplied/server/0867-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0868-Add-option-for-strict-advancement-dimension-checks.patch b/patches/unapplied/server/0868-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0868-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/unapplied/server/0868-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0869-Add-missing-important-BlockStateListPopulator-method.patch b/patches/unapplied/server/0869-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0869-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/unapplied/server/0869-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0870-Nameable-Banner-API.patch b/patches/unapplied/server/0870-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0870-Nameable-Banner-API.patch rename to patches/unapplied/server/0870-Nameable-Banner-API.patch diff --git a/patches/server/0871-Don-t-broadcast-messages-to-command-blocks.patch b/patches/unapplied/server/0871-Don-t-broadcast-messages-to-command-blocks.patch similarity index 95% rename from patches/server/0871-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/unapplied/server/0871-Don-t-broadcast-messages-to-command-blocks.patch index bbacc0aef4..e51d59b56b 100644 --- a/patches/server/0871-Don-t-broadcast-messages-to-command-blocks.patch +++ b/patches/unapplied/server/0871-Don-t-broadcast-messages-to-command-blocks.patch @@ -20,7 +20,7 @@ index 7c7e5f3c0f9cd1f16192a8fc8163da9b2d9519d5..888936385196a178ab8b730fd5e4fff4 Date date = new Date(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f511e3824d59a8de3ab00737ffc98147742964e5..1cec39362b6f9f23c8e6c8b45f5fd254c8e08efe 100644 +index 36239f5c3074a2043442bd0d76a7d6ab68c67020..410f4f539aaca338b09e503a6828fb1954936556 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1763,7 +1763,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0872-Prevent-empty-items-from-being-added-to-world.patch b/patches/unapplied/server/0872-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0872-Prevent-empty-items-from-being-added-to-world.patch rename to patches/unapplied/server/0872-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0873-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/unapplied/server/0873-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0873-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/unapplied/server/0873-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0874-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/unapplied/server/0874-Don-t-print-component-in-resource-pack-rejection-mes.patch similarity index 94% rename from patches/server/0874-Don-t-print-component-in-resource-pack-rejection-mes.patch rename to patches/unapplied/server/0874-Don-t-print-component-in-resource-pack-rejection-mes.patch index f22ef382fa..b49280e498 100644 --- a/patches/server/0874-Don-t-print-component-in-resource-pack-rejection-mes.patch +++ b/patches/unapplied/server/0874-Don-t-print-component-in-resource-pack-rejection-mes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't print component in resource pack rejection message diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a630bc98e5cfb82c1a706214344c4d73d9fc6c1a..e156be2e21e7df4fffc841dd0451dae0cf9ab57b 100644 +index 7a46f1148216102dc02b9a3e74b9113cb285a89d..2ac47839f238b547baa78fc9a2a5944e2ad17eea 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2049,7 +2049,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0875-Add-Player-getFishHook.patch b/patches/unapplied/server/0875-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0875-Add-Player-getFishHook.patch rename to patches/unapplied/server/0875-Add-Player-getFishHook.patch diff --git a/patches/server/0876-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/unapplied/server/0876-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0876-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/unapplied/server/0876-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0877-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/unapplied/server/0877-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0877-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/unapplied/server/0877-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0878-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/unapplied/server/0878-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 95% rename from patches/server/0878-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/unapplied/server/0878-Add-some-minimal-debug-information-to-chat-packet-er.patch index 3d57db549e..e57c8a6a84 100644 --- a/patches/server/0878-Add-some-minimal-debug-information-to-chat-packet-er.patch +++ b/patches/unapplied/server/0878-Add-some-minimal-debug-information-to-chat-packet-er.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors TODO: potentially add some kick leeway diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c7f80f899ebcce306439d1fb55bbd5349f7d81a9..41b25c3d9586b114616332228e115ab4fa4336ae 100644 +index 2ac47839f238b547baa78fc9a2a5944e2ad17eea..0205fc3969c5faf92b43c2cbf274c8e0bd8bf752 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2298,7 +2298,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0879-Fix-Bee-flower-NPE.patch b/patches/unapplied/server/0879-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0879-Fix-Bee-flower-NPE.patch rename to patches/unapplied/server/0879-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0880-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/unapplied/server/0880-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 92% rename from patches/server/0880-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/unapplied/server/0880-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch index 120e3881ed..71bcbceae0 100644 --- a/patches/server/0880-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch +++ b/patches/unapplied/server/0880-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0e803b7ee309190ebb3878df477feda190638208..4c9fc7d60ca5fc9fd65843947a4f2beb2d1acc97 100644 +index 0205fc3969c5faf92b43c2cbf274c8e0bd8bf752..0227a7df2b3a30d1c0d95acdd1b0a43f9170d19b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2589,7 +2589,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0881-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/unapplied/server/0881-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0881-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/unapplied/server/0881-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0882-More-Teleport-API.patch b/patches/unapplied/server/0882-More-Teleport-API.patch similarity index 100% rename from patches/server/0882-More-Teleport-API.patch rename to patches/unapplied/server/0882-More-Teleport-API.patch diff --git a/patches/server/0883-Add-EntityPortalReadyEvent.patch b/patches/unapplied/server/0883-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0883-Add-EntityPortalReadyEvent.patch rename to patches/unapplied/server/0883-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0884-Don-t-use-level-random-in-entity-constructors.patch b/patches/unapplied/server/0884-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0884-Don-t-use-level-random-in-entity-constructors.patch rename to patches/unapplied/server/0884-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0885-Send-block-entities-after-destroy-prediction.patch b/patches/unapplied/server/0885-Send-block-entities-after-destroy-prediction.patch similarity index 98% rename from patches/server/0885-Send-block-entities-after-destroy-prediction.patch rename to patches/unapplied/server/0885-Send-block-entities-after-destroy-prediction.patch index 1dc2010d6b..4f5e9bab9e 100644 --- a/patches/server/0885-Send-block-entities-after-destroy-prediction.patch +++ b/patches/unapplied/server/0885-Send-block-entities-after-destroy-prediction.patch @@ -57,7 +57,7 @@ index 9378e83a67a70dbb1fb4f05b33f1e553d008e62b..5a60f5dc202c44b06ca34e9a19d45cb7 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 525183cd9b6b3a75eff3ff2512c686cca89bfa8a..e2310de1152e56ab51bff144e6c32cd4d74798a9 100644 +index a42e2cb31d636637db9f4e7edbe06acdf47d34d2..f082e121331be8aee523751a2d3f3393e3b0d02c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1874,8 +1874,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0886-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/unapplied/server/0886-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0886-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/unapplied/server/0886-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0887-Custom-Chat-Completion-Suggestions-API.patch b/patches/unapplied/server/0887-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0887-Custom-Chat-Completion-Suggestions-API.patch rename to patches/unapplied/server/0887-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0888-Add-missing-BlockFadeEvents.patch b/patches/unapplied/server/0888-Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0888-Add-missing-BlockFadeEvents.patch rename to patches/unapplied/server/0888-Add-missing-BlockFadeEvents.patch diff --git a/patches/server/0889-Collision-API.patch b/patches/unapplied/server/0889-Collision-API.patch similarity index 100% rename from patches/server/0889-Collision-API.patch rename to patches/unapplied/server/0889-Collision-API.patch diff --git a/patches/server/0890-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/unapplied/server/0890-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0890-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/unapplied/server/0890-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0891-Fix-command-preprocess-cancelling-and-command-changi.patch b/patches/unapplied/server/0891-Fix-command-preprocess-cancelling-and-command-changi.patch similarity index 96% rename from patches/server/0891-Fix-command-preprocess-cancelling-and-command-changi.patch rename to patches/unapplied/server/0891-Fix-command-preprocess-cancelling-and-command-changi.patch index abb42e37a7..06d09e04d7 100644 --- a/patches/server/0891-Fix-command-preprocess-cancelling-and-command-changi.patch +++ b/patches/unapplied/server/0891-Fix-command-preprocess-cancelling-and-command-changi.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix command preprocess cancelling and command changing diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e2310de1152e56ab51bff144e6c32cd4d74798a9..334690049d7b74f4b001a2b1421e39a737534656 100644 +index f082e121331be8aee523751a2d3f3393e3b0d02c..ca7afdbfa936801e53e8bb0d154538bc0f042ad3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2259,13 +2259,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0892-Remove-invalid-signature-login-stacktrace.patch b/patches/unapplied/server/0892-Remove-invalid-signature-login-stacktrace.patch similarity index 100% rename from patches/server/0892-Remove-invalid-signature-login-stacktrace.patch rename to patches/unapplied/server/0892-Remove-invalid-signature-login-stacktrace.patch diff --git a/patches/server/0893-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/unapplied/server/0893-Add-async-catcher-to-PlayerConnection-internalTelepo.patch similarity index 91% rename from patches/server/0893-Add-async-catcher-to-PlayerConnection-internalTelepo.patch rename to patches/unapplied/server/0893-Add-async-catcher-to-PlayerConnection-internalTelepo.patch index 28566014f6..7b076d8d38 100644 --- a/patches/server/0893-Add-async-catcher-to-PlayerConnection-internalTelepo.patch +++ b/patches/unapplied/server/0893-Add-async-catcher-to-PlayerConnection-internalTelepo.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add async catcher to PlayerConnection internalTeleport diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 334690049d7b74f4b001a2b1421e39a737534656..602f78652d4e4df265e844fec4450e10443dd087 100644 +index ca7afdbfa936801e53e8bb0d154538bc0f042ad3..fddd60ab705f548e54fc741ad9c5b13fde8c852d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1757,6 +1757,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0894-Block-Ticking-API.patch b/patches/unapplied/server/0894-Block-Ticking-API.patch similarity index 100% rename from patches/server/0894-Block-Ticking-API.patch rename to patches/unapplied/server/0894-Block-Ticking-API.patch diff --git a/patches/server/0895-Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/0895-Add-Velocity-IP-Forwarding-Support.patch similarity index 99% rename from patches/server/0895-Add-Velocity-IP-Forwarding-Support.patch rename to patches/unapplied/server/0895-Add-Velocity-IP-Forwarding-Support.patch index 8eb45338da..0f17d8b62c 100644 --- a/patches/server/0895-Add-Velocity-IP-Forwarding-Support.patch +++ b/patches/unapplied/server/0895-Add-Velocity-IP-Forwarding-Support.patch @@ -197,7 +197,7 @@ index df1a1681cdd5f055ff4394aa6990b252a3e25ea8..4be871c79cebfa62b6d2a22674ad2cde } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1cec39362b6f9f23c8e6c8b45f5fd254c8e08efe..4212568bf8de6988c71f43d3e2152fa0fe51d0d7 100644 +index 410f4f539aaca338b09e503a6828fb1954936556..07eac5439164a7345476c55277538a152359630a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -784,7 +784,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0896-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/unapplied/server/0896-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0896-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/unapplied/server/0896-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0897-Add-NamespacedKey-biome-methods.patch b/patches/unapplied/server/0897-Add-NamespacedKey-biome-methods.patch similarity index 95% rename from patches/server/0897-Add-NamespacedKey-biome-methods.patch rename to patches/unapplied/server/0897-Add-NamespacedKey-biome-methods.patch index e6d06097d7..75c824ab88 100644 --- a/patches/server/0897-Add-NamespacedKey-biome-methods.patch +++ b/patches/unapplied/server/0897-Add-NamespacedKey-biome-methods.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add NamespacedKey biome methods Co-authored-by: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.com> diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 747a6bfdf5555d82a07e55e600ae59d8172704bf..db8b186ef6586bcb9887bc3f3a94d43417eddbac 100644 +index f833213ce3aceffa7771e55659987e126e28cf50..103ab25119bfcdd21eac7e1deeac025108e3c138 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -609,6 +609,19 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0898-Fix-plugin-loggers-on-server-shutdown.patch b/patches/unapplied/server/0898-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0898-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/unapplied/server/0898-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0899-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/unapplied/server/0899-Workaround-for-client-lag-spikes-MC-162253.patch similarity index 98% rename from patches/server/0899-Workaround-for-client-lag-spikes-MC-162253.patch rename to patches/unapplied/server/0899-Workaround-for-client-lag-spikes-MC-162253.patch index 15a6fed34f..306d014d73 100644 --- a/patches/server/0899-Workaround-for-client-lag-spikes-MC-162253.patch +++ b/patches/unapplied/server/0899-Workaround-for-client-lag-spikes-MC-162253.patch @@ -16,7 +16,7 @@ Co-authored-by: =?UTF-8?q?Dani=C3=ABl=20Goossens?= Co-authored-by: Nassim Jahnke diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index b9143dd8454eb3b1d628188ea11c73dec4fac949..d1edafb3e44a4d17586e0e9c4fca30389b529074 100644 +index 882820653800e0fe9e16441cb4edcd119aa2c44d..55d8ced734a408c990c6c4fbc81707bcb1f27daa 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1328,6 +1328,46 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0900-Stop-large-look-changes-from-crashing-the-server.patch b/patches/unapplied/server/0900-Stop-large-look-changes-from-crashing-the-server.patch similarity index 96% rename from patches/server/0900-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/unapplied/server/0900-Stop-large-look-changes-from-crashing-the-server.patch index 1566b53ccc..0e245c2f92 100644 --- a/patches/server/0900-Stop-large-look-changes-from-crashing-the-server.patch +++ b/patches/unapplied/server/0900-Stop-large-look-changes-from-crashing-the-server.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server Co-authored-by: Jaren Knodel diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 780cff9638fe717e98a97f1241cf65337b55382c..0318c9483a4d96eb39ff4df9054a9e6398186bc3 100644 +index 5463b2fd9fdb8c979baa49479e3dbd7eb2d6dda7..763b065adee8fad24c6cc6898338ab57c6380baa 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3011,37 +3011,15 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0901-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/unapplied/server/0901-Add-custom-destroyerIdentity-to-sendBlockDamage.patch similarity index 100% rename from patches/server/0901-Add-custom-destroyerIdentity-to-sendBlockDamage.patch rename to patches/unapplied/server/0901-Add-custom-destroyerIdentity-to-sendBlockDamage.patch diff --git a/patches/server/0902-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/unapplied/server/0902-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch similarity index 100% rename from patches/server/0902-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch rename to patches/unapplied/server/0902-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch diff --git a/patches/server/0903-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/unapplied/server/0903-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0903-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/unapplied/server/0903-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0904-Missing-eating-regain-reason.patch b/patches/unapplied/server/0904-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0904-Missing-eating-regain-reason.patch rename to patches/unapplied/server/0904-Missing-eating-regain-reason.patch diff --git a/patches/server/0905-Missing-effect-cause.patch b/patches/unapplied/server/0905-Missing-effect-cause.patch similarity index 100% rename from patches/server/0905-Missing-effect-cause.patch rename to patches/unapplied/server/0905-Missing-effect-cause.patch diff --git a/patches/server/0906-Added-byte-array-serialization-deserialization-for-P.patch b/patches/unapplied/server/0906-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0906-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/unapplied/server/0906-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0907-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/unapplied/server/0907-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0907-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/unapplied/server/0907-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0908-Call-BlockPhysicsEvent-more-often.patch b/patches/unapplied/server/0908-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0908-Call-BlockPhysicsEvent-more-often.patch rename to patches/unapplied/server/0908-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0909-Configurable-chat-thread-limit.patch b/patches/unapplied/server/0909-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0909-Configurable-chat-thread-limit.patch rename to patches/unapplied/server/0909-Configurable-chat-thread-limit.patch diff --git a/patches/server/0910-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/unapplied/server/0910-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0910-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/unapplied/server/0910-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0911-Set-position-before-player-sending-on-dimension-chan.patch b/patches/unapplied/server/0911-Set-position-before-player-sending-on-dimension-chan.patch similarity index 100% rename from patches/server/0911-Set-position-before-player-sending-on-dimension-chan.patch rename to patches/unapplied/server/0911-Set-position-before-player-sending-on-dimension-chan.patch diff --git a/patches/server/0912-fix-Jigsaw-block-kicking-user.patch b/patches/unapplied/server/0912-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0912-fix-Jigsaw-block-kicking-user.patch rename to patches/unapplied/server/0912-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0913-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/unapplied/server/0913-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0913-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/unapplied/server/0913-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0914-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/unapplied/server/0914-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch similarity index 100% rename from patches/server/0914-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch rename to patches/unapplied/server/0914-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch diff --git a/patches/server/0915-Fix-a-bunch-of-vanilla-bugs.patch b/patches/unapplied/server/0915-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0915-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/unapplied/server/0915-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0916-Fix-nothing-mlg.patch b/patches/unapplied/server/0916-Fix-nothing-mlg.patch similarity index 95% rename from patches/server/0916-Fix-nothing-mlg.patch rename to patches/unapplied/server/0916-Fix-nothing-mlg.patch index fbb19bc114..47f11ac6b1 100644 --- a/patches/server/0916-Fix-nothing-mlg.patch +++ b/patches/unapplied/server/0916-Fix-nothing-mlg.patch @@ -19,7 +19,7 @@ doCheckFallDamage method is meant to be called repeatedly anyway. Mojira-ID: MC-255653 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 602f78652d4e4df265e844fec4450e10443dd087..4ab50df1e4c855587ef030cf3f2a1502798cb721 100644 +index fddd60ab705f548e54fc741ad9c5b13fde8c852d..d31a345edfffe39f127073fc3aec8b3489bae79c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1564,6 +1564,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0917-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/unapplied/server/0917-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0917-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/unapplied/server/0917-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0918-Fix-custom-piglin-loved-items.patch b/patches/unapplied/server/0918-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0918-Fix-custom-piglin-loved-items.patch rename to patches/unapplied/server/0918-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0919-EntityPickupItemEvent-fixes.patch b/patches/unapplied/server/0919-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0919-EntityPickupItemEvent-fixes.patch rename to patches/unapplied/server/0919-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0920-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/unapplied/server/0920-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0920-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/unapplied/server/0920-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0921-Add-PlayerInventorySlotChangeEvent.patch b/patches/unapplied/server/0921-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0921-Add-PlayerInventorySlotChangeEvent.patch rename to patches/unapplied/server/0921-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0922-Elder-Guardian-appearance-API.patch b/patches/unapplied/server/0922-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0922-Elder-Guardian-appearance-API.patch rename to patches/unapplied/server/0922-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0923-Allow-changing-bed-s-occupied-property.patch b/patches/unapplied/server/0923-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0923-Allow-changing-bed-s-occupied-property.patch rename to patches/unapplied/server/0923-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0924-Add-entity-knockback-API.patch b/patches/unapplied/server/0924-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0924-Add-entity-knockback-API.patch rename to patches/unapplied/server/0924-Add-entity-knockback-API.patch diff --git a/patches/server/0925-Detect-headless-JREs.patch b/patches/unapplied/server/0925-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0925-Detect-headless-JREs.patch rename to patches/unapplied/server/0925-Detect-headless-JREs.patch diff --git a/patches/server/0926-fixed-entity-vehicle-collision-event-not-called.patch b/patches/unapplied/server/0926-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0926-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/unapplied/server/0926-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0927-optimized-dirt-and-snow-spreading.patch b/patches/unapplied/server/0927-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0927-optimized-dirt-and-snow-spreading.patch rename to patches/unapplied/server/0927-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0928-Added-EntityToggleSitEvent.patch b/patches/unapplied/server/0928-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0928-Added-EntityToggleSitEvent.patch rename to patches/unapplied/server/0928-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0929-Add-fire-tick-delay-option.patch b/patches/unapplied/server/0929-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0929-Add-fire-tick-delay-option.patch rename to patches/unapplied/server/0929-Add-fire-tick-delay-option.patch diff --git a/patches/server/0930-Add-Moving-Piston-API.patch b/patches/unapplied/server/0930-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0930-Add-Moving-Piston-API.patch rename to patches/unapplied/server/0930-Add-Moving-Piston-API.patch diff --git a/patches/server/0931-Ignore-impossible-spawn-tick.patch b/patches/unapplied/server/0931-Ignore-impossible-spawn-tick.patch similarity index 90% rename from patches/server/0931-Ignore-impossible-spawn-tick.patch rename to patches/unapplied/server/0931-Ignore-impossible-spawn-tick.patch index 47caf4baae..d4837fbbbb 100644 --- a/patches/server/0931-Ignore-impossible-spawn-tick.patch +++ b/patches/unapplied/server/0931-Ignore-impossible-spawn-tick.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ignore impossible spawn tick diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index 8d403b4a6db98cc5c3851d5f2c485560cf8b412f..6dea3a2a72e41e125f715dc9e364d48896056e3b 100644 +index 572982353530663825ab2d576c3277197a5715a3..641709c3a2575dbe79165beff814cb77fa7dbdc1 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -77,6 +77,7 @@ public abstract class BaseSpawner { diff --git a/patches/server/0932-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/unapplied/server/0932-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0932-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/unapplied/server/0932-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0933-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/unapplied/server/0933-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0933-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/unapplied/server/0933-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0934-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/unapplied/server/0934-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0934-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/unapplied/server/0934-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0935-Prevent-compass-from-loading-chunks.patch b/patches/unapplied/server/0935-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0935-Prevent-compass-from-loading-chunks.patch rename to patches/unapplied/server/0935-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0936-Add-PrePlayerAttackEntityEvent.patch b/patches/unapplied/server/0936-Add-PrePlayerAttackEntityEvent.patch similarity index 93% rename from patches/server/0936-Add-PrePlayerAttackEntityEvent.patch rename to patches/unapplied/server/0936-Add-PrePlayerAttackEntityEvent.patch index 91701c9d7c..e638e36961 100644 --- a/patches/server/0936-Add-PrePlayerAttackEntityEvent.patch +++ b/patches/unapplied/server/0936-Add-PrePlayerAttackEntityEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 9b131f0a827413e9f5d6d0f7491c5481576cb8b1..55bdf4f91be6750dcfd0589c566fbefde4512a1e 100644 +index 4b2495aed39450eb148627a0787848fd7c35f1f9..0ea101f155936f7c340d9e1d1077c58b72551027 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1251,8 +1251,17 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0937-ensure-reset-EnderDragon-boss-event-name.patch b/patches/unapplied/server/0937-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0937-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/unapplied/server/0937-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0938-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/unapplied/server/0938-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0938-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/unapplied/server/0938-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0939-Reorder-bukkit-damage-source-entity-for-explosion-to.patch b/patches/unapplied/server/0939-Reorder-bukkit-damage-source-entity-for-explosion-to.patch similarity index 100% rename from patches/server/0939-Reorder-bukkit-damage-source-entity-for-explosion-to.patch rename to patches/unapplied/server/0939-Reorder-bukkit-damage-source-entity-for-explosion-to.patch diff --git a/patches/server/0940-Fix-MC-121048.patch b/patches/unapplied/server/0940-Fix-MC-121048.patch similarity index 92% rename from patches/server/0940-Fix-MC-121048.patch rename to patches/unapplied/server/0940-Fix-MC-121048.patch index 44f771024d..14dc0be713 100644 --- a/patches/server/0940-Fix-MC-121048.patch +++ b/patches/unapplied/server/0940-Fix-MC-121048.patch @@ -9,7 +9,7 @@ clear the CombatTracker if the entity is dead. This fixes death messages such as the "doomed to fall" messages. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 0318c9483a4d96eb39ff4df9054a9e6398186bc3..c6cbf02c784d4b0a39c61cd65e777fe04e3c3772 100644 +index 763b065adee8fad24c6cc6898338ab57c6380baa..b4095a3e97e0d7f6fce66869bd88083c9c0cdbe5 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2194,8 +2194,10 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0941-Add-Player-Warden-Warning-API.patch b/patches/unapplied/server/0941-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0941-Add-Player-Warden-Warning-API.patch rename to patches/unapplied/server/0941-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0942-More-vanilla-friendly-methods-to-update-trades.patch b/patches/unapplied/server/0942-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0942-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/unapplied/server/0942-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0943-Add-paper-dumplisteners-command.patch b/patches/unapplied/server/0943-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0943-Add-paper-dumplisteners-command.patch rename to patches/unapplied/server/0943-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0944-check-global-player-list-where-appropriate.patch b/patches/unapplied/server/0944-check-global-player-list-where-appropriate.patch similarity index 98% rename from patches/server/0944-check-global-player-list-where-appropriate.patch rename to patches/unapplied/server/0944-check-global-player-list-where-appropriate.patch index e7d6c0b3bb..6056385e15 100644 --- a/patches/server/0944-check-global-player-list-where-appropriate.patch +++ b/patches/unapplied/server/0944-check-global-player-list-where-appropriate.patch @@ -22,7 +22,7 @@ index cc291b58292d33613a639650a6c55293603bb6e5..79aa3374fd47cd57d2e0810bb5afebbd + // Paper end } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3bfa0c6a0d82ed980b3289051892a6d1745ebb69..529d4805d841beec9aaff57b0184d8313fad01c3 100644 +index b4095a3e97e0d7f6fce66869bd88083c9c0cdbe5..fb6fd9357f665a001238384475a9b674715700ba 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3584,7 +3584,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0945-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/unapplied/server/0945-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 95% rename from patches/server/0945-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/unapplied/server/0945-Fix-async-entity-add-due-to-fungus-trees.patch index 1a320a8e57..e0d0af6a08 100644 --- a/patches/server/0945-Fix-async-entity-add-due-to-fungus-trees.patch +++ b/patches/unapplied/server/0945-Fix-async-entity-add-due-to-fungus-trees.patch @@ -17,7 +17,7 @@ index 80c1e0e47818486a68e0114b063395290365346b..0d3587e2d454fb0994ecff930b5e496a BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index 62bca85da6c5d9877e21fecb702370506ddf671c..c73468450bfe23e6f3a99d15c3e39a2a1ddf0c77 100644 +index afa802987f96e7d0c5f28d26b759e36edf34b8f4..32865ef1903a5e499b27c82fd5be90aa084744cb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -372,10 +372,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0946-ItemStack-damage-API.patch b/patches/unapplied/server/0946-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0946-ItemStack-damage-API.patch rename to patches/unapplied/server/0946-ItemStack-damage-API.patch diff --git a/patches/server/0947-Friction-API.patch b/patches/unapplied/server/0947-Friction-API.patch similarity index 100% rename from patches/server/0947-Friction-API.patch rename to patches/unapplied/server/0947-Friction-API.patch diff --git a/patches/server/0948-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/unapplied/server/0948-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0948-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/unapplied/server/0948-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0949-Fix-player-kick-on-shutdown.patch b/patches/unapplied/server/0949-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0949-Fix-player-kick-on-shutdown.patch rename to patches/unapplied/server/0949-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0950-Sync-offhand-slot-in-menus.patch b/patches/unapplied/server/0950-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0950-Sync-offhand-slot-in-menus.patch rename to patches/unapplied/server/0950-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0951-Player-Entity-Tracking-Events.patch b/patches/unapplied/server/0951-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0951-Player-Entity-Tracking-Events.patch rename to patches/unapplied/server/0951-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0952-Limit-pet-look-distance.patch b/patches/unapplied/server/0952-Limit-pet-look-distance.patch similarity index 91% rename from patches/server/0952-Limit-pet-look-distance.patch rename to patches/unapplied/server/0952-Limit-pet-look-distance.patch index 1dd686c0af..728c07d41f 100644 --- a/patches/server/0952-Limit-pet-look-distance.patch +++ b/patches/unapplied/server/0952-Limit-pet-look-distance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit pet look distance diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java -index 7dc8cc93e8da37e1096c3263c1c8fc55bbf60401..fed2291d24d6014bd30b3d3491d555694c4e99f2 100644 +index 7dc8cc93e8da37e1096c3263c1c8fc55bbf60401..11a101e8ff05fbda5e84018358be02014ca01854 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java @@ -89,7 +89,7 @@ public class FollowOwnerGoal extends Goal { diff --git a/work/BuildData b/work/BuildData index d96ad8e1e6..177811e1fa 160000 --- a/work/BuildData +++ b/work/BuildData @@ -1 +1 @@ -Subproject commit d96ad8e1e64b7c35bb632339c23621353be1f028 +Subproject commit 177811e1fa90f674897a302820f3ed84e4d65688 diff --git a/work/Bukkit b/work/Bukkit index 38866413a7..bf3239f7a3 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 38866413a790619d8d8873de5b62f807947b81f6 +Subproject commit bf3239f7a3d8ff0359bcacd13012081146ff3c3b diff --git a/work/CraftBukkit b/work/CraftBukkit index f3dab3a488..19e6be0209 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit f3dab3a488c6ef87abe9639d537c19b7a1029019 +Subproject commit 19e6be0209d7547c7cdcceae54d4b299f9cd751c diff --git a/work/Spigot b/work/Spigot index 6198b5ae88..61bffe0cce 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 6198b5ae88da3f3650123abc22e6363a7543faa9 +Subproject commit 61bffe0cce4e22325a65715f407823d860a32c5c