diff --git a/patches/api/0006-World-Instance-flag.patch b/patches/api/0006-World-Instance-flag.patch index f1ea94d5e..cfaddeed9 100644 --- a/patches/api/0006-World-Instance-flag.patch +++ b/patches/api/0006-World-Instance-flag.patch @@ -5,10 +5,10 @@ Subject: [PATCH] World Instance flag diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 340f3e569a411e7603fba8d38b79446da0ab4a93..dbb8718e7e62135dc05315be3db01d1a037c1f78 100644 +index d4c60cf8404641fa8580cb0653e6f7a10baed865..fde06c5d88ffb63910bcb06e3e70e3c0a4af92c7 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -2600,6 +2600,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient +@@ -2602,6 +2602,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient */ public void setAutoSave(boolean value); diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 1192608ff..c4b234f6c 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index dd8f449dddbe0838835ae8f8d5033aa422db403d..8ef71d6f8c531841bbc8979f634277f7f7d19889 100644 +index 0282e3b75470e1a68ea1fc228082483514ba432e..73ce9e6171020fc4abc70d61c4587b9eeae9ae2f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,8 +9,12 @@ plugins { @@ -23,7 +23,7 @@ index dd8f449dddbe0838835ae8f8d5033aa422db403d..8ef71d6f8c531841bbc8979f634277f7 // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -59,7 +63,7 @@ tasks.jar { +@@ -60,7 +64,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -32,7 +32,7 @@ index dd8f449dddbe0838835ae8f8d5033aa422db403d..8ef71d6f8c531841bbc8979f634277f7 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -147,7 +151,7 @@ fun TaskContainer.registerRunTask( +@@ -148,7 +152,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -55,7 +55,7 @@ index c8d56947305c981a3268ce4ae3e975db350ceff2..ce51ebeb5df07abc4a8bb31bc737ab3e public SystemReport fillSystemReport(SystemReport details) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 15278bb897e6169bc5d02bf47b455634baec7be1..d107cb53b2b32d755692045abfd299c732ab045d 100644 +index ab843069ac0653d03cf3f925f49555016cad84fa..e09ae5f7684113d60d2672bc4bfc8543bce2f54f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper diff --git a/patches/server/0006-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch b/patches/server/0006-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch index 960707a10..f0621cf37 100644 --- a/patches/server/0006-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch +++ b/patches/server/0006-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Don't send fire packets if player has Fire Resistance diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 49cf3601df7b145d49b1fe9a71ba0bc60c5394b3..382d32045417174f5ef3fe556762146d07e30e17 100644 +index dfd1f37757af1bd808cc2e2d8bf97123adf638bb..7fcb2ecae7ec9a457e00a6a3ea1fb7b589360e02 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -780,7 +780,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -781,7 +781,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.checkOutOfWorld(); if (!this.level.isClientSide) { diff --git a/patches/server/0012-Packet-obfuscation-and-reduction.patch b/patches/server/0012-Packet-obfuscation-and-reduction.patch index ea9e5978c..eb56c3621 100644 --- a/patches/server/0012-Packet-obfuscation-and-reduction.patch +++ b/patches/server/0012-Packet-obfuscation-and-reduction.patch @@ -155,10 +155,10 @@ index f91e1a876ad4c46a7c92cead18947a941b4d9e68..13973b8803afefd491dc05e1df6e9b10 if (this.entity instanceof LivingEntity) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5b222edfda19c1446f1fe6ad67b2248f003ff0b0..be293253c6e90c1f109b5e270c527a4e2b0cff2f 100644 +index 7fcb2ecae7ec9a457e00a6a3ea1fb7b589360e02..75afbe3722d3e3ba7fe33f959ca40679c40b95dc 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2986,7 +2986,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2987,7 +2987,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.entityData.markDirty(Entity.DATA_AIR_SUPPLY_ID); return; } @@ -181,10 +181,10 @@ index 0156525637f8aa2e4e639bc493d8617b5af4cc32..1c598a97ed78a744907ae310f3568c44 public void startAutoSpinAttack(int riptideTicks) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f12efe51b14ed3637a8ba45def9c94634a6f5e8f..b3a7ec12abe8228e6394fc085059eaa3dd488a19 100644 +index ce78e024244c14530270b8276e5b0fd853f0a110..df22a1407f3d1e93f0f1d50b5dbec3df12b106d2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2190,7 +2190,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2196,7 +2196,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { this.sendHealthUpdate(); } } diff --git a/patches/server/0014-World-Instance-flag.patch b/patches/server/0014-World-Instance-flag.patch index fed261bd5..9e7232991 100644 --- a/patches/server/0014-World-Instance-flag.patch +++ b/patches/server/0014-World-Instance-flag.patch @@ -17,10 +17,10 @@ index 98209532ad3e692d7e459640123f78bbd9a65889..9b3af8f2a433368d722cd442c07b2a2c public static Throwable getAddToWorldStackTrace(Entity entity) { return new Throwable(entity + " Added to world at " + new java.util.Date()); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 48825eaba9677a8b1e4fff80738e17d08e3307f8..64e2b9554d7a9911e1eff121d4f56d71e97aca68 100644 +index 15d740a605c7257bcc7117c7dfb3612b472ba664..9d400d82eeab062322acea81b87f6fc572151700 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1274,6 +1274,18 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1280,6 +1280,18 @@ public class CraftWorld extends CraftRegionAccessor implements World { world.noSave = !value; } diff --git a/patches/server/0023-Set-multiple-Team-settings-with-a-single-packet.patch b/patches/server/0023-Set-multiple-Team-settings-with-a-single-packet.patch index d1d9a3b63..00bd24922 100644 --- a/patches/server/0023-Set-multiple-Team-settings-with-a-single-packet.patch +++ b/patches/server/0023-Set-multiple-Team-settings-with-a-single-packet.patch @@ -106,10 +106,10 @@ index defff79eb28adc52851fa781d4d4a7745a884bdc..fb48bfbce1bca47d71a0ed35af1b1296 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java -index d3d9641862f4746469bca946ef6d89a88f15698b..986d0dd921361a0dd8ca5ae6025521d086ec2143 100644 +index 67efb0d38ae369ff5254f7b1ec85d32d4eee8291..e4110e3a60242b958c9983a090b28aae540b2bdf 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java -@@ -346,6 +346,37 @@ final class CraftTeam extends CraftScoreboardComponent implements Team { +@@ -347,6 +347,37 @@ final class CraftTeam extends CraftScoreboardComponent implements Team { } } diff --git a/patches/server/0024-Unfreeze-MappedRegistry.patch b/patches/server/0024-Unfreeze-MappedRegistry.patch new file mode 100644 index 000000000..d96830703 --- /dev/null +++ b/patches/server/0024-Unfreeze-MappedRegistry.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cryptite +Date: Wed, 7 Sep 2022 17:37:47 -0500 +Subject: [PATCH] Unfreeze MappedRegistry + + +diff --git a/src/main/java/net/minecraft/core/MappedRegistry.java b/src/main/java/net/minecraft/core/MappedRegistry.java +index c3c0e52cfe8ef5fe9049c4582778040702131b47..c37676f6c70fcf21fc6e3b7322f9d73c4c128c06 100644 +--- a/src/main/java/net/minecraft/core/MappedRegistry.java ++++ b/src/main/java/net/minecraft/core/MappedRegistry.java +@@ -306,6 +306,8 @@ public class MappedRegistry extends WritableRegistry { + + @Override + public Registry freeze() { ++ if (true) return this; // Slice (a TODO in Paper, thanks Owen) ++ + this.frozen = true; + List list = this.byKey.entrySet().stream().filter((entry) -> { + return !entry.getValue().isBound();