From 19293aabc551dfe75b3c298c5db11781c3eca020 Mon Sep 17 00:00:00 2001 From: Ben Kerllenevich Date: Tue, 31 Aug 2021 07:23:46 -0400 Subject: [PATCH] Update Upstream (Paper) Upstream has released updates that appear to apply and compile correctly --- gradle.properties | 2 +- patches/api/0004-Purpur-client-support.patch | 4 +- patches/api/0010-AFK-API.patch | 4 +- .../api/0019-Player-invulnerabilities.patch | 4 +- ...oc-warnings-missing-param-and-return.patch | 8 ++-- patches/api/0043-Flying-Fall-Damage-API.patch | 4 +- .../server/0001-Airplane-Server-Changes.patch | 38 +++++++++---------- patches/server/0003-Rebrand.patch | 4 +- .../0006-Component-related-conveniences.patch | 4 +- patches/server/0007-Ridables.patch | 18 ++++----- .../0015-Configurable-server-mod-name.patch | 6 +-- patches/server/0017-Lagging-threshold.patch | 10 ++--- .../0031-Zombie-horse-naturally-spawn.patch | 4 +- ...0054-Fix-the-dead-lagging-the-server.patch | 4 +- .../0057-Configurable-TPS-Catchup.patch | 4 +- ...urable-void-damage-height-and-damage.patch | 4 +- .../0067-Add-canSaveToDisk-to-Entity.patch | 4 +- ...0071-Add-5-second-tps-average-in-tps.patch | 4 +- .../server/0073-Item-entity-immunities.patch | 4 +- .../0096-Add-no-random-tick-block-list.patch | 8 ++-- ...Stop-squids-floating-on-top-of-water.patch | 4 +- ...tities-can-use-portals-configuration.patch | 6 +-- ...ggling-special-MobSpawners-per-world.patch | 6 +-- patches/server/0113-Stonecutter-damage.patch | 4 +- .../0114-Configurable-daylight-cycle.patch | 10 ++--- ...52-Movement-options-for-armor-stands.patch | 4 +- .../server/0153-Fix-stuck-in-portals.patch | 4 +- .../0172-Config-for-skipping-night.patch | 4 +- patches/server/0175-Drowning-Settings.patch | 4 +- ...ble-damage-settings-for-magma-blocks.patch | 4 +- ...205-API-for-any-mob-to-burn-daylight.patch | 4 +- ...ggle-for-end-portal-safe-teleporting.patch | 4 +- ...ake-lightning-rod-range-configurable.patch | 6 +-- patches/server/0223-Add-uptime-command.patch | 8 ++-- ...omizable-sleeping-actionbar-messages.patch | 6 +-- ...ain-and-thunder-should-stop-on-sleep.patch | 6 +-- 36 files changed, 113 insertions(+), 113 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6e694263c..542e797c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT mcVersion = 1.17.1 packageVersion = 1_17_R1 -paperCommit = 9d49fa9d8821808600bfe6780c95d05f5db01974 +paperCommit = 7d10cdea0358854138d0d0ada5e74c58c688dea7 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0004-Purpur-client-support.patch b/patches/api/0004-Purpur-client-support.patch index 2476bb46e..5744a0829 100644 --- a/patches/api/0004-Purpur-client-support.patch +++ b/patches/api/0004-Purpur-client-support.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 5084ef3cb0884fb5c170859bc7be57a9fcba0a3c..ef68c7ee481eb7f50f2561a211b4add801e5e8dd 100644 +index afa245018192a63e5db8bc568ddea2790bf5b8a2..436c42649395fd6df3425c2ddeb85a99edf9c1c4 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2299,4 +2299,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2293,4 +2293,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Override Spigot spigot(); // Spigot end diff --git a/patches/api/0010-AFK-API.patch b/patches/api/0010-AFK-API.patch index 357aa2361..e0074a007 100644 --- a/patches/api/0010-AFK-API.patch +++ b/patches/api/0010-AFK-API.patch @@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index ef68c7ee481eb7f50f2561a211b4add801e5e8dd..a894626a7900798812b2afc3712d04fa583ae31e 100644 +index 436c42649395fd6df3425c2ddeb85a99edf9c1c4..e95cd5c57010eb338de48782525635ba64e26399 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2307,5 +2307,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2301,5 +2301,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @return True if Player uses Purpur Client */ public boolean usesPurpurClient(); diff --git a/patches/api/0019-Player-invulnerabilities.patch b/patches/api/0019-Player-invulnerabilities.patch index 6c7da7f9f..5568a9e82 100644 --- a/patches/api/0019-Player-invulnerabilities.patch +++ b/patches/api/0019-Player-invulnerabilities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index a894626a7900798812b2afc3712d04fa583ae31e..8e59e4e4bf3a9ca80332ddd7b6de5a93855c2d0c 100644 +index e95cd5c57010eb338de48782525635ba64e26399..cda1e6a62e80fcca796454828acc3810920cd91c 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2326,5 +2326,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2320,5 +2320,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Reset the idle timer back to 0 */ void resetIdleTimer(); diff --git a/patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch index 47802f336..21ee1dc65 100644 --- a/patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch +++ b/patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch @@ -949,10 +949,10 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8 NORMAL(false), diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 8e59e4e4bf3a9ca80332ddd7b6de5a93855c2d0c..8fad3187f8b1fc099420eef905505cdbab4a9fb7 100644 +index cda1e6a62e80fcca796454828acc3810920cd91c..438819bc40aef25d0cd1d1bfb00cc8191488bb7b 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2121,6 +2121,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2115,6 +2115,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM void resetCooldown(); /** @@ -961,7 +961,7 @@ index 8e59e4e4bf3a9ca80332ddd7b6de5a93855c2d0c..8fad3187f8b1fc099420eef905505cdb * @return the client option value of the player */ @NotNull -@@ -2160,6 +2162,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2154,6 +2156,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM // Paper end // Spigot start @@ -1110,7 +1110,7 @@ index 84638e852501cc804c13c188c90c38b163657c36..a32f7d86407a36d34932101a8b46751c private static final long serialVersionUID = 3532808232324183999L; private final Throwable cause; diff --git a/src/main/java/org/bukkit/event/block/Action.java b/src/main/java/org/bukkit/event/block/Action.java -index 25d26e3fe713311e66d7e634a6c32af61f4cef59..2825263c102d3f9ed37f6884e09ec5efb8105fb9 100644 +index f0b672bbfcd0eb17f3953ffcd0e728f5b3ec909b..4574b956ed76d5e36fc092d25d29a40c1d1bbb40 100644 --- a/src/main/java/org/bukkit/event/block/Action.java +++ b/src/main/java/org/bukkit/event/block/Action.java @@ -1,5 +1,8 @@ diff --git a/patches/api/0043-Flying-Fall-Damage-API.patch b/patches/api/0043-Flying-Fall-Damage-API.patch index cf19cbc20..65b2baf55 100644 --- a/patches/api/0043-Flying-Fall-Damage-API.patch +++ b/patches/api/0043-Flying-Fall-Damage-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 2306f62a4631fc9969549caa728a95b737796bcb..fcc4c6851ef932ab2e84d8758e7618856b98fdcf 100644 +index a2c7e9bdbb7f9dc6dd51fd0a25f3f51931f80fa5..ed62e194e25a0b981188202be4d9b4c217acbf19 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2352,5 +2352,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2346,5 +2346,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param invulnerableTicks Invulnerable ticks remaining */ void setSpawnInvulnerableTicks(int invulnerableTicks); diff --git a/patches/server/0001-Airplane-Server-Changes.patch b/patches/server/0001-Airplane-Server-Changes.patch index 4acdb63b8..93dfbba79 100644 --- a/patches/server/0001-Airplane-Server-Changes.patch +++ b/patches/server/0001-Airplane-Server-Changes.patch @@ -125,7 +125,7 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..f5d01bce4d5547b4aeca96b7962b2090 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 86d73c98ff04384f3d6c9d967ae7ad85c7c29bf1..25f9103041ebc065502bb32066cd8db79518034d 100644 +index dcae40fde8087ce09ec8b9360f2abc860b88c975..0f0b0bbcc0e47b8fe3e1e5d4a4ef0eed389d020b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -202,16 +202,26 @@ public class PaperConfig { @@ -1660,10 +1660,10 @@ index 505546d32eea4682452dbac02311433157f6a30e..5c7b9ad379f3c272e15648dd16f4df92 public static CompletableFuture> sequenceFailFast(List> futures) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index edd2333e0fb24a50bc388249224e9311aa90a10f..61b0e52ec692b8bfc7629ee6e84952a6704362aa 100644 +index 099db3a627c1d3c08f3b923bb02a1cb8a0a268ab..635ccc60d32333e178b28faae9c26de107b380d7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1730,7 +1730,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper @@ -34,10 +34,10 @@ index 080ccf4092de52292175c9333b530b82bf3aa5c8..4350a9507deded551e709bf333f0cbdd 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 2db8a773c035a74ceb6cd31311b1b0e053775434..7e9bff1a8ec45551086550b4e5098dc5304f794a 100644 +index d743d50a9b3ad9502fc11adc6fe43e9a58d7a94b..372eea42755cad6bf957fa94b816db25751d707b 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -201,6 +201,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -200,6 +200,7 @@ public class ServerLevel extends Level implements WorldGenLevel { public final UUID uuid; public boolean hasPhysicsEvent = true; // Paper public boolean hasEntityMoveEvent = false; // Paper @@ -86,7 +86,7 @@ index 2dc4c7695dab7d03316f5473e29baa1db29debf2..eaca5e3c6d26d5fff1eae1cacabfd389 if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) { ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity)); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 10661ecad0942b4ecd5cf0b23f8bcdcdaacfe3de..15d3f860c5ad3dc849d943bd86114af3a8c04c82 100644 +index 3b7d72f035d7fd74971af043294047ff1ed4c95c..33edd0863374b4a7f2b0812879b23533515da447 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -107,7 +107,7 @@ index 10661ecad0942b4ecd5cf0b23f8bcdcdaacfe3de..15d3f860c5ad3dc849d943bd86114af3 private float eyeHeight; public boolean isInPowderSnow; public boolean wasInPowderSnow; -@@ -2627,6 +2627,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -2632,6 +2632,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n this.passengers = ImmutableList.copyOf(list); } @@ -120,7 +120,7 @@ index 10661ecad0942b4ecd5cf0b23f8bcdcdaacfe3de..15d3f860c5ad3dc849d943bd86114af3 } return true; // CraftBukkit } -@@ -2667,6 +2673,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -2672,6 +2678,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n return false; } // Spigot end @@ -135,7 +135,7 @@ index 10661ecad0942b4ecd5cf0b23f8bcdcdaacfe3de..15d3f860c5ad3dc849d943bd86114af3 if (this.passengers.size() == 1 && this.passengers.get(0) == entity) { this.passengers = ImmutableList.of(); } else { -@@ -4254,4 +4268,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -4259,4 +4273,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this); } // Paper end @@ -4525,7 +4525,7 @@ index 008e3b769011df76697ad0abcdde5727cef05f64..0837875231ef96ff58f2fee3e558d706 Projectile(EntityType type, Level world) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 6903706219a146146a213710a5f83af37f7f60b8..41134227b3902f6e008f1db7b0803a1f81e7fd6e 100644 +index 50dd18f72d7ec674a33049ad2e228f7d8a4054a5..827e6ea7d409a200d1a20bd45cd02ceb6e0fc20b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -156,4 +156,9 @@ public class PurpurConfig { diff --git a/patches/server/0015-Configurable-server-mod-name.patch b/patches/server/0015-Configurable-server-mod-name.patch index 0de5d83d1..6d1b987df 100644 --- a/patches/server/0015-Configurable-server-mod-name.patch +++ b/patches/server/0015-Configurable-server-mod-name.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4350a9507deded551e709bf333f0cbddc7ebe6d3..be32f41d1ec6f8a4f8c6835fe262c3d86f163f34 100644 +index c57e1a4c0740bbd39bf5e815420e2346eabd2e72..5949641946bec9dd0c6e83ec619b01c796f44f70 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1731,7 +1731,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop predicate = (block) -> { // CraftBukkit - decompile eror @@ -18,10 +18,10 @@ index d95e45c2867cf3232cebd4b4c43bd890bfb70847..750e1900204a1d8717ec78ab2a5863a4 DefaultedRegistry registryblocks = Registry.BLOCK; diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -index 4853025530de9c22bde9e54b81120102dae5477c..35887a72e8e5c1193fd5b484946512df128b25c1 100644 +index 3d677fe25ed015e30634bf2fccde29f332e3dd87..e1aba175a74e73db0a8a11e8d2df35c45adfd3fa 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -@@ -915,10 +915,12 @@ public abstract class BlockBehaviour { +@@ -914,10 +914,12 @@ public abstract class BlockBehaviour { } public void tick(ServerLevel world, BlockPos pos, Random random) { diff --git a/patches/server/0099-Stop-squids-floating-on-top-of-water.patch b/patches/server/0099-Stop-squids-floating-on-top-of-water.patch index f7f23e3b6..ec0f474fa 100644 --- a/patches/server/0099-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0099-Stop-squids-floating-on-top-of-water.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6f8da1602dfe69ac35c98cbe744a25d1dd876a54..213d13800d2d8680c2f981cd5850c5a73d0978b1 100644 +index 46d6b2fbbcb90a7e7738a1f403d02b9cc384c479..003aefff36185613a195edad1bd0121b8526a90b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3870,11 +3870,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -3875,11 +3875,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n this.yRotO = this.getYRot(); } diff --git a/patches/server/0102-Entities-can-use-portals-configuration.patch b/patches/server/0102-Entities-can-use-portals-configuration.patch index cfff915ba..dc1df3f01 100644 --- a/patches/server/0102-Entities-can-use-portals-configuration.patch +++ b/patches/server/0102-Entities-can-use-portals-configuration.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 213d13800d2d8680c2f981cd5850c5a73d0978b1..bb167f668bc0b1218327f6ad3bd6b2cbe023d976 100644 +index 003aefff36185613a195edad1bd0121b8526a90b..c2b808a80696b319143ac7f96e75be51d4a2642a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2727,7 +2727,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -2732,7 +2732,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n public void handleInsidePortal(BlockPos pos) { if (this.isOnPortalCooldown()) { this.setPortalCooldown(); @@ -17,7 +17,7 @@ index 213d13800d2d8680c2f981cd5850c5a73d0978b1..bb167f668bc0b1218327f6ad3bd6b2cb if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) { this.portalEntrancePos = pos.immutable(); } -@@ -3359,7 +3359,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -3364,7 +3364,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n } public boolean canChangeDimensions() { diff --git a/patches/server/0105-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0105-Allow-toggling-special-MobSpawners-per-world.patch index 19bfd90cd..3bb3d76d3 100644 --- a/patches/server/0105-Allow-toggling-special-MobSpawners-per-world.patch +++ b/patches/server/0105-Allow-toggling-special-MobSpawners-per-world.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 750e1900204a1d8717ec78ab2a5863a464e84431..f959fab7c941505fcb39b116c05a9e9cd401b090 100644 +index 38f4c77355f3a63bf1da1ced5df49512b10a424d..1ea18770c65583e2ed604eb15d15067a638a33a2 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -83,6 +83,7 @@ import net.minecraft.world.entity.MobCategory; @@ -27,7 +27,7 @@ index 750e1900204a1d8717ec78ab2a5863a464e84431..f959fab7c941505fcb39b116c05a9e9c import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.raid.Raid; import net.minecraft.world.entity.raid.Raids; -@@ -131,6 +134,8 @@ import net.minecraft.world.level.gameevent.GameEvent; +@@ -130,6 +133,8 @@ import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.level.gameevent.GameEventListenerRegistrar; import net.minecraft.world.level.gameevent.vibrations.VibrationPath; import net.minecraft.world.level.levelgen.Heightmap; @@ -36,7 +36,7 @@ index 750e1900204a1d8717ec78ab2a5863a464e84431..f959fab7c941505fcb39b116c05a9e9c import net.minecraft.world.level.levelgen.feature.StructureFeature; import net.minecraft.world.level.levelgen.structure.BoundingBox; import net.minecraft.world.level.levelgen.structure.StructureStart; -@@ -506,7 +511,24 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -505,7 +510,24 @@ public class ServerLevel extends Level implements WorldGenLevel { this.dragonParts = new Int2ObjectOpenHashMap(); this.tickTime = flag1; this.server = minecraftserver; diff --git a/patches/server/0113-Stonecutter-damage.patch b/patches/server/0113-Stonecutter-damage.patch index 965880de9..9ac20a7b5 100644 --- a/patches/server/0113-Stonecutter-damage.patch +++ b/patches/server/0113-Stonecutter-damage.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Stonecutter damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bb167f668bc0b1218327f6ad3bd6b2cbe023d976..54442921dd314f22760f158cde662592821ea6de 100644 +index c2b808a80696b319143ac7f96e75be51d4a2642a..98d47b29763fbffedcc351b1e33400ce7e329f1c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1029,7 +1029,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -1034,7 +1034,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n } // CraftBukkit end diff --git a/patches/server/0114-Configurable-daylight-cycle.patch b/patches/server/0114-Configurable-daylight-cycle.patch index 57a5000be..7160f04e1 100644 --- a/patches/server/0114-Configurable-daylight-cycle.patch +++ b/patches/server/0114-Configurable-daylight-cycle.patch @@ -18,10 +18,10 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) { this.gameTime = time % 192000; // Paper - fix guardian beam diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index f959fab7c941505fcb39b116c05a9e9cd401b090..f0b62a3ec03cdbba853be815834e56c4d136197c 100644 +index 1ea18770c65583e2ed604eb15d15067a638a33a2..85b3ffb58b06ff6342abdd8948c1607079c4ee8f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -196,6 +196,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -195,6 +195,7 @@ public class ServerLevel extends Level implements WorldGenLevel { final Int2ObjectMap dragonParts; private final StructureFeatureManager structureFeatureManager; private final boolean tickTime; @@ -29,7 +29,7 @@ index f959fab7c941505fcb39b116c05a9e9cd401b090..f0b62a3ec03cdbba853be815834e56c4 // Paper start - execute chunk tasks mid tick public long lastMidTickExecuteFailure; // Paper end - execute chunk tasks mid tick -@@ -573,6 +574,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -572,6 +573,7 @@ public class ServerLevel extends Level implements WorldGenLevel { this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit this.asyncChunkTaskManager = new com.destroystokyo.paper.io.chunk.ChunkTaskManager(this); // Paper @@ -37,7 +37,7 @@ index f959fab7c941505fcb39b116c05a9e9cd401b090..f0b62a3ec03cdbba853be815834e56c4 } public void setWeatherParameters(int clearDuration, int rainDuration, boolean raining, boolean thundering) { -@@ -838,6 +840,18 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -833,6 +835,18 @@ public class ServerLevel extends Level implements WorldGenLevel { this.liquidTicks.nextTick(); // Paper this.serverLevelData.getScheduledEvents().tick(this.server, i); if (this.levelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) { @@ -56,7 +56,7 @@ index f959fab7c941505fcb39b116c05a9e9cd401b090..f0b62a3ec03cdbba853be815834e56c4 this.setDayTime(this.levelData.getDayTime() + 1L); } -@@ -846,6 +860,12 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -841,6 +855,12 @@ public class ServerLevel extends Level implements WorldGenLevel { public void setDayTime(long timeOfDay) { this.serverLevelData.setDayTime(timeOfDay); diff --git a/patches/server/0152-Movement-options-for-armor-stands.patch b/patches/server/0152-Movement-options-for-armor-stands.patch index 61d2b7651..cf16daed2 100644 --- a/patches/server/0152-Movement-options-for-armor-stands.patch +++ b/patches/server/0152-Movement-options-for-armor-stands.patch @@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 54442921dd314f22760f158cde662592821ea6de..eae9077653e2fa92fbcba99bc3aca96ef499d20b 100644 +index 98d47b29763fbffedcc351b1e33400ce7e329f1c..3ad67d65990feaedbb67ed15fe50032c0fd0fdc2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1616,7 +1616,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -1621,7 +1621,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n return this.isInWater() || flag; } diff --git a/patches/server/0153-Fix-stuck-in-portals.patch b/patches/server/0153-Fix-stuck-in-portals.patch index 38f9aa4e2..431d7c3d4 100644 --- a/patches/server/0153-Fix-stuck-in-portals.patch +++ b/patches/server/0153-Fix-stuck-in-portals.patch @@ -17,10 +17,10 @@ index cefbdb8f5892d5d46ca6ddc8aa6710be42c189a6..4a201004d397cf960822259d4f7d19cf // CraftBukkit end this.setLevel(worldserver); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index eae9077653e2fa92fbcba99bc3aca96ef499d20b..280059b0edd791c2ac376d611399e7562639410b 100644 +index 3ad67d65990feaedbb67ed15fe50032c0fd0fdc2..3c5d34e82154c68bb5ac9472d3826962a28fcd60 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2724,12 +2724,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -2729,12 +2729,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n return Vec3.directionFromRotation(this.getRotationVector()); } diff --git a/patches/server/0172-Config-for-skipping-night.patch b/patches/server/0172-Config-for-skipping-night.patch index df1e26ca8..db58aa539 100644 --- a/patches/server/0172-Config-for-skipping-night.patch +++ b/patches/server/0172-Config-for-skipping-night.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Config for skipping night diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index f0b62a3ec03cdbba853be815834e56c4d136197c..6add1cb8a35c1e16670ba2e9db7878f27bbf3752 100644 +index 85b3ffb58b06ff6342abdd8948c1607079c4ee8f..40b9ce197be14894610673832752b8759fabd0da 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -717,7 +717,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -716,7 +716,7 @@ public class ServerLevel extends Level implements WorldGenLevel { // CraftBukkit end i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE); diff --git a/patches/server/0175-Drowning-Settings.patch b/patches/server/0175-Drowning-Settings.patch index c2afd2262..ab04fcd30 100644 --- a/patches/server/0175-Drowning-Settings.patch +++ b/patches/server/0175-Drowning-Settings.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Drowning Settings diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 280059b0edd791c2ac376d611399e7562639410b..6db992f8e6bef8ce7ed3f4386640a2324bec249d 100644 +index 3c5d34e82154c68bb5ac9472d3826962a28fcd60..3a56f6c5f88d865ec38c7fe082835dd5a200397f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2958,7 +2958,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -2963,7 +2963,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n } public int getMaxAirSupply() { diff --git a/patches/server/0186-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0186-Configurable-damage-settings-for-magma-blocks.patch index eddd1b1d9..c5cbf5d00 100644 --- a/patches/server/0186-Configurable-damage-settings-for-magma-blocks.patch +++ b/patches/server/0186-Configurable-damage-settings-for-magma-blocks.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable damage settings for magma blocks diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6db992f8e6bef8ce7ed3f4386640a2324bec249d..90ba2eba2417c9d529a175dbc1228e84588b67b8 100644 +index 3a56f6c5f88d865ec38c7fe082835dd5a200397f..20689afe1556d2b463143ebb5cdbcbd683f5e76b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1029,7 +1029,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -1034,7 +1034,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n } // CraftBukkit end diff --git a/patches/server/0205-API-for-any-mob-to-burn-daylight.patch b/patches/server/0205-API-for-any-mob-to-burn-daylight.patch index 20b38c1c9..20439284a 100644 --- a/patches/server/0205-API-for-any-mob-to-burn-daylight.patch +++ b/patches/server/0205-API-for-any-mob-to-burn-daylight.patch @@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight Co-authored by: Encode42 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 90ba2eba2417c9d529a175dbc1228e84588b67b8..770e09f47f74d944f178ae2459936f7ef300e8d1 100644 +index 20689afe1556d2b463143ebb5cdbcbd683f5e76b..6ad500cdcafd35c5c2839859afa0d24695f64430 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4318,5 +4318,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -4323,5 +4323,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n public boolean canSaveToDisk() { return true; } diff --git a/patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch index 4095a5a81..675f52605 100644 --- a/patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch +++ b/patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for end portal safe teleporting diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 770e09f47f74d944f178ae2459936f7ef300e8d1..e8cc670b6852b1831ce9f76c1531f55cfe9f3215 100644 +index 6ad500cdcafd35c5c2839859afa0d24695f64430..b0d333d1d776ebd8b98d7f5a7482875044ac76d7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2775,7 +2775,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -2780,7 +2780,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n } this.processPortalCooldown(); diff --git a/patches/server/0212-Make-lightning-rod-range-configurable.patch b/patches/server/0212-Make-lightning-rod-range-configurable.patch index ff6ff8fe1..64a044772 100644 --- a/patches/server/0212-Make-lightning-rod-range-configurable.patch +++ b/patches/server/0212-Make-lightning-rod-range-configurable.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Make lightning rod range configurable diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 6add1cb8a35c1e16670ba2e9db7878f27bbf3752..8c1e06dab7198e8331d39c39a27b6bce854fae9e 100644 +index 40b9ce197be14894610673832752b8759fabd0da..30322750466f266eba295d39de30461c02423df9 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1017,7 +1017,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1012,7 +1012,7 @@ public class ServerLevel extends Level implements WorldGenLevel { return villageplacetype == PoiType.LIGHTNING_ROD; }, (blockposition1) -> { return blockposition1.getY() == this.getLevel().getHeight(Heightmap.Types.WORLD_SURFACE, blockposition1.getX(), blockposition1.getZ()) - 1; @@ -18,7 +18,7 @@ index 6add1cb8a35c1e16670ba2e9db7878f27bbf3752..8c1e06dab7198e8331d39c39a27b6bce return optional.map((blockposition1) -> { return blockposition1.above(1); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index ada22f00dbcd08d21c0e0c2df540f1e637a39e1f..042cdf2654b2c93712cb69100a0d3883722fb6e4 100644 +index 01a9447b0a68d1fcd373ec2a319b351055d0b748..81b0c003b8f23b4bcda40b8d90515f9e620c098a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -380,6 +380,7 @@ public class PurpurConfig { diff --git a/patches/server/0223-Add-uptime-command.patch b/patches/server/0223-Add-uptime-command.patch index 46efeb137..ee66a0418 100644 --- a/patches/server/0223-Add-uptime-command.patch +++ b/patches/server/0223-Add-uptime-command.patch @@ -17,19 +17,19 @@ index 386e9ad013369633e2be543b9281e5a5fdce9c74..48a70900082c6c2c99c955a6ac40b488 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 807269b3fc6a1fe7cdbaef6f5336ee40e988505b..2576e2c6bce86cacc54092559f6ed05969f3e01c 100644 +index dd4be57611028acde485bc03640e83e07b0bd34f..928c759d30db2d35ea786b3fe0738c42ef3fed80 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -296,6 +296,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop processQueue = new java.util.concurrent.ConcurrentLinkedQueue(); public int autosavePeriod; public boolean serverAutoSave = false; // Paper diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 042cdf2654b2c93712cb69100a0d3883722fb6e4..b29fd0dfe1096c67dc236f9cdba1a93063d20858 100644 +index 81b0c003b8f23b4bcda40b8d90515f9e620c098a..055cff8be7979b308aad32ffe533a61ce80c295a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -166,6 +166,7 @@ public class PurpurConfig { diff --git a/patches/server/0229-Customizable-sleeping-actionbar-messages.patch b/patches/server/0229-Customizable-sleeping-actionbar-messages.patch index 2f42d3b8c..5b54456f5 100644 --- a/patches/server/0229-Customizable-sleeping-actionbar-messages.patch +++ b/patches/server/0229-Customizable-sleeping-actionbar-messages.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Customizable sleeping actionbar messages diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 8c1e06dab7198e8331d39c39a27b6bce854fae9e..11208321ae766bfc5506e54c280894e132f10faa 100644 +index 30322750466f266eba295d39de30461c02423df9..369ad2615a7f8ee35de91451a4b9fa01031d0dc1 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1060,11 +1060,29 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1055,11 +1055,29 @@ public class ServerLevel extends Level implements WorldGenLevel { if (this.canSleepThroughNights()) { if (!this.getServer().isSingleplayer() || this.getServer().isPublished()) { int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE); @@ -40,7 +40,7 @@ index 8c1e06dab7198e8331d39c39a27b6bce854fae9e..11208321ae766bfc5506e54c280894e1 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 0006d4a7e67cf282bdad93017ceffc45a36e9885..419b5766ffcd240751b34f340f53ccf76523521c 100644 +index 0e806a4d1535eadacdef43c0ddf27bb2b2dbbfc4..f5575629e83f6c6f7c45c367d5e32a6ded408eb1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -168,6 +168,8 @@ public class PurpurConfig { diff --git a/patches/server/0252-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0252-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch index ca3215c7f..646b24184 100644 --- a/patches/server/0252-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch +++ b/patches/server/0252-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Option for if rain and thunder should stop on sleep diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 11208321ae766bfc5506e54c280894e132f10faa..a2da1b6880ea23b3a17dcf2a5f85e96c9b4b842d 100644 +index 369ad2615a7f8ee35de91451a4b9fa01031d0dc1..bf91d6c0d67aa72a6272dc878b07e292386f94f2 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1112,6 +1112,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1107,6 +1107,7 @@ public class ServerLevel extends Level implements WorldGenLevel { private void stopWeather() { // CraftBukkit start @@ -16,7 +16,7 @@ index 11208321ae766bfc5506e54c280894e132f10faa..a2da1b6880ea23b3a17dcf2a5f85e96c this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - when passing the night // If we stop due to everyone sleeping we should reset the weather duration to some other random value. // Not that everyone ever manages to get the whole server to sleep at the same time.... -@@ -1119,6 +1120,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1114,6 +1115,7 @@ public class ServerLevel extends Level implements WorldGenLevel { this.serverLevelData.setRainTime(0); } // CraftBukkit end