From 6a210ce41d9dcf3093611ea66fb9473e740d7b9d Mon Sep 17 00:00:00 2001 From: lexikiq Date: Wed, 20 Oct 2021 22:22:50 -0400 Subject: [PATCH] Update upstream --- build.gradle.kts | 11 ++++---- gradle.properties | 2 +- ...0007-Add-UnsafeValues-canPlaceItemOn.patch | 6 ++--- patches/api/0008-Expose-NMS-ordinals.patch | 4 +-- .../api/0009-Expose-MCUtil-Executors.patch | 4 +-- patches/api/0011-Add-Furnace-Recipe-API.patch | 4 +-- patches/server/0001-Build-changes.patch | 26 +++++++++---------- patches/server/0003-Add-SoundEvent.patch | 16 ++++++------ ...location-to-EntityDamageByBlockEvent.patch | 18 ++++++------- ...0006-Add-UnsafeValues-canPlaceItemOn.patch | 4 +-- .../0007-Expose-EntityType-Ordinals.patch | 4 +-- .../server/0009-Expose-MCUtil-Executors.patch | 4 +-- .../0011-Add-BlockDropResourcesEvent.patch | 4 +-- .../server/0013-Add-Furnace-Recipe-API.patch | 4 +-- ...4-Disable-sleep-status-announcements.patch | 4 +-- 15 files changed, 58 insertions(+), 57 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1eb2594..13c51f6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,8 +3,8 @@ import io.papermc.paperweight.util.constants.* plugins { java `maven-publish` - id("com.github.johnrengelman.shadow") version "7.0.0" apply false - id("io.papermc.paperweight.patcher") version "1.1.11" + id("com.github.johnrengelman.shadow") version "7.1.0" apply false + id("io.papermc.paperweight.patcher") version "1.1.12" } repositories { @@ -15,7 +15,7 @@ repositories { } dependencies { - remapper("org.quiltmc:tiny-remapper:0.4.3") + remapper("net.fabricmc:tiny-remapper:0.6.0:fat") decompiler("net.minecraftforge:forgeflower:1.5.498.12") paperclip("io.papermc:paperclip:2.0.1") } @@ -57,7 +57,7 @@ subprojects { paperweight { serverProject.set(project(":Parchment-Server")) - remapRepo.set("https://maven.quiltmc.org/repository/release/") + remapRepo.set("https://maven.fabricmc.net/") decompileRepo.set("https://files.minecraftforge.net/maven/") usePaperUpstream(providers.gradleProperty("paperRef")) { @@ -84,7 +84,8 @@ tasks.generateDevelopmentBundle { "https://maven.quiltmc.org/repository/release/", "https://repo.aikar.co/content/groups/aikar", "https://ci.emc.gs/nexus/content/groups/aikar/", - "https://papermc.io/repo/repository/maven-public/", // for paper-mojangapi + "https://papermc.io/repo/repository/maven-public/", + "https://repo.velocitypowered.com/snapshots/", "https://sonatype.projecteden.gg/repository/maven-public/" ) ) diff --git a/gradle.properties b/gradle.properties index 1438703..358a8d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = me.lexikiq version = 1.17.1-R0.1-SNAPSHOT mcVersion = 1.17.1 -paperRef = 3e3cea1a76247d518ee54d00ed9b727ea106aff3 +paperRef = bb397ba74c034ffe5ae164d774a043cb7bca0472 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0007-Add-UnsafeValues-canPlaceItemOn.patch b/patches/api/0007-Add-UnsafeValues-canPlaceItemOn.patch index 5fff70c..ac3ae8f 100644 --- a/patches/api/0007-Add-UnsafeValues-canPlaceItemOn.patch +++ b/patches/api/0007-Add-UnsafeValues-canPlaceItemOn.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add UnsafeValues#canPlaceItemOn diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 379acee1b5f2d06e6a96f3444783f4a29ca24095..c4f81d9a642005e52eb3d88daf6da6caa48a3f0d 100644 +index 0b15fe8b5da29bf691c394098f0203a49504242e..3e455fa189c6f2ebe5452affab4256fd8dbc72cb 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java -@@ -184,4 +184,17 @@ public interface UnsafeValues { +@@ -201,4 +201,17 @@ public interface UnsafeValues { */ - int getProtocolVersion(); + @org.jetbrains.annotations.NotNull org.bukkit.attribute.Attributable getDefaultEntityAttributes(@org.jetbrains.annotations.NotNull NamespacedKey entityKey); // Paper end + + // Parchment start diff --git a/patches/api/0008-Expose-NMS-ordinals.patch b/patches/api/0008-Expose-NMS-ordinals.patch index 48374d4..55a6d5f 100644 --- a/patches/api/0008-Expose-NMS-ordinals.patch +++ b/patches/api/0008-Expose-NMS-ordinals.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose NMS ordinals diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index c4f81d9a642005e52eb3d88daf6da6caa48a3f0d..b03756881694238103c136380af60ea5fa105700 100644 +index 3e455fa189c6f2ebe5452affab4256fd8dbc72cb..3d3bdf34ce0d6ef9c588feabb6f5c4112f26c2d8 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java -@@ -196,5 +196,12 @@ public interface UnsafeValues { +@@ -213,5 +213,12 @@ public interface UnsafeValues { * @return if the item can be placed */ java.util.concurrent.CompletableFuture canPlaceItemOn(@org.jetbrains.annotations.NotNull ItemStack item, @org.jetbrains.annotations.Nullable me.lexikiq.OptionalHumanEntity player, @org.jetbrains.annotations.NotNull org.bukkit.block.Block block, @org.jetbrains.annotations.NotNull org.bukkit.block.BlockFace face); diff --git a/patches/api/0009-Expose-MCUtil-Executors.patch b/patches/api/0009-Expose-MCUtil-Executors.patch index 39e172f..704cd7f 100644 --- a/patches/api/0009-Expose-MCUtil-Executors.patch +++ b/patches/api/0009-Expose-MCUtil-Executors.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose MCUtil Executors diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 83870d54a5ff1017ad7455e9c931fdee54354434..96ee097f7a7ba7116dda2aabc4f0ae974837f158 100644 +index c34cfba8f9ed7e9dbd0b6b8ffef9fba46abff046..451ea2c118b661725047f344c91814668d25cea5 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1789,4 +1789,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1837,4 +1837,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull io.papermc.paper.datapack.DatapackManager getDatapackManager(); // Paper end diff --git a/patches/api/0011-Add-Furnace-Recipe-API.patch b/patches/api/0011-Add-Furnace-Recipe-API.patch index 1ef4a7d..bcc1d6d 100644 --- a/patches/api/0011-Add-Furnace-Recipe-API.patch +++ b/patches/api/0011-Add-Furnace-Recipe-API.patch @@ -64,10 +64,10 @@ index 0000000000000000000000000000000000000000..f8f707483bf08142cdaf6c6ff9b12418 + } +} diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index dc497606ebf9903c2d32276ecddda3231457346a..021f24fdbc6e711faabaa2955b7acdde219f1990 100644 +index 4f673e9123145dc78564dc3eef0edf75795dafc2..85902538dae4a76ee79bc2d9921f2b4ec9f3c30d 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -3669,6 +3669,36 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient +@@ -3764,6 +3764,36 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient @Nullable public DragonBattle getEnderDragonBattle(); diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index c2591ed..1c844d2 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..6e14fe7fed362d470555445b053a2653be53a62d 100644 +index 13f89bdaf1ada33060b1ee4d6f2860ec194b68a4..c9518700b93ca5e01fe2c8335fd8852e4cf89702 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -29,8 +29,8 @@ repositories { +@@ -25,8 +25,8 @@ repositories { } dependencies { @@ -19,7 +19,7 @@ index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..6e14fe7fed362d470555445b053a2653 // Paper start implementation("org.jline:jline-terminal-jansi:3.12.1") implementation("net.minecrell:terminalconsoleappender:1.2.0") -@@ -82,7 +82,7 @@ tasks.jar { +@@ -78,7 +78,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -28,7 +28,7 @@ index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..6e14fe7fed362d470555445b053a2653 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -104,6 +104,26 @@ publishing { +@@ -100,6 +100,26 @@ publishing { classifier = null } artifact(tasks.shadowJar) @@ -55,7 +55,7 @@ index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..6e14fe7fed362d470555445b053a2653 } } -@@ -147,7 +167,7 @@ tasks.shadowJar { +@@ -143,7 +163,7 @@ tasks.shadowJar { // Needed for Paperclip's install to maven local feature from(generatePom) { @@ -64,7 +64,7 @@ index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..6e14fe7fed362d470555445b053a2653 rename { "pom.xml" } } -@@ -207,7 +227,7 @@ tasks.test { +@@ -204,7 +224,7 @@ tasks.test { fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -87,10 +87,10 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..52126870f1fc15a9ddce4452673b236e /** diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index 580bae0d414d371a07a6bfeefc41fdd989dc0083..e744a4c6de5beae4161d855da6dcab93c496364a 100644 +index ece77f5ea4b14bbed7c070131b3251ea86764538..71bf426f7fb58fff6739bb1332d1286db810d434 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -@@ -29,8 +29,8 @@ public class PaperVersionFetcher implements VersionFetcher { +@@ -31,8 +31,8 @@ public class PaperVersionFetcher implements VersionFetcher { @Nonnull @Override public Component getVersionMessage(@Nonnull String serverVersion) { @@ -101,7 +101,7 @@ index 580bae0d414d371a07a6bfeefc41fdd989dc0083..e744a4c6de5beae4161d855da6dcab93 final Component history = getHistory(); return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage; -@@ -43,7 +43,7 @@ public class PaperVersionFetcher implements VersionFetcher { +@@ -45,7 +45,7 @@ public class PaperVersionFetcher implements VersionFetcher { String result = matcher.group(); mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-' } else { @@ -111,10 +111,10 @@ index 580bae0d414d371a07a6bfeefc41fdd989dc0083..e744a4c6de5beae4161d855da6dcab93 org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion()); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1d7c26354eee1dff5e66b6234d408ed8f800415c..7d8137afcf453540aaa3cb44e9619ee28eb523e8 100644 +index 7636b0ae9031e06fd8b4a0c359a45a17e6e075de..2afa6acaa1bd34acac6fc81260d6e0570bc3bf7f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java -index 80d19af2ad423bd3de0e039c5bb8f97af536aaa9..2cafb9edf4020c0b8d747dbb4ff91d7759bcd8c3 100644 +index 57bf7dba266b4df7b36bab2d58a609a1ce8948ef..2b65370654a6143bb3a6a1e02c30046bf447d398 100644 --- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java +++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java -@@ -64,6 +64,18 @@ public class DamageSource { +@@ -77,6 +77,18 @@ public class DamageSource { return this; } - // CraftBukkit end + // Paper end + // Parchment start + private @Nullable org.bukkit.Location location; + @@ -52,7 +52,7 @@ index 80d19af2ad423bd3de0e039c5bb8f97af536aaa9..2cafb9edf4020c0b8d747dbb4ff91d77 public static DamageSource sting(LivingEntity attacker) { return new EntityDamageSource("sting", attacker); -@@ -114,17 +126,24 @@ public class DamageSource { +@@ -127,17 +139,24 @@ public class DamageSource { } public static DamageSource explosion(@Nullable Explosion explosion) { @@ -146,10 +146,10 @@ index 88439b8f82a97a9763dadfc6c9dbaf0912ab3eb7..73a9b765b58bb547712c014c8b908653 public static boolean canSetSpawn(Level world) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index b39b05c7f6bd83f39a76c71735cfdee0f46339ba..d70a223533210fe582ee8b05dd2dd3e3763ba14c 100644 +index 576f01eb7c6fce8955f760c0b36e23c16c97e7a6..a3245218525f538aaba00c72f3500880853dd9d0 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -954,7 +954,7 @@ public class CraftEventFactory { +@@ -955,7 +955,7 @@ public class CraftEventFactory { CraftEventFactory.entityDamage = null; EntityDamageEvent event; if (damager == null) { @@ -158,16 +158,16 @@ index b39b05c7f6bd83f39a76c71735cfdee0f46339ba..d70a223533210fe582ee8b05dd2dd3e3 } else if (entity instanceof EnderDragon && /*PAIL FIXME ((EntityEnderDragon) entity).target == damager*/ false) { event = new EntityDamageEvent(entity.getBukkitEntity(), DamageCause.ENTITY_EXPLOSION, modifiers, modifierFunctions); } else { -@@ -990,7 +990,7 @@ public class CraftEventFactory { +@@ -991,7 +991,7 @@ public class CraftEventFactory { - return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled); + return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled, source.isCritcal()); // Paper - add critical damage API } else if (source == DamageSource.OUT_OF_WORLD) { - EntityDamageEvent event = new EntityDamageByBlockEvent(null, entity.getBukkitEntity(), DamageCause.VOID, modifiers, modifierFunctions); + EntityDamageEvent event = new EntityDamageByBlockEvent(null, entity.getBukkitEntity(), DamageCause.VOID, entity.getBukkitEntity().getLocation(), modifiers, modifierFunctions); // Parchment event.setCancelled(cancelled); CraftEventFactory.callEvent(event); if (!event.isCancelled()) { -@@ -998,7 +998,7 @@ public class CraftEventFactory { +@@ -999,7 +999,7 @@ public class CraftEventFactory { } return event; } else if (source == DamageSource.LAVA) { diff --git a/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch b/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch index ea780c4..202faa1 100644 --- a/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch +++ b/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add UnsafeValues#canPlaceItemOn diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 72cfffd80ad76abe7cb16bc9133730338c07b6f6..cb34cf21a536ade5689062651ad9c694fcdf2b47 100644 +index dcaa189c17dd928d7a19e820ec2ff521e7243b7a..d83eeac033164ff7007c2b8c6aaff40efda69262 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -511,6 +511,55 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -523,6 +523,55 @@ public final class CraftMagicNumbers implements UnsafeValues { } // Paper end diff --git a/patches/server/0007-Expose-EntityType-Ordinals.patch b/patches/server/0007-Expose-EntityType-Ordinals.patch index 8786c67..7b353be 100644 --- a/patches/server/0007-Expose-EntityType-Ordinals.patch +++ b/patches/server/0007-Expose-EntityType-Ordinals.patch @@ -51,10 +51,10 @@ index 1c446dba5de89698397041ee38a2e1a00bec8a56..d12e936920c03cafd18f6c9a509c85c3 return Registry.ENTITY_TYPE.getKey(type); } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index cb34cf21a536ade5689062651ad9c694fcdf2b47..4341a3b6e2d7aea17cfdda555fba5aaeb9318ef6 100644 +index d83eeac033164ff7007c2b8c6aaff40efda69262..88108b9b1a14f1f4c4fb5bfd0af2bb718ba31ee2 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -558,6 +558,18 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -570,6 +570,18 @@ public final class CraftMagicNumbers implements UnsafeValues { final net.minecraft.world.item.context.BlockPlaceContext ctx = context; return future.completeAsync(() -> blockItem.canPlace(ctx, blockState), net.minecraft.server.MCUtil.MAIN_EXECUTOR); } diff --git a/patches/server/0009-Expose-MCUtil-Executors.patch b/patches/server/0009-Expose-MCUtil-Executors.patch index 82b0f11..8dfffad 100644 --- a/patches/server/0009-Expose-MCUtil-Executors.patch +++ b/patches/server/0009-Expose-MCUtil-Executors.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose MCUtil Executors diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2ac1a98c7d7c1d3ac09788bfe87d94c4f17dd67a..2ed9ee2ecc5e892da955ff7c738bb63dd057655d 100644 +index 9f5bbb9e684ec11bc979ca2ece4eb73da0e3d1e8..9b92bd247f8752515830d1dea13f0137ae1621e1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2663,4 +2663,16 @@ public final class CraftServer implements Server { +@@ -2720,4 +2720,16 @@ public final class CraftServer implements Server { } // Paper end diff --git a/patches/server/0011-Add-BlockDropResourcesEvent.patch b/patches/server/0011-Add-BlockDropResourcesEvent.patch index 5733d8b..da12380 100644 --- a/patches/server/0011-Add-BlockDropResourcesEvent.patch +++ b/patches/server/0011-Add-BlockDropResourcesEvent.patch @@ -48,10 +48,10 @@ index 8c30e28b97ac7e8b54322c903e0b75ee8135620b..4ca85a02a1eb46b5958aae55946c67ce }); state.spawnAfterBreak((ServerLevel) world, pos, stack); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index d70a223533210fe582ee8b05dd2dd3e3763ba14c..e6fb8712afe5bc75ed7ada7b515d89020869c78f 100644 +index a3245218525f538aaba00c72f3500880853dd9d0..760d35356591380a3e4a5cbd71ebe2ce13050dbc 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1945,5 +1945,11 @@ public class CraftEventFactory { +@@ -1954,5 +1954,11 @@ public class CraftEventFactory { final double posZ = pos.getZ(); playSoundEvent(event, packet -> playerList.broadcast(player, posX, posY, posZ, radius, world, packet)); } diff --git a/patches/server/0013-Add-Furnace-Recipe-API.patch b/patches/server/0013-Add-Furnace-Recipe-API.patch index 210e1b8..c227597 100644 --- a/patches/server/0013-Add-Furnace-Recipe-API.patch +++ b/patches/server/0013-Add-Furnace-Recipe-API.patch @@ -215,10 +215,10 @@ index 0000000000000000000000000000000000000000..e6d1e8faafe3fec48df51e5a25acef56 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 883b2070fcf99cf10d44aef6dece0f7f84bfeeed..8a4cba8d201819541d835d27afd94d24bb8f7fc1 100644 +index 00d8b61c04ac91770b0ff3b846d3ff70bef2e8e7..d0ba4909e843d32e5ea7c5c8b23dd49fb2074d83 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2119,4 +2119,11 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2161,4 +2161,11 @@ public class CraftWorld extends CraftRegionAccessor implements World { return this.adventure$pointers; } // Paper end diff --git a/patches/server/0014-Disable-sleep-status-announcements.patch b/patches/server/0014-Disable-sleep-status-announcements.patch index e25e07d..7d495f0 100644 --- a/patches/server/0014-Disable-sleep-status-announcements.patch +++ b/patches/server/0014-Disable-sleep-status-announcements.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable sleep status announcements diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 429eb67fb264a0d8ec7900c02c1abdfac0c9bd7d..d67c726b0858dbe480b6642ade532b1bad8237f3 100644 +index 57743bb179ddb2c32641f45b5b1587e7cb998626..fa11a0b7797d9753982e4be9232e5cce0e2328c5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -988,7 +988,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -994,7 +994,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } private void announceSleepStatus() {