diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch index 800a471c6..def967704 100644 --- a/patches/api/0005-Adventure.patch +++ b/patches/api/0005-Adventure.patch @@ -1805,10 +1805,10 @@ index 9566e4306ada5e82dede0f002aa06da12c44996b..4d5f0837bd0e02a30c943d8969fb6b13 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 922d33ff4fa9d901d3c5c0a9f8399ad8aef62c37..cd287978c34873c7122794e4f3e762915978a1f0 100644 +index 259d878ddd4e4e2b289c0de0325ca8fd6203c484..a829779ac56a271cad463806984991b4713a27be 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable; +@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable; /** * Represents a base entity in the world */ @@ -1817,7 +1817,7 @@ index 922d33ff4fa9d901d3c5c0a9f8399ad8aef62c37..cd287978c34873c7122794e4f3e76291 /** * Gets the entity's current position -@@ -656,4 +656,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -683,4 +683,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @Override Spigot spigot(); // Spigot end diff --git a/patches/api/0012-Entity-Origin-API.patch b/patches/api/0012-Entity-Origin-API.patch index c3a843eb0..38b4bb97a 100644 --- a/patches/api/0012-Entity-Origin-API.patch +++ b/patches/api/0012-Entity-Origin-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity Origin API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index cd287978c34873c7122794e4f3e762915978a1f0..c315d2494969190f8b53236f905ad5c5cf1bfc39 100644 +index a829779ac56a271cad463806984991b4713a27be..20c529bdd94a6bac09d9f8222f33dfc9e8d53fa9 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -671,5 +671,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -698,5 +698,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent default net.kyori.adventure.text.event.HoverEvent asHoverEvent(final @NotNull java.util.function.UnaryOperator op) { return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.customName()))); } diff --git a/patches/api/0024-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/api/0024-Add-methods-for-working-with-arrows-stuck-in-living-.patch index c03be3f25..e8a86018c 100644 --- a/patches/api/0024-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/patches/api/0024-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add methods for working with arrows stuck in living entities diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 9f876af2324ebb1f299fbebc8c66d551df7463f0..ba64745a77821ecb8626aca4c8df264c93835270 100644 +index 2b816f0e6bdb912ceeff82c0043272b3970fe243..f00502b59f15c3a92ce18e7d1aa4e546fd45b16a 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -620,4 +620,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -689,4 +689,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @return Whether the entity is invisible */ public boolean isInvisible(); diff --git a/patches/api/0048-Fireworks-API-s.patch b/patches/api/0048-Fireworks-API-s.patch index a0ed753ac..126f0b838 100644 --- a/patches/api/0048-Fireworks-API-s.patch +++ b/patches/api/0048-Fireworks-API-s.patch @@ -7,10 +7,10 @@ Get the Entity being boosted Get the firework launcher diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java -index 05e86cb9d826cdf14490fa649348d46c51adbfdb..d616d5941b3c7b85e350e845901da798601b9a3c 100644 +index e750b34d7d067a5f2f5587853274b6f479cc4fd6..0d31aa0b22cf1e849572294e2cfe38b48c9210af 100644 --- a/src/main/java/org/bukkit/entity/Firework.java +++ b/src/main/java/org/bukkit/entity/Firework.java -@@ -43,4 +43,15 @@ public interface Firework extends Projectile { +@@ -111,4 +111,20 @@ public interface Firework extends Projectile { * @param shotAtAngle the new shotAtAngle */ void setShotAtAngle(boolean shotAtAngle); @@ -20,9 +20,14 @@ index 05e86cb9d826cdf14490fa649348d46c51adbfdb..d616d5941b3c7b85e350e845901da798 + public java.util.UUID getSpawningEntity(); + /** + * If this firework is boosting an entity, return it ++ * @deprecated use {@link #getAttachedTo()} ++ * @see #setAttachedTo(LivingEntity) + * @return The entity being boosted + */ + @org.jetbrains.annotations.Nullable -+ public LivingEntity getBoostedEntity(); ++ @Deprecated ++ default LivingEntity getBoostedEntity() { ++ return getAttachedTo(); ++ } + // Paper end } diff --git a/patches/api/0054-Fix-upstream-javadocs.patch b/patches/api/0054-Fix-upstream-javadocs.patch index fcc322238..15c2c3e68 100644 --- a/patches/api/0054-Fix-upstream-javadocs.patch +++ b/patches/api/0054-Fix-upstream-javadocs.patch @@ -90,10 +90,10 @@ index 91fc11dda99de506be83d40df8929bf7cd8e8d85..7dc631ebd009f5f5c3ac1699c3f3515c // Paper end } diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index 2cf43eac30187a43a01c81b3021b2cfec0d4ba8a..864941be2d07de08f63e740ad2becf1dc5790433 100644 +index 652238659e0a6e0df11f2798773aea4fe7712360..9c57eda3b7af7026639afda9959bc5e5a720861a 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java -@@ -21,6 +21,11 @@ import org.jetbrains.annotations.Nullable; +@@ -22,6 +22,11 @@ import org.jetbrains.annotations.Nullable; */ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder { @@ -106,10 +106,10 @@ index 2cf43eac30187a43a01c81b3021b2cfec0d4ba8a..864941be2d07de08f63e740ad2becf1d * Returns the name of this player * diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index be9334a8b5fba9181ad63c211697e798be63da25..0514a141cb93a650be38c63d4336d46e4304f4b6 100644 +index 6f117995c3ccf9182946c01a663cd8bef1804eb3..00266bf81b022a0f4b4f71061b82a8713b773320 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java -@@ -8,6 +8,10 @@ import org.jetbrains.annotations.Nullable; +@@ -9,6 +9,10 @@ import org.jetbrains.annotations.Nullable; */ public interface Mob extends LivingEntity, Lootable { diff --git a/patches/api/0060-Shoulder-Entities-Release-API.patch b/patches/api/0060-Shoulder-Entities-Release-API.patch index bcac62e0c..a7f5fc1a4 100644 --- a/patches/api/0060-Shoulder-Entities-Release-API.patch +++ b/patches/api/0060-Shoulder-Entities-Release-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Shoulder Entities Release API diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index 864941be2d07de08f63e740ad2becf1dc5790433..bcdf267485f1d68ccc7ea105d5d40bc9bc9db2a2 100644 +index 9c57eda3b7af7026639afda9959bc5e5a720861a..be3eaadbc768a306da68a15abcaa7a5d3ec760c7 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java -@@ -318,6 +318,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder +@@ -319,6 +319,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder */ public int getExpToLevel(); diff --git a/patches/api/0061-Entity-fromMobSpawner.patch b/patches/api/0061-Entity-fromMobSpawner.patch index 03b16193d..b0560b7aa 100644 --- a/patches/api/0061-Entity-fromMobSpawner.patch +++ b/patches/api/0061-Entity-fromMobSpawner.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index c315d2494969190f8b53236f905ad5c5cf1bfc39..b9a61d06d72831dc0c591e129553453a537d3785 100644 +index 20c529bdd94a6bac09d9f8222f33dfc9e8d53fa9..e598c7c90d625313b8a935418bb68e0e6cb6bc6e 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -681,5 +681,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -708,5 +708,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @Nullable Location getOrigin(); diff --git a/patches/api/0067-LivingEntity-setKiller.patch b/patches/api/0067-LivingEntity-setKiller.patch index 37cb713a6..706e674eb 100644 --- a/patches/api/0067-LivingEntity-setKiller.patch +++ b/patches/api/0067-LivingEntity-setKiller.patch @@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index b41133f23d25f90fc0993499056c4eeaf003a701..bfc90a3569abc717f37c064e3068c55ef323edab 100644 +index f00502b59f15c3a92ce18e7d1aa4e546fd45b16a..036936671d816fc553ad2fdf8324609ab610b7f5 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -279,6 +279,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -281,6 +281,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @Nullable public Player getKiller(); diff --git a/patches/api/0094-Add-openSign-method-to-HumanEntity.patch b/patches/api/0094-Add-openSign-method-to-HumanEntity.patch index f28444bf3..0ea0d1279 100644 --- a/patches/api/0094-Add-openSign-method-to-HumanEntity.patch +++ b/patches/api/0094-Add-openSign-method-to-HumanEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add openSign method to HumanEntity diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index bcdf267485f1d68ccc7ea105d5d40bc9bc9db2a2..bd9222b9b5e7ec1f3aebe37838775f345e868150 100644 +index be3eaadbc768a306da68a15abcaa7a5d3ec760c7..13b74e942012169611f2791f8b4493d04710e4c0 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java -@@ -479,6 +479,14 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder +@@ -480,6 +480,14 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder */ @Deprecated public void setShoulderEntityRight(@Nullable Entity entity); diff --git a/patches/api/0110-Make-shield-blocking-delay-configurable.patch b/patches/api/0110-Make-shield-blocking-delay-configurable.patch index 48d3e8c76..a6061071b 100644 --- a/patches/api/0110-Make-shield-blocking-delay-configurable.patch +++ b/patches/api/0110-Make-shield-blocking-delay-configurable.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Make shield blocking delay configurable diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 08ce9cb5a44f62dc3138c45aab947a52a24d3e37..dbe8511d97bfd6361177f66ae638af0c3be19a04 100644 +index 036936671d816fc553ad2fdf8324609ab610b7f5..75629874849e4cdcf0465b653f27baaca5247fea 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -643,5 +643,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -712,5 +712,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param arrows Number of arrows to stick in this entity */ void setArrowsStuck(int arrows); diff --git a/patches/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch index a7add5e44..12e017a64 100644 --- a/patches/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/patches/api/0117-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -6,10 +6,10 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index bd9222b9b5e7ec1f3aebe37838775f345e868150..34c2ae10e2a230ef88a756cf2024edcda2429fbf 100644 +index 13b74e942012169611f2791f8b4493d04710e4c0..9c711d0b2c2f7b0c0603847590e8a1a94f091ff0 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java -@@ -307,7 +307,9 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder +@@ -308,7 +308,9 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder * * @return the item being used by the player, or null if they are not using * an item @@ -20,10 +20,10 @@ index bd9222b9b5e7ec1f3aebe37838775f345e868150..34c2ae10e2a230ef88a756cf2024edcd public ItemStack getItemInUse(); diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index dbe8511d97bfd6361177f66ae638af0c3be19a04..06896b9690a939ade2167da1a19239df2dcdba8f 100644 +index 75629874849e4cdcf0465b653f27baaca5247fea..c80e75b72ac863db19e3d234e349876dd8797924 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -657,5 +657,42 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -726,5 +726,42 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param delay Delay in ticks */ void setShieldBlockingDelay(int delay); diff --git a/patches/api/0120-InventoryCloseEvent-Reason-API.patch b/patches/api/0120-InventoryCloseEvent-Reason-API.patch index e4402af9d..45e9ab3f1 100644 --- a/patches/api/0120-InventoryCloseEvent-Reason-API.patch +++ b/patches/api/0120-InventoryCloseEvent-Reason-API.patch @@ -7,10 +7,10 @@ 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/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index 34c2ae10e2a230ef88a756cf2024edcda2429fbf..f97521acad823ffce08faefc81e3b6a9a374410e 100644 +index 9c711d0b2c2f7b0c0603847590e8a1a94f091ff0..8f489abbb7e80d869ca0f6e8626cecbd453b625a 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java -@@ -158,6 +158,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder +@@ -159,6 +159,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder */ public void closeInventory(); diff --git a/patches/api/0122-Entity-getChunk-API.patch b/patches/api/0122-Entity-getChunk-API.patch index 78f10f073..68c747ae9 100644 --- a/patches/api/0122-Entity-getChunk-API.patch +++ b/patches/api/0122-Entity-getChunk-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API Get the chunk the entity is currently registered to diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index b9a61d06d72831dc0c591e129553453a537d3785..df07eb07896790a09d1022daef5cffc6a435f739 100644 +index e598c7c90d625313b8a935418bb68e0e6cb6bc6e..c6f14159067a14afd44378aaa9ac840aba2e2f9c 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -3,6 +3,7 @@ package org.bukkit.entity; @@ -17,7 +17,7 @@ index b9a61d06d72831dc0c591e129553453a537d3785..df07eb07896790a09d1022daef5cffc6 import org.bukkit.EntityEffect; import org.bukkit.Location; import org.bukkit.Nameable; -@@ -688,5 +689,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -715,5 +716,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return True if entity spawned from a mob spawner */ boolean fromMobSpawner(); diff --git a/patches/api/0146-Async-Chunks-API.patch b/patches/api/0146-Async-Chunks-API.patch index 699def16c..67dcb55f9 100644 --- a/patches/api/0146-Async-Chunks-API.patch +++ b/patches/api/0146-Async-Chunks-API.patch @@ -495,10 +495,10 @@ index 324fca7bf480a463adb30842fa169052534f5252..3e3682be2a1afe92ccdc9a1d97469a69 /** diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index df07eb07896790a09d1022daef5cffc6a435f739..7a05615ec7678338801bcae2ec9a029b13d323d2 100644 +index c6f14159067a14afd44378aaa9ac840aba2e2f9c..8751ba50a0e5d00839885ad5a905eb727445b749 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -163,6 +163,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -164,6 +164,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ public boolean teleport(@NotNull Entity destination, @NotNull TeleportCause cause); diff --git a/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch index b3732ab33..88b6298ac 100644 --- a/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch @@ -65,10 +65,10 @@ index 0000000000000000000000000000000000000000..18a96dbb01d3b34476652264b2d6be37 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 1dd9f7ac1f26c253b8181519aa1873784bc54a07..a4b1ae0caea94882f601a0420354838c6a52ef28 100644 +index c80e75b72ac863db19e3d234e349876dd8797924..c29846df0469535870e1743eee25325a4f092a6d 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -81,6 +81,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -83,6 +83,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @NotNull public Block getTargetBlock(@Nullable Set transparent, int maxDistance); diff --git a/patches/api/0151-Mob-Pathfinding-API.patch b/patches/api/0151-Mob-Pathfinding-API.patch index 9d4bbc82a..8c3f3a59d 100644 --- a/patches/api/0151-Mob-Pathfinding-API.patch +++ b/patches/api/0151-Mob-Pathfinding-API.patch @@ -230,18 +230,18 @@ index 0000000000000000000000000000000000000000..43f062257472a06e9e64c2feef6c3b10 + } +} diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index 0514a141cb93a650be38c63d4336d46e4304f4b6..cc30b4e22ee238de13f031398fc566f4123694ff 100644 +index 00266bf81b022a0f4b4f71061b82a8713b773320..dcaddf4a1e3d954565f2110224be8e7d5c597a0a 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java -@@ -1,6 +1,7 @@ - package org.bukkit.entity; +@@ -2,6 +2,7 @@ package org.bukkit.entity; + import org.bukkit.Sound; import org.bukkit.loot.Lootable; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** -@@ -11,6 +12,13 @@ public interface Mob extends LivingEntity, Lootable { +@@ -12,6 +13,13 @@ public interface Mob extends LivingEntity, Lootable { // Paper start @Override org.bukkit.inventory.@org.jetbrains.annotations.NotNull EntityEquipment getEquipment(); diff --git a/patches/api/0159-Add-LivingEntity-getTargetEntity.patch b/patches/api/0159-Add-LivingEntity-getTargetEntity.patch index 5e2bb493a..bdd457503 100644 --- a/patches/api/0159-Add-LivingEntity-getTargetEntity.patch +++ b/patches/api/0159-Add-LivingEntity-getTargetEntity.patch @@ -49,10 +49,10 @@ index 0000000000000000000000000000000000000000..f52644fab1522bdf83ff4f489e9805b2 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index a4b1ae0caea94882f601a0420354838c6a52ef28..f479e8c26e88520a47f7beeec753b3af9978bde1 100644 +index c29846df0469535870e1743eee25325a4f092a6d..63b39fe0f2c8c529e289c69969588a98dd7fc758 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -150,6 +150,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -152,6 +152,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource */ @Nullable public com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance, @NotNull com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode); diff --git a/patches/api/0160-Add-sun-related-API.patch b/patches/api/0160-Add-sun-related-API.patch index 2e610f8a1..ce6031e8d 100644 --- a/patches/api/0160-Add-sun-related-API.patch +++ b/patches/api/0160-Add-sun-related-API.patch @@ -26,10 +26,10 @@ index 3e3682be2a1afe92ccdc9a1d97469a69f952a9ed..8f7536e5ef73328cb69f7214956aac58 * Gets the full in-game time on this world since the world generation * diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index cc30b4e22ee238de13f031398fc566f4123694ff..55c5227a340e34621160afc9fae3ea843492881d 100644 +index dcaddf4a1e3d954565f2110224be8e7d5c597a0a..4a7ffd617c2a660a4d2e9d10f54add2391f832b9 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java -@@ -19,6 +19,13 @@ public interface Mob extends LivingEntity, Lootable { +@@ -20,6 +20,13 @@ public interface Mob extends LivingEntity, Lootable { */ @NotNull com.destroystokyo.paper.entity.Pathfinder getPathfinder(); diff --git a/patches/api/0175-Entity-getEntitySpawnReason.patch b/patches/api/0175-Entity-getEntitySpawnReason.patch index ad78118bc..ca09ffacb 100644 --- a/patches/api/0175-Entity-getEntitySpawnReason.patch +++ b/patches/api/0175-Entity-getEntitySpawnReason.patch @@ -10,10 +10,10 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 7a05615ec7678338801bcae2ec9a029b13d323d2..634f3b5dd22bf439aaec7c3ecfb3477b66e994e8 100644 +index 8751ba50a0e5d00839885ad5a905eb727445b749..f17f30a9969e52313387c0d92edd980f72687a11 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -727,5 +727,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -754,5 +754,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent // TODO remove impl here return getLocation().getChunk(); } diff --git a/patches/api/0188-Entity-Jump-API.patch b/patches/api/0188-Entity-Jump-API.patch index c3060920a..8c2aa6bf8 100644 --- a/patches/api/0188-Entity-Jump-API.patch +++ b/patches/api/0188-Entity-Jump-API.patch @@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..f0067c2e953d18e1a33536980071ba3f + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 356e516790c4e38d8dac6a106f824787a0ee19ba..33e58114c98a75c14f576db29fe0b658fcec6e15 100644 +index 63b39fe0f2c8c529e289c69969588a98dd7fc758..54046c5810f9f6f3f28e815a210617683139509d 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -809,5 +809,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -878,5 +878,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource */ @NotNull org.bukkit.inventory.EquipmentSlot getHandRaised(); diff --git a/patches/api/0204-Potential-bed-API.patch b/patches/api/0204-Potential-bed-API.patch index 9434a1da6..102eb79e4 100644 --- a/patches/api/0204-Potential-bed-API.patch +++ b/patches/api/0204-Potential-bed-API.patch @@ -8,10 +8,10 @@ Adds a new method to fetch the location of a player's bed without generating any getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks. diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index f97521acad823ffce08faefc81e3b6a9a374410e..876215c84cf6915f5af131da38d97c20580c0292 100644 +index 8f489abbb7e80d869ca0f6e8626cecbd453b625a..0775c1061a72af66344ec45248b50072c394da38 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java -@@ -248,6 +248,19 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder +@@ -249,6 +249,19 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder */ public int getSleepTicks(); diff --git a/patches/api/0212-Add-entity-liquid-API.patch b/patches/api/0212-Add-entity-liquid-API.patch index 6c8a843de..19f023a48 100644 --- a/patches/api/0212-Add-entity-liquid-API.patch +++ b/patches/api/0212-Add-entity-liquid-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add entity liquid API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 634f3b5dd22bf439aaec7c3ecfb3477b66e994e8..1c9d0e6541d41972f9966b83cbba02f6b230a72c 100644 +index f17f30a9969e52313387c0d92edd980f72687a11..587bf31ed2b2edc7d467d226c91c2bccdd1e4044 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -733,5 +733,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -760,5 +760,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason(); diff --git a/patches/api/0219-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0219-Add-playPickupItemAnimation-to-LivingEntity.patch index ab7502421..a2b38a0e8 100644 --- a/patches/api/0219-Add-playPickupItemAnimation-to-LivingEntity.patch +++ b/patches/api/0219-Add-playPickupItemAnimation-to-LivingEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 33e58114c98a75c14f576db29fe0b658fcec6e15..5192d2472bece141b0990d48a3373a6fb4e1fea6 100644 +index 54046c5810f9f6f3f28e815a210617683139509d..2c559c590b96753aa5dc2db2bacca32d8afad352 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -829,5 +829,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -898,5 +898,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param jumping entity jump state */ void setJumping(boolean jumping); diff --git a/patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch index 62a543fba..2d427236b 100644 --- a/patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch +++ b/patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add additional open container api to HumanEntity diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index 876215c84cf6915f5af131da38d97c20580c0292..cbeb9d1b99759cf3cd65895ff54fa7eabf511f3a 100644 +index 0775c1061a72af66344ec45248b50072c394da38..7e23e157eb70e6bf94d0ac4a0196cc5c943dcac4 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java -@@ -153,6 +153,92 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder +@@ -154,6 +154,92 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @Nullable public InventoryView openMerchant(@NotNull Merchant merchant, boolean force); diff --git a/patches/api/0225-Entity-isTicking.patch b/patches/api/0225-Entity-isTicking.patch index ec39bc8a5..ec9d55e28 100644 --- a/patches/api/0225-Entity-isTicking.patch +++ b/patches/api/0225-Entity-isTicking.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity#isTicking diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 1c9d0e6541d41972f9966b83cbba02f6b230a72c..718af7c49ab8cc232bf72cecdef8a90e2595e835 100644 +index 587bf31ed2b2edc7d467d226c91c2bccdd1e4044..895ccd46d6792210ac9e53093111bd9439e1a41c 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -763,5 +763,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -790,5 +790,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * Check if entity is in lava */ public boolean isInLava(); diff --git a/patches/api/0226-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/api/0226-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch index 2ca22c295..5bc3c30ec 100644 --- a/patches/api/0226-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch +++ b/patches/api/0226-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Clarify the Javadocs for Entity.getEntitySpawnReason() diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 718af7c49ab8cc232bf72cecdef8a90e2595e835..e3de56ffa7b3a554755a7401988945eca655d816 100644 +index 895ccd46d6792210ac9e53093111bd9439e1a41c..b9701e29d4bf2fbcc08bfacf3ebfb275fc0ae8b0 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -729,7 +729,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -756,7 +756,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent } /** diff --git a/patches/api/0235-Add-LivingEntity-clearActiveItem.patch b/patches/api/0235-Add-LivingEntity-clearActiveItem.patch index 81c9b4ce9..66a33785b 100644 --- a/patches/api/0235-Add-LivingEntity-clearActiveItem.patch +++ b/patches/api/0235-Add-LivingEntity-clearActiveItem.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 5192d2472bece141b0990d48a3373a6fb4e1fea6..aa1b76a0633e223fbae0897cb0690fdd7e9f4c40 100644 +index 2c559c590b96753aa5dc2db2bacca32d8afad352..8375cbdb79e82afebbcc18f85e874238f18cda50 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -780,6 +780,13 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -849,6 +849,13 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @NotNull org.bukkit.inventory.ItemStack getActiveItem(); diff --git a/patches/api/0241-Expose-LivingEntity-hurt-direction.patch b/patches/api/0241-Expose-LivingEntity-hurt-direction.patch index de5038be8..3d78532a2 100644 --- a/patches/api/0241-Expose-LivingEntity-hurt-direction.patch +++ b/patches/api/0241-Expose-LivingEntity-hurt-direction.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose LivingEntity hurt direction diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index aa1b76a0633e223fbae0897cb0690fdd7e9f4c40..a8ccf7f0a74a8295bbb921e24eed626c15104b8c 100644 +index 8375cbdb79e82afebbcc18f85e874238f18cda50..a6c0b5e55adadd78619d251d979e9e46068a637e 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -859,5 +859,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -928,5 +928,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param quantity quantity of item */ void playPickupItemAnimation(@NotNull Item item, int quantity); diff --git a/patches/api/0271-Expose-Tracked-Players.patch b/patches/api/0271-Expose-Tracked-Players.patch index a66875419..09aaa196f 100644 --- a/patches/api/0271-Expose-Tracked-Players.patch +++ b/patches/api/0271-Expose-Tracked-Players.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose Tracked Players diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index e3de56ffa7b3a554755a7401988945eca655d816..898c005cb715235df8d7ed6a98faa8191af2fd91 100644 +index b9701e29d4bf2fbcc08bfacf3ebfb275fc0ae8b0..fd9bc146a06e06d0967d9c45421aec460e49bab6 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -768,5 +768,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -795,5 +795,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * Check if entity is inside a ticking chunk */ public boolean isTicking(); diff --git a/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch index 07a547d72..85ca92bd0 100644 --- a/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch +++ b/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] add isDeeplySleeping to HumanEntity diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index cbeb9d1b99759cf3cd65895ff54fa7eabf511f3a..f9531c0f909c7caeddfb8f06ef9a11469ba7d434 100644 +index 7e23e157eb70e6bf94d0ac4a0196cc5c943dcac4..29885c7184dbec82a6de69c39878276392779d71 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java -@@ -327,6 +327,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder +@@ -328,6 +328,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder */ public void setCooldown(@NotNull Material material, int ticks); diff --git a/patches/api/0300-Add-Mob-lookAt-API.patch b/patches/api/0300-Add-Mob-lookAt-API.patch index 26177f236..80f5c58df 100644 --- a/patches/api/0300-Add-Mob-lookAt-API.patch +++ b/patches/api/0300-Add-Mob-lookAt-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Mob#lookAt API diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index 55c5227a340e34621160afc9fae3ea843492881d..07bedbc15ba2463d3c629ae68d229286d4033f79 100644 +index 4a7ffd617c2a660a4d2e9d10f54add2391f832b9..c6d8622fba3397cf3434726f1d7c49e95b887e46 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java -@@ -26,6 +26,88 @@ public interface Mob extends LivingEntity, Lootable { +@@ -27,6 +27,88 @@ public interface Mob extends LivingEntity, Lootable { * @return True if mob is exposed to daylight */ boolean isInDaylight(); diff --git a/patches/api/0310-Add-more-line-of-sight-methods.patch b/patches/api/0310-Add-more-line-of-sight-methods.patch index adfd70e67..3a53cfffb 100644 --- a/patches/api/0310-Add-more-line-of-sight-methods.patch +++ b/patches/api/0310-Add-more-line-of-sight-methods.patch @@ -23,10 +23,10 @@ index aa534b1a9a1fb84a2fbd4b372f313bb4b63325fa..43b53c21af01e0f496c8aaacff82dfdf // Paper end } diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 087a9c54bc11d5d87aa90bf9d8e66fdac2c44457..5238d83788ef39db1f86c22a0b27648cc47a215b 100644 +index a6c0b5e55adadd78619d251d979e9e46068a637e..d47706a915ae1bfaa3187a83cb6d35ea202c03d0 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -482,6 +482,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -484,6 +484,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource */ public boolean hasLineOfSight(@NotNull Entity other); diff --git a/patches/api/0312-Missing-Entity-Behavior-API.patch b/patches/api/0312-Missing-Entity-Behavior-API.patch index 4d2a95da0..78378f8e5 100644 --- a/patches/api/0312-Missing-Entity-Behavior-API.patch +++ b/patches/api/0312-Missing-Entity-Behavior-API.patch @@ -420,13 +420,13 @@ index 479f7a7c54c85cb685f56e60906650d1989c03ff..60267ee382de80fab86b440ff72a2455 +} +// Paper end diff --git a/src/main/java/org/bukkit/entity/Raider.java b/src/main/java/org/bukkit/entity/Raider.java -index 9a99b8ca1ec9c3c88b29275c88b1221e1b22bcef..756b4a7794ea0905abd4e4fe777f69ffe36658f5 100644 +index 987f9b0866b213450b4de1310600161c8587a545..144fdcfd1f35b6346b672006905aedb8a3773018 100644 --- a/src/main/java/org/bukkit/entity/Raider.java +++ b/src/main/java/org/bukkit/entity/Raider.java -@@ -47,4 +47,20 @@ public interface Raider extends Monster { - * @param join CanJoinRaid status +@@ -57,4 +57,20 @@ public interface Raider extends Monster { */ - void setCanJoinRaid(boolean join); + @NotNull + Sound getCelebrationSound(); + + // Paper start + /** diff --git a/patches/api/0316-Stinger-API.patch b/patches/api/0316-Stinger-API.patch index fdd5a623a..29eea0d3f 100644 --- a/patches/api/0316-Stinger-API.patch +++ b/patches/api/0316-Stinger-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Stinger API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 5238d83788ef39db1f86c22a0b27648cc47a215b..8fa8922ad2fb0ea8f770368faff61e56e9761df9 100644 +index d47706a915ae1bfaa3187a83cb6d35ea202c03d0..4af5e8d0cba6555f7615e4e809d9aff221c0dc4d 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -335,6 +335,36 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -337,6 +337,36 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource */ public void setArrowsInBody(int count); diff --git a/patches/api/0331-Left-handed-API.patch b/patches/api/0331-Left-handed-API.patch index c6c9f1b39..f22529b07 100644 --- a/patches/api/0331-Left-handed-API.patch +++ b/patches/api/0331-Left-handed-API.patch @@ -5,13 +5,13 @@ Subject: [PATCH] Left handed API diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index 07bedbc15ba2463d3c629ae68d229286d4033f79..984ad873f36c3dcc73703eb6902c4eab5f1e72b6 100644 +index c6d8622fba3397cf3434726f1d7c49e95b887e46..12ebceec3eb6f4c3325e6c6a592676795a988136 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java -@@ -148,4 +148,20 @@ public interface Mob extends LivingEntity, Lootable { - * @return whether the mob is aware +@@ -162,4 +162,20 @@ public interface Mob extends LivingEntity, Lootable { */ - public boolean isAware(); + @Nullable + public Sound getAmbientSound(); + + // Paper start + /** diff --git a/patches/api/0339-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0339-Add-Raw-Byte-Entity-Serialization.patch index 422f59252..3d0663f68 100644 --- a/patches/api/0339-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/api/0339-Add-Raw-Byte-Entity-Serialization.patch @@ -24,10 +24,10 @@ index be8d5c172b0a300648f21e2163ccf0a9cd7915ee..4fcafddf3792b66c618f91e04d102f37 * Return the translation key for the Material, so the client can translate it into the active * locale when using a {@link net.kyori.adventure.text.TranslatableComponent}. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 898c005cb715235df8d7ed6a98faa8191af2fd91..9b46e42fcd803c2f0fb46b220ed79d69b1d16fc4 100644 +index fd9bc146a06e06d0967d9c45421aec460e49bab6..f1cb02f7891e47b7c8328bfd62437deed93226b3 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -775,5 +775,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -802,5 +802,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return players in tracking range */ @NotNull Set getTrackedPlayers(); diff --git a/patches/api/0346-Entity-powdered-snow-API.patch b/patches/api/0346-Entity-powdered-snow-API.patch index 88414bd4e..a223c993a 100644 --- a/patches/api/0346-Entity-powdered-snow-API.patch +++ b/patches/api/0346-Entity-powdered-snow-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity powdered snow API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 9b46e42fcd803c2f0fb46b220ed79d69b1d16fc4..9c31424a297b9b727ac4ad13040eb9e5674b716b 100644 +index f1cb02f7891e47b7c8328bfd62437deed93226b3..80140c8636c10553c1be741b7e4e5084007279e5 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -802,5 +802,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -829,5 +829,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return Whether the entity was successfully spawned. */ public boolean spawnAt(@NotNull Location location, @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason); diff --git a/patches/api/0359-Freeze-Tick-Lock-API.patch b/patches/api/0359-Freeze-Tick-Lock-API.patch index 9f42a812f..5e471565a 100644 --- a/patches/api/0359-Freeze-Tick-Lock-API.patch +++ b/patches/api/0359-Freeze-Tick-Lock-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 9c31424a297b9b727ac4ad13040eb9e5674b716b..8bc6876c82935988436597161fa0ec94c032174b 100644 +index 80140c8636c10553c1be741b7e4e5084007279e5..461e29a0abbb021c886bffec71c948e1edc3d222 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -278,6 +278,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -279,6 +279,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean isFrozen(); diff --git a/patches/api/0371-More-Projectile-API.patch b/patches/api/0371-More-Projectile-API.patch index 6a949d572..80f239795 100644 --- a/patches/api/0371-More-Projectile-API.patch +++ b/patches/api/0371-More-Projectile-API.patch @@ -6,10 +6,10 @@ Subject: [PATCH] More Projectile API Co-authored-by: Nassim Jahnke diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java -index d616d5941b3c7b85e350e845901da798601b9a3c..b7a6e3b1ac327c4e03f9d73952c1ce4d54967cf4 100644 +index 0d31aa0b22cf1e849572294e2cfe38b48c9210af..571712e17551f24b369044b8215b722f7183ae7d 100644 --- a/src/main/java/org/bukkit/entity/Firework.java +++ b/src/main/java/org/bukkit/entity/Firework.java -@@ -15,6 +15,8 @@ public interface Firework extends Projectile { +@@ -16,6 +16,8 @@ public interface Firework extends Projectile { /** * Apply the provided meta to the fireworks @@ -18,9 +18,49 @@ index d616d5941b3c7b85e350e845901da798601b9a3c..b7a6e3b1ac327c4e03f9d73952c1ce4d * * @param meta The FireworkMeta to apply */ -@@ -54,4 +56,52 @@ public interface Firework extends Projectile { - @org.jetbrains.annotations.Nullable - public LivingEntity getBoostedEntity(); +@@ -54,31 +56,39 @@ public interface Firework extends Projectile { + * {@link #getMaxLife()}, the firework will detonate. + * + * @param ticks the ticks to set. Must be greater than or equal to 0 ++ * @deprecated use {@link #setTicksFlown(int)} + * @return true if the life was set, false if this firework has already detonated + */ ++ @Deprecated(forRemoval = true) // Paper + boolean setLife(int ticks); + + /** + * Get the ticks that this firework has been alive. When this value reaches + * {@link #getMaxLife()}, the firework will detonate. + * ++ * @deprecated use {@link #getTicksFlown()} + * @return the life ticks + */ ++ @Deprecated(forRemoval = true) // Paper + int getLife(); + + /** + * Set the time in ticks this firework will exist until it is detonated. + * + * @param ticks the ticks to set. Must be greater than 0 ++ * @deprecated use {@link #setTicksToDetonate(int)} + * @return true if the time was set, false if this firework has already detonated + */ ++ @Deprecated(forRemoval = true) // Paper + boolean setMaxLife(int ticks); + + /** + * Get the time in ticks this firework will exist until it is detonated. + * ++ * @deprecated use {@link #getTicksToDetonate()} + * @return the maximum life in ticks + */ ++ @Deprecated(forRemoval = true) // Paper + int getMaxLife(); + + /** +@@ -127,4 +137,52 @@ public interface Firework extends Projectile { + return getAttachedTo(); + } // Paper end + + // Paper start - Firework API diff --git a/patches/api/0385-Add-Player-getFishHook.patch b/patches/api/0385-Add-Player-getFishHook.patch index c58145c58..9c96c813a 100644 --- a/patches/api/0385-Add-Player-getFishHook.patch +++ b/patches/api/0385-Add-Player-getFishHook.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#getFishHook diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index f9531c0f909c7caeddfb8f06ef9a11469ba7d434..f854c1252f42ac02ad4eb84f7b5734b4cec88e53 100644 +index 29885c7184dbec82a6de69c39878276392779d71..3b204144e2d245098b3dc23b8779f9ed817bb6d1 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java -@@ -355,6 +355,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder +@@ -356,6 +356,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @Nullable public Location getPotentialBedLocation(); // Paper end diff --git a/patches/api/0386-More-Teleport-API.patch b/patches/api/0386-More-Teleport-API.patch index d0cfa4990..0c960c2de 100644 --- a/patches/api/0386-More-Teleport-API.patch +++ b/patches/api/0386-More-Teleport-API.patch @@ -76,10 +76,10 @@ index 0000000000000000000000000000000000000000..0426ee8bd71142b6f933a479c0f2e5ef + +} diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 8bc6876c82935988436597161fa0ec94c032174b..03b35d3ba8ba00c0fa0272450f19355244a014ea 100644 +index 461e29a0abbb021c886bffec71c948e1edc3d222..321f3ec6c7020ada38143832aea1c545850b9b21 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -121,10 +121,77 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -122,10 +122,77 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * * @param yaw the yaw * @param pitch the pitch diff --git a/patches/api/0389-Collision-API.patch b/patches/api/0389-Collision-API.patch index 8ab9ca750..84c0fd74c 100644 --- a/patches/api/0389-Collision-API.patch +++ b/patches/api/0389-Collision-API.patch @@ -25,10 +25,10 @@ index 3f7e860de4e28745fcdf8d2f41f4a8c210f48909..39fa4c65e0f61450901662ff5c08d54a // Paper end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 03b35d3ba8ba00c0fa0272450f19355244a014ea..4d4a0d15876cc48c9c0456b9f11a5dda37fd56ce 100644 +index 321f3ec6c7020ada38143832aea1c545850b9b21..6dd81f07ef4d6993187987d3352a01771ffb715e 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -897,4 +897,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -924,4 +924,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean isInPowderedSnow(); // Paper end diff --git a/patches/server/0008-MC-Utils.patch b/patches/server/0008-MC-Utils.patch index 23e7f4e39..cc478ca44 100644 --- a/patches/server/0008-MC-Utils.patch +++ b/patches/server/0008-MC-Utils.patch @@ -6415,7 +6415,7 @@ index 288fdbef407d11ab430d5d7026dfad148c3c1065..6fefa619299d3202158490630d62c16a @Override public void tell(R runnable) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6e6d33fcf2786fb995696cf69d66fc10b11a1dfa..331686c382fa88c0fd32056e2c68c3078341f4b7 100644 +index 9fdfeab462e5f5c5e09c5fee2dfe1fca89330086..18d56618a1e8ff5ba408523f620333dbdf48a257 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -315,6 +315,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -6431,7 +6431,7 @@ index 6e6d33fcf2786fb995696cf69d66fc10b11a1dfa..331686c382fa88c0fd32056e2c68c307 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 8fd9667776dc9822cb2e4f54b77c33f5e2bfd3f2..c4f91b80add5d79d999aa49c5da6dab094a24694 100644 +index ad34d8af3e5bba7ec4f41a10c423ed1262c58f6d..2bad9717ec4ec16309856a83d8e19735ae1fcbec 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 { @@ -6443,7 +6443,7 @@ index 8fd9667776dc9822cb2e4f54b77c33f5e2bfd3f2..c4f91b80add5d79d999aa49c5da6dab0 @Override public float getBukkitYaw() { diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 77a91fe6fd028291e9c66163714ab53f9cf031ed..decf753d088983ef6bbf32a32a6ee8d3cca3ee69 100644 +index 77c6f4ff7131b7317a0c0193ead21eabe38517cb..738c54ce0a0fb7fee6b584a6d96a8b74931222e5 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -242,6 +242,7 @@ public abstract class Mob extends LivingEntity { @@ -7150,10 +7150,10 @@ index 93308369f0bbd1e95569d9d573b8b6f42c8ae5a7..6d9469d577dcbb9d5b5b703cf47c8863 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index ef27c0f94355ec7be4a314a0f93bc1c146012210..71c1595b59b757441304a158367d750ed509e4d1 100644 +index 080c0ab395a457d528c34417c102c2db2feec20f..08f6be760cc2f0a6f9c6a3e165e4554ac01654e0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1128,4 +1128,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1145,4 +1145,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return this.spigot; } // Spigot end diff --git a/patches/server/0009-Adventure.patch b/patches/server/0009-Adventure.patch index 524bef79f..8a3fb8a80 100644 --- a/patches/server/0009-Adventure.patch +++ b/patches/server/0009-Adventure.patch @@ -2048,7 +2048,7 @@ index 84564ca128d2dfc79c0b5a13b699cf6fc80bdea7..9ab4588e4e512176b881ad4c252e400f // CraftBukkit end this.chatVisibility = packet.chatVisibility(); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a768fe68db9cf1fedc2e4a2ef7b58fd2673be078..77f169e6d2d9899316c6a38dd7ef8de24d9b6414 100644 +index f63ade8d99295ce9d001aae6f5228a7374e16438..93d02b5de0721e3c5903e80bbf8b3b56ec3ab45d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -188,6 +188,8 @@ import org.apache.commons.lang3.StringUtils; @@ -2114,7 +2114,7 @@ index a768fe68db9cf1fedc2e4a2ef7b58fd2673be078..77f169e6d2d9899316c6a38dd7ef8de2 // CraftBukkit end this.connection.send(new ClientboundDisconnectPacket(ichatbasecomponent), PacketSendListener.thenRun(() -> { -@@ -1788,9 +1793,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1793,9 +1798,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic */ this.player.disconnect(); @@ -2129,7 +2129,7 @@ index a768fe68db9cf1fedc2e4a2ef7b58fd2673be078..77f169e6d2d9899316c6a38dd7ef8de2 } // CraftBukkit end this.player.getTextFilter().leave(); -@@ -1880,7 +1887,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1885,7 +1892,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic if (this.verifyChatMessage(playerchatmessage)) { this.chatMessageChain.append(() -> { CompletableFuture completablefuture = this.filterTextPacket(playerchatmessage.signedContent().plain()); @@ -2138,7 +2138,7 @@ index a768fe68db9cf1fedc2e4a2ef7b58fd2673be078..77f169e6d2d9899316c6a38dd7ef8de2 return CompletableFuture.allOf(completablefuture, completablefuture1).thenAcceptAsync((ovoid) -> { FilterMask filtermask = ((FilteredText) completablefuture.join()).mask(); -@@ -2042,7 +2049,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2047,7 +2054,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.handleCommand(s); } else if (this.player.getChatVisibility() == ChatVisiblity.SYSTEM) { // Do nothing, this is coming from a plugin @@ -2152,7 +2152,7 @@ index a768fe68db9cf1fedc2e4a2ef7b58fd2673be078..77f169e6d2d9899316c6a38dd7ef8de2 Player player = this.getCraftPlayer(); AsyncPlayerChatEvent event = new AsyncPlayerChatEvent(async, player, s, new LazyPlayerSet(this.server)); String originalFormat = event.getFormat(), originalMessage = event.getMessage(); -@@ -2175,9 +2187,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2180,9 +2192,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } private ChatMessageContent getSignedContent(ServerboundChatPacket packet) { @@ -2167,7 +2167,7 @@ index a768fe68db9cf1fedc2e4a2ef7b58fd2673be078..77f169e6d2d9899316c6a38dd7ef8de2 } private void broadcastChatMessage(PlayerChatMessage message) { -@@ -2280,14 +2295,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2288,14 +2303,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic private CompletableFuture queryChatPreview(String query) { MutableComponent ichatmutablecomponent = Component.literal(query); @@ -2189,7 +2189,7 @@ index a768fe68db9cf1fedc2e4a2ef7b58fd2673be078..77f169e6d2d9899316c6a38dd7ef8de2 } private CompletableFuture queryCommandPreview(String query) { -@@ -2296,7 +2314,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2304,7 +2322,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic CompletableFuture completablefuture = this.getPreviewedArgument(commandlistenerwrapper, PreviewableCommand.of(parseresults)); completablefuture.thenAcceptAsync((ichatbasecomponent) -> { @@ -2198,7 +2198,7 @@ index a768fe68db9cf1fedc2e4a2ef7b58fd2673be078..77f169e6d2d9899316c6a38dd7ef8de2 }, this.server); return completablefuture; } -@@ -3086,30 +3104,30 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3094,30 +3112,30 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic return; } @@ -3089,10 +3089,10 @@ index 53b5af4179cc4bc4d5646f183da5e327a45237ac..a859a675b4bc543e139358223cc92ad5 public net.minecraft.world.item.enchantment.Enchantment getHandle() { return this.target; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 71c1595b59b757441304a158367d750ed509e4d1..7c9dcf62f85bb3ddffb4eadb3961d7b356c503f8 100644 +index 08f6be760cc2f0a6f9c6a3e165e4554ac01654e0..dfae0888684cbf3e6b2fc3201c78fa10c67628a1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -196,6 +196,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -198,6 +198,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { protected Entity entity; private EntityDamageEvent lastDamageEvent; private final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftEntity.DATA_TYPE_REGISTRY); @@ -3100,7 +3100,7 @@ index 71c1595b59b757441304a158367d750ed509e4d1..7c9dcf62f85bb3ddffb4eadb3961d7b3 public CraftEntity(final CraftServer server, final Entity entity) { this.server = server; -@@ -830,6 +831,32 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -847,6 +848,32 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return this.getHandle().getVehicle().getBukkitEntity(); } @@ -3133,7 +3133,7 @@ index 71c1595b59b757441304a158367d750ed509e4d1..7c9dcf62f85bb3ddffb4eadb3961d7b3 @Override public void setCustomName(String name) { // sane limit for name length -@@ -885,6 +912,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -902,6 +929,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public String getName() { return CraftChatMessage.fromComponent(this.getHandle().getName()); } @@ -3152,10 +3152,10 @@ index 71c1595b59b757441304a158367d750ed509e4d1..7c9dcf62f85bb3ddffb4eadb3961d7b3 @Override public boolean isPermissionSet(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 56151652fdeb98f54358cfefc3d8773c1a39fcf6..2c934b7a2142a4d1ae21feeb95d23f22cfda3be0 100644 +index ef3d6450b2ae2274b7e40c621aa30da279313669..19549dda26c24388bd13a5a2579789e2d1e3ad88 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -@@ -318,9 +318,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { +@@ -321,9 +321,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { container = CraftEventFactory.callInventoryOpenEvent(player, container); if (container == null) return; @@ -3170,7 +3170,7 @@ index 56151652fdeb98f54358cfefc3d8773c1a39fcf6..2c934b7a2142a4d1ae21feeb95d23f22 player.containerMenu = container; player.initMenu(container); } -@@ -389,8 +392,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { +@@ -392,8 +395,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { // Now open the window MenuType windowType = CraftContainer.getNotchInventoryType(inventory.getTopInventory()); @@ -3834,7 +3834,7 @@ index a0334ec0a80dfc4f1e68c2e338aa486faaefb29e..257776a12ca26c1e75be22a67c94b0aa @Override public CraftMerchant getCraftMerchant() { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -index ca359cb1ac5f48d4f75d33946fcddedb270407c2..fefa4d83c5699be0b55794cd28d13d27b66ef108 100644 +index 4154b4489be172f1ef1693b54368b7ffc8629c31..e8413ad360e9b6c4eef13edf9dd0095e7e64bce2 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java @@ -1,8 +1,9 @@ @@ -3848,19 +3848,7 @@ index ca359cb1ac5f48d4f75d33946fcddedb270407c2..fefa4d83c5699be0b55794cd28d13d27 import java.util.ArrayList; import java.util.Arrays; import java.util.List; -@@ -17,9 +18,11 @@ import org.bukkit.craftbukkit.util.CraftChatMessage; - import org.bukkit.craftbukkit.util.CraftMagicNumbers; - import org.bukkit.inventory.meta.BookMeta; - import org.bukkit.inventory.meta.BookMeta.Generation; -+import org.checkerframework.checker.nullness.qual.NonNull; - - // Spigot start - import static org.spigotmc.ValidateUtils.*; -+ - import java.util.AbstractList; - import net.md_5.bungee.api.chat.BaseComponent; - import net.md_5.bungee.chat.ComponentSerializer; -@@ -269,6 +272,145 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { +@@ -261,6 +262,145 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { this.generation = (generation == null) ? null : generation.ordinal(); } @@ -4006,7 +3994,7 @@ index ca359cb1ac5f48d4f75d33946fcddedb270407c2..fefa4d83c5699be0b55794cd28d13d27 @Override public String getPage(final int page) { Validate.isTrue(this.isValidPage(page), "Invalid page number"); -@@ -413,7 +555,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { +@@ -405,7 +545,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { } @Override @@ -4016,7 +4004,7 @@ index ca359cb1ac5f48d4f75d33946fcddedb270407c2..fefa4d83c5699be0b55794cd28d13d27 if (this.hasTitle()) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java -index 00445fc7373c70f4cecc4114f9bcfb4b6f27c0e8..67a198fe1ba930836b82fcc22ab25eb1810be0cf 100644 +index 507fa96a3fb904b74429df5756c9a6378ec8c5b7..abb9e88abc74135284b941e040d4058690a82b27 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java @@ -1,6 +1,6 @@ @@ -4027,7 +4015,7 @@ index 00445fc7373c70f4cecc4114f9bcfb4b6f27c0e8..67a198fe1ba930836b82fcc22ab25eb1 import java.util.Map; import net.minecraft.nbt.CompoundTag; import org.bukkit.Material; -@@ -84,8 +84,29 @@ class CraftMetaBookSigned extends CraftMetaBook implements BookMeta { +@@ -78,8 +78,29 @@ class CraftMetaBookSigned extends CraftMetaBook implements BookMeta { } @Override diff --git a/patches/server/0012-Timings-v2.patch b/patches/server/0012-Timings-v2.patch index 3795c7882..a9679a948 100644 --- a/patches/server/0012-Timings-v2.patch +++ b/patches/server/0012-Timings-v2.patch @@ -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 a258c965a4a0352f9d77def6748b176f3bdab106..cdc24defe649644ceade1c6cfcfe20c29ca936c1 100644 +index 93d02b5de0721e3c5903e80bbf8b3b56ec3ab45d..4e7db441f68019d6e5d3359605b76bc4b258e87e 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 @@ -1281,7 +1281,7 @@ index a258c965a4a0352f9d77def6748b176f3bdab106..cdc24defe649644ceade1c6cfcfe20c2 this.chatPreviewThrottler.tick(); } -@@ -2149,7 +2147,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2154,7 +2152,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } private void handleCommand(String s) { @@ -1290,7 +1290,7 @@ index a258c965a4a0352f9d77def6748b176f3bdab106..cdc24defe649644ceade1c6cfcfe20c2 if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s); -@@ -2159,7 +2157,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2164,7 +2162,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.cserver.getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -1299,7 +1299,7 @@ index a258c965a4a0352f9d77def6748b176f3bdab106..cdc24defe649644ceade1c6cfcfe20c2 return; } -@@ -2172,7 +2170,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2177,7 +2175,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic java.util.logging.Logger.getLogger(ServerGamePacketListenerImpl.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); return; } finally { @@ -1333,7 +1333,7 @@ index 521f485366c65527ac3289dd27d8f2e311706a10..5833cc3d5014dad82607afc4d643b6be public UserWhiteList getWhiteList() { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 331686c382fa88c0fd32056e2c68c3078341f4b7..47a05aa42739f4cfce828c0de42b4f1da467093e 100644 +index 18d56618a1e8ff5ba408523f620333dbdf48a257..1a44c98b69398ba5dcb4115f0e8fdcf3f62fd920 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -132,7 +132,6 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent; @@ -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 c4f91b80add5d79d999aa49c5da6dab094a24694..e2d93d7a9c421f896e98e6dd6b318f9a30cab3b4 100644 +index 2bad9717ec4ec16309856a83d8e19735ae1fcbec..bffaa7397e931b7b15a1780989e69aae8b29345f 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; @@ -1437,7 +1437,7 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..e2d93d7a9c421f896e98e6dd6b318f9a public abstract class LivingEntity extends Entity { -@@ -2795,7 +2795,6 @@ public abstract class LivingEntity extends Entity { +@@ -2817,7 +2817,6 @@ public abstract class LivingEntity extends Entity { @Override public void tick() { @@ -1445,7 +1445,7 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..e2d93d7a9c421f896e98e6dd6b318f9a super.tick(); this.updatingUsingItem(); this.updateSwimAmount(); -@@ -2837,9 +2836,7 @@ public abstract class LivingEntity extends Entity { +@@ -2859,9 +2858,7 @@ public abstract class LivingEntity extends Entity { } if (!this.isRemoved()) { @@ -1455,7 +1455,7 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..e2d93d7a9c421f896e98e6dd6b318f9a } double d0 = this.getX() - this.xo; -@@ -2921,8 +2918,6 @@ public abstract class LivingEntity extends Entity { +@@ -2943,8 +2940,6 @@ public abstract class LivingEntity extends Entity { if (this.isSleeping()) { this.setXRot(0.0F); } @@ -1464,7 +1464,7 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..e2d93d7a9c421f896e98e6dd6b318f9a } public void detectEquipmentUpdates() { -@@ -3104,7 +3099,6 @@ public abstract class LivingEntity extends Entity { +@@ -3126,7 +3121,6 @@ public abstract class LivingEntity extends Entity { this.setDeltaMovement(d4, d5, d6); this.level.getProfiler().push("ai"); @@ -1472,7 +1472,7 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..e2d93d7a9c421f896e98e6dd6b318f9a if (this.isImmobile()) { this.jumping = false; this.xxa = 0.0F; -@@ -3114,7 +3108,6 @@ public abstract class LivingEntity extends Entity { +@@ -3136,7 +3130,6 @@ public abstract class LivingEntity extends Entity { this.serverAiStep(); this.level.getProfiler().pop(); } @@ -1480,7 +1480,7 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..e2d93d7a9c421f896e98e6dd6b318f9a this.level.getProfiler().pop(); this.level.getProfiler().push("jump"); -@@ -3149,9 +3142,9 @@ public abstract class LivingEntity extends Entity { +@@ -3171,9 +3164,9 @@ public abstract class LivingEntity extends Entity { this.updateFallFlying(); AABB axisalignedbb = this.getBoundingBox(); @@ -1492,7 +1492,7 @@ index c4f91b80add5d79d999aa49c5da6dab094a24694..e2d93d7a9c421f896e98e6dd6b318f9a this.level.getProfiler().pop(); this.level.getProfiler().push("freezing"); boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES); -@@ -3180,9 +3173,7 @@ public abstract class LivingEntity extends Entity { +@@ -3202,9 +3195,7 @@ public abstract class LivingEntity extends Entity { this.checkAutoSpinAttack(axisalignedbb, this.getBoundingBox()); } diff --git a/patches/server/0025-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/server/0025-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch index c14243070..621e6370a 100644 --- a/patches/server/0025-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch +++ b/patches/server/0025-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 decf753d088983ef6bbf32a32a6ee8d3cca3ee69..4f58fae1b3738e7e0507a46df275a258c94fcec4 100644 +index 738c54ce0a0fb7fee6b584a6d96a8b74931222e5..38d3749104742f63f1f4f4c9595e83a4fa445cd1 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 { @@ -16,7 +16,7 @@ index decf753d088983ef6bbf32a32a6ee8d3cca3ee69..4f58fae1b3738e7e0507a46df275a258 public GoalSelector targetSelector; @Nullable private LivingEntity target; -@@ -812,7 +813,17 @@ public abstract class Mob extends LivingEntity { +@@ -818,7 +819,17 @@ public abstract class Mob extends LivingEntity { @Override protected final void serverAiStep() { ++this.noActionTime; diff --git a/patches/server/0026-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/server/0026-Add-configurable-despawn-distances-for-living-entiti.patch index 2724d1240..a88ee8f74 100644 --- a/patches/server/0026-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/patches/server/0026-Add-configurable-despawn-distances-for-living-entiti.patch @@ -5,10 +5,10 @@ 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 4f58fae1b3738e7e0507a46df275a258c94fcec4..854653b2481ebe3a04f671ef0af2aecf3093fc0b 100644 +index 38d3749104742f63f1f4f4c9595e83a4fa445cd1..ce04fa5ae8c539fd6f6aa7648a4cdce6b680463e 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -788,14 +788,14 @@ public abstract class Mob extends LivingEntity { +@@ -794,14 +794,14 @@ public abstract class Mob extends LivingEntity { if (entityhuman != null) { double d0 = entityhuman.distanceToSqr((Entity) this); diff --git a/patches/server/0032-Player-affects-spawning-API.patch b/patches/server/0032-Player-affects-spawning-API.patch index 749e5e729..160b9c9ca 100644 --- a/patches/server/0032-Player-affects-spawning-API.patch +++ b/patches/server/0032-Player-affects-spawning-API.patch @@ -21,10 +21,10 @@ index 5c3b11f738c1ea19981cc878aa6c2323497391a0..b91a61be7c4829fce0ff8da290eab580 public static Predicate 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 854653b2481ebe3a04f671ef0af2aecf3093fc0b..c09f1ac470c4055897f8d6c6201bd8dc421cdbfe 100644 +index ce04fa5ae8c539fd6f6aa7648a4cdce6b680463e..0b056e65b2efe0f96a6beecfc41709bfa18983ca 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -784,7 +784,7 @@ public abstract class Mob extends LivingEntity { +@@ -790,7 +790,7 @@ public abstract class Mob extends LivingEntity { if (this.level.getDifficulty() == Difficulty.PEACEFUL && this.shouldDespawnInPeaceful()) { this.discard(); } else if (!this.isPersistenceRequired() && !this.requiresCustomPersistence()) { diff --git a/patches/server/0035-Entity-Origin-API.patch b/patches/server/0035-Entity-Origin-API.patch index c0911d7e0..f8e647565 100644 --- a/patches/server/0035-Entity-Origin-API.patch +++ b/patches/server/0035-Entity-Origin-API.patch @@ -25,7 +25,7 @@ index 2f7646e2bcc9622d8579eec25b56615da5a84d06..f5ded21e15ca425d23af90f0e339a961 public void onTrackingEnd(Entity entity) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 70c338f5bf605d2f51a21670634c716177cd6f97..ef7320d69d058ea260e48dd1e0d4fc2d69aec1c2 100644 +index 9878aded49d0049b066fa608c7eaf25a55fcf12e..385c81c9e0faf7a51d24b3542713e0d57e5398dd 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -304,7 +304,27 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -56,7 +56,7 @@ index 70c338f5bf605d2f51a21670634c716177cd6f97..ef7320d69d058ea260e48dd1e0d4fc2d public float getBukkitYaw() { return this.yRot; } -@@ -1847,6 +1867,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1861,6 +1881,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.bukkitEntity.storeBukkitValues(nbt); } // CraftBukkit end @@ -72,7 +72,7 @@ index 70c338f5bf605d2f51a21670634c716177cd6f97..ef7320d69d058ea260e48dd1e0d4fc2d return nbt; } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT"); -@@ -1973,6 +2002,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1987,6 +2016,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } // CraftBukkit end @@ -132,10 +132,10 @@ index 2d4a990da2402a6c24c03e8be7e518e33db99c8f..10f8b5ff56e4c1d8300835e045abdce7 @Nullable diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 7c9dcf62f85bb3ddffb4eadb3961d7b356c503f8..fba18e3c6903d4ed8233b4d32ed07bf08311ca27 100644 +index dfae0888684cbf3e6b2fc3201c78fa10c67628a1..ddd0fde5c9065cc35b3bcf81defb119f5b0608d6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1198,5 +1198,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1215,5 +1215,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return ret; } diff --git a/patches/server/0055-Ensure-commands-are-not-ran-async.patch b/patches/server/0055-Ensure-commands-are-not-ran-async.patch index 3b81d4e6a..31bbe6739 100644 --- a/patches/server/0055-Ensure-commands-are-not-ran-async.patch +++ b/patches/server/0055-Ensure-commands-are-not-ran-async.patch @@ -21,10 +21,10 @@ character. Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5072d4dc1f7f77c61e3cc72c1101cb95f6596ce7..451dd594a2acc6fbc7112b9ecfa737c942f10a3c 100644 +index 22c095539425a6667b8e7f5c5f0a8ff2e87adfb5..e21a6961bab606036440f2a6bd90998b4129ae10 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2033,7 +2033,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2038,7 +2038,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic return true; } @@ -33,7 +33,7 @@ index 5072d4dc1f7f77c61e3cc72c1101cb95f6596ce7..451dd594a2acc6fbc7112b9ecfa737c9 for (int i = 0; i < message.length(); ++i) { if (!SharedConstants.isAllowedChatCharacter(message.charAt(i))) { return true; -@@ -2050,7 +2050,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2055,7 +2055,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } OutgoingPlayerChatMessage outgoing = OutgoingPlayerChatMessage.create(original); @@ -42,7 +42,7 @@ index 5072d4dc1f7f77c61e3cc72c1101cb95f6596ce7..451dd594a2acc6fbc7112b9ecfa737c9 this.handleCommand(s); } else if (this.player.getChatVisibility() == ChatVisiblity.SYSTEM) { // Do nothing, this is coming from a plugin -@@ -2153,7 +2153,29 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2158,7 +2158,29 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } } diff --git a/patches/server/0058-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0058-Be-a-bit-more-informative-in-maxHealth-exception.patch index edd16859a..72602b87e 100644 --- a/patches/server/0058-Be-a-bit-more-informative-in-maxHealth-exception.patch +++ b/patches/server/0058-Be-a-bit-more-informative-in-maxHealth-exception.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Be a bit more informative in maxHealth exception diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index a6192a7edd94e63c568ca8196e0ed9fa993da6bb..1d3cd79634366718cd354cd2f55c6fc974ad3525 100644 +index 489153b3d22b37f01a027b0effc091d4715e7f7b..c2407224e8bc5e872e153de14090d60e66bb07bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -99,7 +99,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -102,7 +102,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public void setHealth(double health) { health = (float) health; if ((health < 0) || (health > this.getMaxHealth())) { diff --git a/patches/server/0061-Add-configurable-portal-search-radius.patch b/patches/server/0061-Add-configurable-portal-search-radius.patch index 911f221d1..14632c684 100644 --- a/patches/server/0061-Add-configurable-portal-search-radius.patch +++ b/patches/server/0061-Add-configurable-portal-search-radius.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add configurable portal search radius diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a761c5b3551c7a87b8d04b03f5640805007fbcd3..3bf89827afc515ffae0f79532b38c5f31ba014f6 100644 +index f9f0cb28811e3a14bf4b5005050920b4992f868b..4b5babb9fa755ba2897fc633c8eba30cfd220ea0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2937,7 +2937,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2951,7 +2951,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { double d0 = DimensionType.getTeleportationScale(this.level.dimensionType(), destination.dimensionType()); BlockPos blockposition = worldborder.clampToBounds(this.getX() * d0, this.getY(), this.getZ() * d0); // CraftBukkit start diff --git a/patches/server/0062-Add-velocity-warnings.patch b/patches/server/0062-Add-velocity-warnings.patch index 1f75e318b..e7ff87166 100644 --- a/patches/server/0062-Add-velocity-warnings.patch +++ b/patches/server/0062-Add-velocity-warnings.patch @@ -17,10 +17,10 @@ index fd3ccc1726cd73e9f5be3f936115e2431c77183c..c1c86dc95d610bb391191317fa0c0e4c static { ConfigurationSerialization.registerClass(CraftOfflinePlayer.class); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index fba18e3c6903d4ed8233b4d32ed07bf08311ca27..8b4f1ef248d0b13927cbf634a0e2a97eb93c8ae4 100644 +index ddd0fde5c9065cc35b3bcf81defb119f5b0608d6..b9599f4f431098d63be98b5175890371103f8813 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -450,10 +450,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -452,10 +452,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public void setVelocity(Vector velocity) { Preconditions.checkArgument(velocity != null, "velocity"); velocity.checkFinite(); diff --git a/patches/server/0066-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0066-Disable-Scoreboards-for-non-players-by-default.patch index f95a3237b..34c1e75d6 100644 --- a/patches/server/0066-Disable-Scoreboards-for-non-players-by-default.patch +++ b/patches/server/0066-Disable-Scoreboards-for-non-players-by-default.patch @@ -11,10 +11,10 @@ So avoid looking up scoreboards and short circuit to the "not on a team" logic which is most likely to be true. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3bf89827afc515ffae0f79532b38c5f31ba014f6..4218d5aa5b4ba77d304b91c6c6cd9fa9cdaaa532 100644 +index 4b5babb9fa755ba2897fc633c8eba30cfd220ea0..6e8811a6a4b41d38c99ac40a2d4f0bef4713b762 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2575,6 +2575,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2589,6 +2589,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @Nullable public Team getTeam() { @@ -23,7 +23,7 @@ index 3bf89827afc515ffae0f79532b38c5f31ba014f6..4218d5aa5b4ba77d304b91c6c6cd9fa9 } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 0d61cb2b7af48bbc60b04be6a4767ccba2b29ffb..3023e714961d1b565d9e8659e07ccc4dab729f2f 100644 +index 87b8a9bb1493d4ff048f0283151cfc5c8ea7d7ef..4e192c98b7beb23ac75b7442883eba7bb98dc475 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/0067-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0067-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 37ede5cbc..4b1d9fd2c 100644 --- a/patches/server/0067-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/patches/server/0067-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add methods for working with arrows stuck in living entities diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 13906f0dfd7169b2110c83b7cb51c4979668cb13..652f0e3429efba1326f0e4cae7096a6cfe4b2c85 100644 +index c2407224e8bc5e872e153de14090d60e66bb07bc..4f4ee7071183e7eef918741e38c2bc2e522c72df 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -722,4 +722,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -764,4 +764,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { this.getHandle().persistentInvisibility = invisible; this.getHandle().setSharedFlag(5, invisible); } diff --git a/patches/server/0069-Complete-resource-pack-API.patch b/patches/server/0069-Complete-resource-pack-API.patch index de2eef11b..ee380568c 100644 --- a/patches/server/0069-Complete-resource-pack-API.patch +++ b/patches/server/0069-Complete-resource-pack-API.patch @@ -5,10 +5,10 @@ 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 451dd594a2acc6fbc7112b9ecfa737c942f10a3c..e4f1b7fca8046df11f7e212c316385f82ce45322 100644 +index e21a6961bab606036440f2a6bd90998b4129ae10..9f0a5b950a022aa2a3d3d60837fdb9023f041a9b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1763,8 +1763,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1768,8 +1768,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic ServerGamePacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack rejection", this.player.getName()); this.disconnect(Component.translatable("multiplayer.requiredTexturePrompt.disconnect")); } diff --git a/patches/server/0076-Custom-replacement-for-eaten-items.patch b/patches/server/0076-Custom-replacement-for-eaten-items.patch index fc5200a6d..f24181816 100644 --- a/patches/server/0076-Custom-replacement-for-eaten-items.patch +++ b/patches/server/0076-Custom-replacement-for-eaten-items.patch @@ -5,10 +5,10 @@ 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 3023e714961d1b565d9e8659e07ccc4dab729f2f..1dcf41a4105c05c3182afa8585dee20723d2c136 100644 +index 4e192c98b7beb23ac75b7442883eba7bb98dc475..5678461976a07f9afecccb1d34ea3eec24fba80e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3589,9 +3589,10 @@ public abstract class LivingEntity extends Entity { +@@ -3611,9 +3611,10 @@ public abstract class LivingEntity extends Entity { this.triggerItemUseEffects(this.useItem, 16); // CraftBukkit start - fire PlayerItemConsumeEvent ItemStack itemstack; @@ -20,7 +20,7 @@ index 3023e714961d1b565d9e8659e07ccc4dab729f2f..1dcf41a4105c05c3182afa8585dee207 level.getCraftServer().getPluginManager().callEvent(event); if (event.isCancelled()) { -@@ -3605,6 +3606,13 @@ public abstract class LivingEntity extends Entity { +@@ -3627,6 +3628,13 @@ public abstract class LivingEntity extends Entity { } else { itemstack = this.useItem.finishUsingItem(this.level, this); } @@ -34,7 +34,7 @@ index 3023e714961d1b565d9e8659e07ccc4dab729f2f..1dcf41a4105c05c3182afa8585dee207 // CraftBukkit end if (itemstack != this.useItem) { -@@ -3612,6 +3620,11 @@ public abstract class LivingEntity extends Entity { +@@ -3634,6 +3642,11 @@ public abstract class LivingEntity extends Entity { } this.stopUsingItem(); diff --git a/patches/server/0077-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0077-handle-NaN-health-absorb-values-and-repair-bad-data.patch index 9e4b4b1cb..0abf12d2a 100644 --- a/patches/server/0077-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/patches/server/0077-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 1dcf41a4105c05c3182afa8585dee20723d2c136..54e7fa7a483e15c440f562559601292c2a064208 100644 +index 5678461976a07f9afecccb1d34ea3eec24fba80e..8dc6fbbdfaecf0eb38a876d87d77f111541f766d 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 { @@ -34,7 +34,7 @@ index 1dcf41a4105c05c3182afa8585dee20723d2c136..54e7fa7a483e15c440f562559601292c // CraftBukkit start - Handle scaled health if (this instanceof ServerPlayer) { org.bukkit.craftbukkit.entity.CraftPlayer player = ((ServerPlayer) this).getBukkitEntity(); -@@ -3422,7 +3432,7 @@ public abstract class LivingEntity extends Entity { +@@ -3444,7 +3454,7 @@ public abstract class LivingEntity extends Entity { } public void setAbsorptionAmount(float amount) { diff --git a/patches/server/0087-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0087-Add-PlayerUseUnknownEntityEvent.patch index 12ef7f289..fb434cc94 100644 --- a/patches/server/0087-Add-PlayerUseUnknownEntityEvent.patch +++ b/patches/server/0087-Add-PlayerUseUnknownEntityEvent.patch @@ -20,10 +20,10 @@ 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 6c0eac7f4fbf57ae1a777de651ef93f577dc9c3a..972f31be7c91aaaa3e959527ca28c706b9ab3028 100644 +index 9f0a5b950a022aa2a3d3d60837fdb9023f041a9b..b86f742c4a7500f0bb241d5c07a077aa1be1c7e5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2636,8 +2636,37 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2644,8 +2644,37 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic }); } } diff --git a/patches/server/0127-Properly-fix-item-duplication-bug.patch b/patches/server/0127-Properly-fix-item-duplication-bug.patch index 741501f77..07234fb00 100644 --- a/patches/server/0127-Properly-fix-item-duplication-bug.patch +++ b/patches/server/0127-Properly-fix-item-duplication-bug.patch @@ -19,10 +19,10 @@ index 4d8dfe375f5b3b9e5cfc12a6af0b87ae78f9b764..5d214b7dd4f6d7feff0a1904ce6573cf @Override diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index bfbd6a23a39cf96371ebabbe4a79036acfd3f4b2..846ca6e4437cc827584459511c3e119b35f9ba72 100644 +index 75bc0d9e8ec46d1fcfd6d5886d5ab03537e575d2..9df3561fca35b1649de1545e924bd96ec5f80089 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3275,7 +3275,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3283,7 +3283,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } public final boolean isDisconnected() { diff --git a/patches/server/0128-Firework-API-s.patch b/patches/server/0128-Firework-API-s.patch index cde42af88..ebac775a1 100644 --- a/patches/server/0128-Firework-API-s.patch +++ b/patches/server/0128-Firework-API-s.patch @@ -5,13 +5,13 @@ Subject: [PATCH] Firework API's diff --git a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java -index 4abcdc515411372006ff5d33510bdd64092c186a..5406925cd66f46ab8744123c670d72cea7bfc3a1 100644 +index ba13507263d78d34eb8d3038c437229c0469d476..61252ef8a79bac0ea2d3d231ec6b12166f39d072 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java +++ b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java @@ -39,6 +39,7 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier { public int lifetime; @Nullable - public LivingEntity attachedToEntity; + public LivingEntity attachedToEntity; // PAIL private -> public + public java.util.UUID spawningEntity; // Paper public FireworkRocketEntity(EntityType type, Level world) { @@ -74,10 +74,10 @@ index cdf35c5873f68245891241c0efa3bcf5658c3f6d..766af1f45b14654d3655a06ae0bfb0d4 if (!user.getAbilities().instabuild) { itemStack.shrink(1); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java -index 3a1c3d20ecc3612421e346edbbb74ab47f16a137..be86114eac3975b82ca74d4d6ed3f0402a642e8a 100644 +index 59d5c314711b4ec239e5bcb4272b11ed72705c5a..c242f654c88ca1773429348939d3bb2ffae3768c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java -@@ -78,4 +78,17 @@ public class CraftFirework extends CraftProjectile implements Firework { +@@ -135,4 +135,11 @@ public class CraftFirework extends CraftProjectile implements Firework { public void setShotAtAngle(boolean shotAtAngle) { this.getHandle().getEntityData().set(FireworkRocketEntity.DATA_SHOT_AT_ANGLE, shotAtAngle); } @@ -87,11 +87,5 @@ index 3a1c3d20ecc3612421e346edbbb74ab47f16a137..be86114eac3975b82ca74d4d6ed3f040 + public java.util.UUID getSpawningEntity() { + return getHandle().spawningEntity; + } -+ -+ @Override -+ public org.bukkit.entity.LivingEntity getBoostedEntity() { -+ net.minecraft.world.entity.LivingEntity boostedEntity = getHandle().attachedToEntity; -+ return boostedEntity != null ? (org.bukkit.entity.LivingEntity) boostedEntity.getBukkitEntity() : null; -+ } + // Paper end } diff --git a/patches/server/0132-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/server/0132-Don-t-allow-entities-to-ride-themselves-572.patch index 5f23a31a4..39dd67be9 100644 --- a/patches/server/0132-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/patches/server/0132-Don-t-allow-entities-to-ride-themselves-572.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Don't allow entities to ride themselves - #572 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 32d230dc6968306dd6e322ffd6a820380e3c88b1..f7a8c947ef639d0d9cf8e527f8a0072432cba0c5 100644 +index ac2b7e86afc21607564ddea62e39ec484e91bbf2..2d6d393ccdb6ed3aadc1e00a7a1a8dcb78277771 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2319,6 +2319,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2333,6 +2333,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } protected boolean addPassenger(Entity entity) { // CraftBukkit diff --git a/patches/server/0134-Cap-Entity-Collisions.patch b/patches/server/0134-Cap-Entity-Collisions.patch index 9fc626bec..ccec87a84 100644 --- a/patches/server/0134-Cap-Entity-Collisions.patch +++ b/patches/server/0134-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 f7a8c947ef639d0d9cf8e527f8a0072432cba0c5..a676fa481ad3e3ac60cf5ba9d86acd61bea329ca 100644 +index 2d6d393ccdb6ed3aadc1e00a7a1a8dcb78277771..55f1886761c7a528f0f1e371de546aff7707e60b 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,10 +24,10 @@ index f7a8c947ef639d0d9cf8e527f8a0072432cba0c5..a676fa481ad3e3ac60cf5ba9d86acd61 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 9f6629189a126c12a2d45098e12f41d8e45147a4..841149ffcdb2228fac3ac2bdc56c02ed26f219f6 100644 +index 45b76070d6a178ffb5cd378cbeb12342eab4f360..e711c02279ff48e76038a6281bbe8060e34d900b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3264,8 +3264,11 @@ public abstract class LivingEntity extends Entity { +@@ -3286,8 +3286,11 @@ public abstract class LivingEntity extends Entity { } } diff --git a/patches/server/0139-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0139-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index e20ee5f48..05b0e0072 100644 --- a/patches/server/0139-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/patches/server/0139-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -11,10 +11,10 @@ I suspect Mojang may switch to this behavior before full release. To be converted into a Paper-API event at some point in the future? diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 846ca6e4437cc827584459511c3e119b35f9ba72..db2db8156338eae296f085a60a91a29fe02ab050 100644 +index 9df3561fca35b1649de1545e924bd96ec5f80089..f8955429ec4cfe778de77a7db5fef624c20e4318 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2456,6 +2456,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2464,6 +2464,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic switch (packet.getAction()) { case PRESS_SHIFT_KEY: this.player.setShiftKeyDown(true); diff --git a/patches/server/0143-Item-canEntityPickup.patch b/patches/server/0143-Item-canEntityPickup.patch index 38236cc42..07b208cc7 100644 --- a/patches/server/0143-Item-canEntityPickup.patch +++ b/patches/server/0143-Item-canEntityPickup.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Item#canEntityPickup diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index c09f1ac470c4055897f8d6c6201bd8dc421cdbfe..049a9c4547428d7306d82ed35bcd470ae6f3efc3 100644 +index 0b056e65b2efe0f96a6beecfc41709bfa18983ca..6d0d194aaababd91a26dffc07f547d60eadd098e 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -629,6 +629,11 @@ public abstract class Mob extends LivingEntity { +@@ -635,6 +635,11 @@ public abstract class Mob extends LivingEntity { ItemEntity entityitem = (ItemEntity) iterator.next(); if (!entityitem.isRemoved() && !entityitem.getItem().isEmpty() && !entityitem.hasPickUpDelay() && this.wantsToPickUp(entityitem.getItem())) { diff --git a/patches/server/0149-Shoulder-Entities-Release-API.patch b/patches/server/0149-Shoulder-Entities-Release-API.patch index 23582ab7c..50587a494 100644 --- a/patches/server/0149-Shoulder-Entities-Release-API.patch +++ b/patches/server/0149-Shoulder-Entities-Release-API.patch @@ -58,10 +58,10 @@ index 07a8abb714a9dfd470ab0486c336e3b58ea927a1..d4e3649f4d66545842a7f8cd3dabad39 @Override public abstract boolean isSpectator(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 2c934b7a2142a4d1ae21feeb95d23f22cfda3be0..3954ed194388c6487c6cd0303aea9e1b65a0f8ee 100644 +index 19549dda26c24388bd13a5a2579789e2d1e3ad88..3ca0d08a9e6511b8a96abcf0807a77d52f303a44 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -@@ -504,6 +504,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { +@@ -507,6 +507,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { this.getHandle().getCooldowns().addCooldown(CraftMagicNumbers.getItem(material), ticks); } diff --git a/patches/server/0152-Entity-fromMobSpawner.patch b/patches/server/0152-Entity-fromMobSpawner.patch index fa68f366e..f29310bb6 100644 --- a/patches/server/0152-Entity-fromMobSpawner.patch +++ b/patches/server/0152-Entity-fromMobSpawner.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a676fa481ad3e3ac60cf5ba9d86acd61bea329ca..81fd2e443de0b85b340b48e66bc5fb0acad5d60a 100644 +index 55f1886761c7a528f0f1e371de546aff7707e60b..be1b7014a745a3f7ce6cb690c494bbb876e40fcc 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -380,6 +380,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -16,7 +16,7 @@ index a676fa481ad3e3ac60cf5ba9d86acd61bea329ca..81fd2e443de0b85b340b48e66bc5fb0a @javax.annotation.Nullable private org.bukkit.util.Vector origin; @javax.annotation.Nullable -@@ -1954,6 +1955,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1968,6 +1969,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } nbt.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ())); } @@ -27,7 +27,7 @@ index a676fa481ad3e3ac60cf5ba9d86acd61bea329ca..81fd2e443de0b85b340b48e66bc5fb0a // Paper end return nbt; } catch (Throwable throwable) { -@@ -2093,6 +2098,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2107,6 +2112,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.originWorld = originWorld; origin = new org.bukkit.util.Vector(originTag.getDouble(0), originTag.getDouble(1), originTag.getDouble(2)); } @@ -49,10 +49,10 @@ index e5b56a85d76d1417dda2d14b1b03850bbb070f4c..5304b0455b070006922e1b5471e9c0ab if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) { Entity vehicle = entity.getVehicle(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 8b4f1ef248d0b13927cbf634a0e2a97eb93c8ae4..5a8e31d3e1078559f17151a8f9a9cbaec58b1942 100644 +index b9599f4f431098d63be98b5175890371103f8813..d3a8c68f5186f69432fb8af8b34b174b04368fc1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1243,5 +1243,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1260,5 +1260,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { //noinspection ConstantConditions return originVector.toLocation(world); } diff --git a/patches/server/0158-LivingEntity-setKiller.patch b/patches/server/0158-LivingEntity-setKiller.patch index c8eb4f672..f70535120 100644 --- a/patches/server/0158-LivingEntity-setKiller.patch +++ b/patches/server/0158-LivingEntity-setKiller.patch @@ -5,25 +5,17 @@ Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index b65d44780c7e6e1e2e8724df838d1aa54edcc30a..6455a81fea0de79173419587171b5ed025c30592 100644 +index 4f4ee7071183e7eef918741e38c2bc2e522c72df..a08fd99fb97d8c880c855e6af2a99afcfa8098b5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -8,6 +8,7 @@ import java.util.Iterator; - import java.util.List; - import java.util.Set; - import java.util.UUID; -+import net.minecraft.server.level.ServerPlayer; - import net.minecraft.world.InteractionHand; - import net.minecraft.world.damagesource.DamageSource; - import net.minecraft.world.effect.MobEffect; -@@ -344,6 +345,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -347,6 +347,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { return this.getHandle().lastHurtByPlayer == null ? null : (Player) this.getHandle().lastHurtByPlayer.getBukkitEntity(); } + // Paper start + @Override + public void setKiller(Player killer) { -+ ServerPlayer entityPlayer = killer == null ? null : ((CraftPlayer) killer).getHandle(); ++ net.minecraft.server.level.ServerPlayer entityPlayer = killer == null ? null : ((CraftPlayer) killer).getHandle(); + getHandle().lastHurtByPlayer = entityPlayer; + getHandle().lastHurtByMob = entityPlayer; + getHandle().lastHurtByPlayerTime = entityPlayer == null ? 0 : 100; // 100 value taken from EntityLiving#damageEntity diff --git a/patches/server/0165-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0165-handle-ServerboundKeepAlivePacket-async.patch index e8b1181b6..bb33ae259 100644 --- a/patches/server/0165-handle-ServerboundKeepAlivePacket-async.patch +++ b/patches/server/0165-handle-ServerboundKeepAlivePacket-async.patch @@ -15,10 +15,10 @@ also adding some additional logging in order to help work out what is causing random disconnections for clients. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fddef0ba2ff963a242e457c4888dc801d1ea6920..95c0f5e429a0dd5075264d91c80f0016e7d330c5 100644 +index 32c4383cfb4cab6329d7046c48daf3050fa027c6..c4f1ded84ec1ed152faeb835a3f50b7e31356655 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3234,14 +3234,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3242,14 +3242,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleKeepAlive(ServerboundKeepAlivePacket packet) { diff --git a/patches/server/0169-Add-PlayerArmorChangeEvent.patch b/patches/server/0169-Add-PlayerArmorChangeEvent.patch index 6888a9977..fe028a5f3 100644 --- a/patches/server/0169-Add-PlayerArmorChangeEvent.patch +++ b/patches/server/0169-Add-PlayerArmorChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 841149ffcdb2228fac3ac2bdc56c02ed26f219f6..18d29125c19db2ffc3550a843ee9c3974b619f89 100644 +index e711c02279ff48e76038a6281bbe8060e34d900b..2eb002d6231dcb2a4bf4b1eb96ca4ecdb6d4bca2 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1,5 +1,6 @@ @@ -15,7 +15,7 @@ index 841149ffcdb2228fac3ac2bdc56c02ed26f219f6..18d29125c19db2ffc3550a843ee9c397 import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -@@ -2977,6 +2978,13 @@ public abstract class LivingEntity extends Entity { +@@ -2999,6 +3000,13 @@ public abstract class LivingEntity extends Entity { ItemStack itemstack1 = this.getItemBySlot(enumitemslot); if (!ItemStack.matches(itemstack1, itemstack)) { diff --git a/patches/server/0182-Add-ArmorStand-Item-Meta.patch b/patches/server/0182-Add-ArmorStand-Item-Meta.patch index 08077b513..e8f6a478f 100644 --- a/patches/server/0182-Add-ArmorStand-Item-Meta.patch +++ b/patches/server/0182-Add-ArmorStand-Item-Meta.patch @@ -13,11 +13,11 @@ starting point for future additions in this area. Fixes GH-559 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java -index 1b8be8a7103e09065a405a22d427b9a747fc1a3e..2afedf24e485dd36e95988843c70af880d679b1f 100644 +index 4017933f2244fca32cf9d39444f3a4f550e8af01..0c40a4a18cfc6f4ed6473a475f307f5c75ab56c5 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java -@@ -9,9 +9,22 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; - import org.bukkit.craftbukkit.inventory.CraftMetaItem.ItemMetaKey; +@@ -8,9 +8,22 @@ import org.bukkit.Material; + import org.bukkit.configuration.serialization.DelegateDeserialization; @DelegateDeserialization(CraftMetaItem.SerializableMeta.class) -public class CraftMetaArmorStand extends CraftMetaItem { @@ -40,7 +40,7 @@ index 1b8be8a7103e09065a405a22d427b9a747fc1a3e..2afedf24e485dd36e95988843c70af88 CompoundTag entityTag; CraftMetaArmorStand(CraftMetaItem meta) { -@@ -22,6 +35,13 @@ public class CraftMetaArmorStand extends CraftMetaItem { +@@ -21,6 +34,13 @@ public class CraftMetaArmorStand extends CraftMetaItem { } CraftMetaArmorStand armorStand = (CraftMetaArmorStand) meta; @@ -54,7 +54,7 @@ index 1b8be8a7103e09065a405a22d427b9a747fc1a3e..2afedf24e485dd36e95988843c70af88 this.entityTag = armorStand.entityTag; } -@@ -30,11 +50,39 @@ public class CraftMetaArmorStand extends CraftMetaItem { +@@ -29,11 +49,39 @@ public class CraftMetaArmorStand extends CraftMetaItem { if (tag.contains(ENTITY_TAG.NBT)) { this.entityTag = tag.getCompound(ENTITY_TAG.NBT).copy(); @@ -94,7 +94,7 @@ index 1b8be8a7103e09065a405a22d427b9a747fc1a3e..2afedf24e485dd36e95988843c70af88 } @Override -@@ -57,6 +105,31 @@ public class CraftMetaArmorStand extends CraftMetaItem { +@@ -56,6 +104,31 @@ public class CraftMetaArmorStand extends CraftMetaItem { void applyToItem(CompoundTag tag) { super.applyToItem(tag); @@ -126,7 +126,7 @@ index 1b8be8a7103e09065a405a22d427b9a747fc1a3e..2afedf24e485dd36e95988843c70af88 if (this.entityTag != null) { tag.put(ENTITY_TAG.NBT, entityTag); } -@@ -78,7 +151,7 @@ public class CraftMetaArmorStand extends CraftMetaItem { +@@ -72,7 +145,7 @@ public class CraftMetaArmorStand extends CraftMetaItem { } boolean isArmorStandEmpty() { @@ -135,7 +135,7 @@ index 1b8be8a7103e09065a405a22d427b9a747fc1a3e..2afedf24e485dd36e95988843c70af88 } @Override -@@ -89,7 +162,13 @@ public class CraftMetaArmorStand extends CraftMetaItem { +@@ -83,7 +156,13 @@ public class CraftMetaArmorStand extends CraftMetaItem { if (meta instanceof CraftMetaArmorStand) { CraftMetaArmorStand that = (CraftMetaArmorStand) meta; @@ -150,7 +150,7 @@ index 1b8be8a7103e09065a405a22d427b9a747fc1a3e..2afedf24e485dd36e95988843c70af88 } return true; } -@@ -104,9 +183,14 @@ public class CraftMetaArmorStand extends CraftMetaItem { +@@ -98,9 +177,14 @@ public class CraftMetaArmorStand extends CraftMetaItem { final int original; int hash = original = super.applyHash(); @@ -168,7 +168,7 @@ index 1b8be8a7103e09065a405a22d427b9a747fc1a3e..2afedf24e485dd36e95988843c70af88 return original != hash ? CraftMetaArmorStand.class.hashCode() ^ hash : hash; } -@@ -115,6 +199,28 @@ public class CraftMetaArmorStand extends CraftMetaItem { +@@ -109,6 +193,28 @@ public class CraftMetaArmorStand extends CraftMetaItem { Builder serialize(Builder builder) { super.serialize(builder); @@ -197,7 +197,7 @@ index 1b8be8a7103e09065a405a22d427b9a747fc1a3e..2afedf24e485dd36e95988843c70af88 return builder; } -@@ -128,4 +234,56 @@ public class CraftMetaArmorStand extends CraftMetaItem { +@@ -122,4 +228,56 @@ public class CraftMetaArmorStand extends CraftMetaItem { return clone; } diff --git a/patches/server/0195-Add-openSign-method-to-HumanEntity.patch b/patches/server/0195-Add-openSign-method-to-HumanEntity.patch index e3578a257..184a121d2 100644 --- a/patches/server/0195-Add-openSign-method-to-HumanEntity.patch +++ b/patches/server/0195-Add-openSign-method-to-HumanEntity.patch @@ -28,10 +28,10 @@ index 911843bf38ab750edd4a63417ba7a9deb6b64cb1..a0950f5902c3719dc31205ec43dca948 // Paper start diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 3954ed194388c6487c6cd0303aea9e1b65a0f8ee..4ff81744b7c9113f57cf1fa89bb943902711b2dc 100644 +index 3ca0d08a9e6511b8a96abcf0807a77d52f303a44..7ea4a2d4e691e0a0a4d9ef3189a29a4a4ca4374b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -@@ -614,6 +614,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { +@@ -617,6 +617,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { } } diff --git a/patches/server/0197-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0197-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index a4b6ac8df..1dffd9f0c 100644 --- a/patches/server/0197-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/patches/server/0197-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -5,10 +5,10 @@ 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 40a289c81bffc679d7c77052d4dbea25832d0acf..1dd0c9629d16bfaaebec61cbadf720d14902069d 100644 +index 90bd5c1a010a3a9d24328e5c719053603e206626..116dee1f1f9c489e6f85a8fa3b7f36267109d720 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3248,9 +3248,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3256,9 +3256,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic FilteredText filteredtext = (FilteredText) signText.get(i); if (this.player.isTextFilteringEnabled()) { diff --git a/patches/server/0211-Fix-CraftEntity-hashCode.patch b/patches/server/0211-Fix-CraftEntity-hashCode.patch index 26e3d9d00..c57f31a94 100644 --- a/patches/server/0211-Fix-CraftEntity-hashCode.patch +++ b/patches/server/0211-Fix-CraftEntity-hashCode.patch @@ -21,10 +21,10 @@ check is essentially the same as this.getHandle() == other.getHandle() However, replaced it too to make it clearer of intent. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 5a8e31d3e1078559f17151a8f9a9cbaec58b1942..f70cc39d7fdd9308fd328007fcadbaab1780ad5f 100644 +index d3a8c68f5186f69432fb8af8b34b174b04368fc1..2a4f26c5bae66121c5c21d7f1013b3b7753608a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -807,14 +807,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -824,14 +824,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return false; } final CraftEntity other = (CraftEntity) obj; diff --git a/patches/server/0214-Make-shield-blocking-delay-configurable.patch b/patches/server/0214-Make-shield-blocking-delay-configurable.patch index 6eb8e797d..a1c2cf010 100644 --- a/patches/server/0214-Make-shield-blocking-delay-configurable.patch +++ b/patches/server/0214-Make-shield-blocking-delay-configurable.patch @@ -5,10 +5,10 @@ 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 18d29125c19db2ffc3550a843ee9c3974b619f89..6e1484555eeceacf5a082ad16f1e7539f283fb8a 100644 +index 2eb002d6231dcb2a4bf4b1eb96ca4ecdb6d4bca2..3f2bf9e04b20b74a61d2cf1cadbecd36002d0edc 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3700,12 +3700,24 @@ public abstract class LivingEntity extends Entity { +@@ -3722,12 +3722,24 @@ public abstract class LivingEntity extends Entity { if (this.isUsingItem() && !this.useItem.isEmpty()) { Item item = this.useItem.getItem(); @@ -35,10 +35,10 @@ index 18d29125c19db2ffc3550a843ee9c3974b619f89..6e1484555eeceacf5a082ad16f1e7539 return this.isShiftKeyDown(); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 0bb285e50d7e327ad811d2d41a241928c5246774..268bbe892a70a829733bea8bf2a8b0f14ac70ad5 100644 +index a08fd99fb97d8c880c855e6af2a99afcfa8098b5..80efb900e37069f4ff39c35d39456959ca24bfe8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -744,5 +744,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -785,5 +785,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public void setArrowsStuck(int arrows) { getHandle().setArrowCount(arrows); } diff --git a/patches/server/0217-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0217-Implement-EntityKnockbackByEntityEvent.patch index 0cb31474a..e1f1a5019 100644 --- a/patches/server/0217-Implement-EntityKnockbackByEntityEvent.patch +++ b/patches/server/0217-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 6e1484555eeceacf5a082ad16f1e7539f283fb8a..f7a535c35dde266e82369a8cee67c6e58c178731 100644 +index 3f2bf9e04b20b74a61d2cf1cadbecd36002d0edc..84b6c2f73e0f6f3ad3969e7d51f6617e172764ec 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,10 +56,10 @@ index 6e1484555eeceacf5a082ad16f1e7539f283fb8a..f7a535c35dde266e82369a8cee67c6e5 } diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 049a9c4547428d7306d82ed35bcd470ae6f3efc3..95b042aed945adc72238ebeb19369d9b9568dc8d 100644 +index 6d0d194aaababd91a26dffc07f547d60eadd098e..ea836c55bad8b897e0fe0cad6d297b9b52209d69 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1573,7 +1573,7 @@ public abstract class Mob extends LivingEntity { +@@ -1579,7 +1579,7 @@ public abstract class Mob extends LivingEntity { if (flag) { if (f1 > 0.0F && target instanceof LivingEntity) { diff --git a/patches/server/0219-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0219-LivingEntity-Hand-Raised-Item-Use-API.patch index 11f27800f..d429d4ce3 100644 --- a/patches/server/0219-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/patches/server/0219-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -6,10 +6,10 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 268bbe892a70a829733bea8bf2a8b0f14ac70ad5..4d4d42fa1bb813b7f977770bfb93e4bc5ba8c2db 100644 +index 80efb900e37069f4ff39c35d39456959ca24bfe8..04829ced2048b07aa4b2dcf98a601d1fdd9431fb 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -754,5 +754,30 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -795,5 +795,30 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public void setShieldBlockingDelay(int delay) { getHandle().setShieldBlockingDelay(delay); } diff --git a/patches/server/0223-InventoryCloseEvent-Reason-API.patch b/patches/server/0223-InventoryCloseEvent-Reason-API.patch index 57aeaf9d2..600805782 100644 --- a/patches/server/0223-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0223-InventoryCloseEvent-Reason-API.patch @@ -75,7 +75,7 @@ index a214916ff80885af262165d5936b8bdf2056cbed..4b9af6ef008a297438bfc583025d235d 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 1dd0c9629d16bfaaebec61cbadf720d14902069d..1e6f3ea047c7cf94ee420c8c4eb3fe2f31d9b374 100644 +index 116dee1f1f9c489e6f85a8fa3b7f36267109d720..ea2f283634c8794bda3e531a20f39f8a17e3e41c 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; @@ -86,7 +86,7 @@ index 1dd0c9629d16bfaaebec61cbadf720d14902069d..1e6f3ea047c7cf94ee420c8c4eb3fe2f import org.bukkit.event.inventory.InventoryCreativeEvent; import org.bukkit.event.inventory.InventoryType.SlotType; import org.bukkit.event.inventory.SmithItemEvent; -@@ -2774,10 +2775,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2782,10 +2783,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleContainerClose(ServerboundContainerClosePacket packet) { @@ -144,10 +144,10 @@ index 702a5e524127f9655279a24b54b8d4248dec460e..2520ba136cf17392120f6187a73015f4 this.containerMenu = this.inventoryMenu; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 4ff81744b7c9113f57cf1fa89bb943902711b2dc..404ed5e8f54d70a50de4232c6ea0f6163b34c2ab 100644 +index 7ea4a2d4e691e0a0a4d9ef3189a29a4a4ca4374b..883b6245f44f3fb82d7678e1092177ca646d484a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -@@ -374,7 +374,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { +@@ -377,7 +377,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { if (((ServerPlayer) this.getHandle()).connection == null) return; if (this.getHandle().containerMenu != this.getHandle().inventoryMenu) { // fire INVENTORY_CLOSE if one already open @@ -156,7 +156,7 @@ index 4ff81744b7c9113f57cf1fa89bb943902711b2dc..404ed5e8f54d70a50de4232c6ea0f616 } ServerPlayer player = (ServerPlayer) this.getHandle(); AbstractContainerMenu container; -@@ -444,8 +444,14 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { +@@ -447,8 +447,14 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @Override public void closeInventory() { diff --git a/patches/server/0225-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0225-Refresh-player-inventory-when-cancelling-PlayerInter.patch index 63692348d..4879efd0d 100644 --- a/patches/server/0225-Refresh-player-inventory-when-cancelling-PlayerInter.patch +++ b/patches/server/0225-Refresh-player-inventory-when-cancelling-PlayerInter.patch @@ -16,10 +16,10 @@ 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 1e6f3ea047c7cf94ee420c8c4eb3fe2f31d9b374..60b29af5e48bed0b1d3749de8313e07b9d82e623 100644 +index ea2f283634c8794bda3e531a20f39f8a17e3e41c..a517eb45cd06c130cbfe6ff6565825c492079287 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2659,6 +2659,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2667,6 +2667,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } if (event.isCancelled()) { diff --git a/patches/server/0227-add-more-information-to-Entity.toString.patch b/patches/server/0227-add-more-information-to-Entity.toString.patch index b441179e4..6a094a84a 100644 --- a/patches/server/0227-add-more-information-to-Entity.toString.patch +++ b/patches/server/0227-add-more-information-to-Entity.toString.patch @@ -6,10 +6,10 @@ Subject: [PATCH] add more information to Entity.toString() UUID, ticks lived, valid, dead diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 81fd2e443de0b85b340b48e66bc5fb0acad5d60a..dd00721df47c84629cc5399dd558c531f6cea1cc 100644 +index be1b7014a745a3f7ce6cb690c494bbb876e40fcc..64261427c5f4abf1a4144eb88a6409560667f70b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2902,7 +2902,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2916,7 +2916,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public String toString() { String s = this.level == null ? "~NULL~" : this.level.toString(); diff --git a/patches/server/0260-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0260-Add-ray-tracing-methods-to-LivingEntity.patch index 5e366ff17..7f12ab44a 100644 --- a/patches/server/0260-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/patches/server/0260-Add-ray-tracing-methods-to-LivingEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 98cd851cdc67ecd9296ec5a8e56141638e108109..4bfccf77d68e8bcfb9b7379bf04a70515b1ebbcd 100644 +index 3e8867c317f7018780f44b62d0bd40fc9fa9ce9f..40d033e8b7c29269a5e194f80c8bccc67836e28d 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -508,6 +508,18 @@ public final class MCUtil { @@ -28,10 +28,10 @@ index 98cd851cdc67ecd9296ec5a8e56141638e108109..4bfccf77d68e8bcfb9b7379bf04a7051 switch (enumDirection) { case DOWN: diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f7a535c35dde266e82369a8cee67c6e58c178731..75f1d666d7e15cfad3935ba3aff6b68b6b6f992a 100644 +index 84b6c2f73e0f6f3ad3969e7d51f6617e172764ec..a6010e8ddf640a7045f95be04dfce26918d9cd3e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3721,6 +3721,23 @@ public abstract class LivingEntity extends Entity { +@@ -3743,6 +3743,23 @@ public abstract class LivingEntity extends Entity { } // Paper start @@ -56,10 +56,10 @@ index f7a535c35dde266e82369a8cee67c6e58c178731..75f1d666d7e15cfad3935ba3aff6b68b public int getShieldBlockingDelay() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 5c517025576461b426b4a73eea4369f00aeeee41..9c024b46522e2984ed662538302fbac68a77fd86 100644 +index 04829ced2048b07aa4b2dcf98a601d1fdd9431fb..40e777b859151d036ac7ec4e71ed896df4cd689b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -198,6 +198,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -200,6 +200,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { return blocks.get(0); } diff --git a/patches/server/0262-Improve-death-events.patch b/patches/server/0262-Improve-death-events.patch index f8f6f3fd1..9ae53b7aa 100644 --- a/patches/server/0262-Improve-death-events.patch +++ b/patches/server/0262-Improve-death-events.patch @@ -70,7 +70,7 @@ index 4b9af6ef008a297438bfc583025d235d07d9b780..6d95d572092ad50ffa92c2e1731fd59c } } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 75f1d666d7e15cfad3935ba3aff6b68b6b6f992a..ef1cc74bd09afe7228a78146ff1b8f368874dc70 100644 +index a6010e8ddf640a7045f95be04dfce26918d9cd3e..15af85ec11e40337338696c51083aef91591681b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity { @@ -220,10 +220,10 @@ index 75f1d666d7e15cfad3935ba3aff6b68b6b6f992a..ef1cc74bd09afe7228a78146ff1b8f36 // CraftBukkit start public int getExpReward() { diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 95b042aed945adc72238ebeb19369d9b9568dc8d..2ffc99730c3d5dbdec63881a1eca07d5fbb1754e 100644 +index ea836c55bad8b897e0fe0cad6d297b9b52209d69..37102e8cdaeb558e80889ff553656f14eaaeb650 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1012,7 +1012,13 @@ public abstract class Mob extends LivingEntity { +@@ -1018,7 +1018,13 @@ public abstract class Mob extends LivingEntity { } this.spawnAtLocation(itemstack); diff --git a/patches/server/0264-Mob-Pathfinding-API.patch b/patches/server/0264-Mob-Pathfinding-API.patch index 49c958043..099c7b8b0 100644 --- a/patches/server/0264-Mob-Pathfinding-API.patch +++ b/patches/server/0264-Mob-Pathfinding-API.patch @@ -163,10 +163,10 @@ index 4ad2ac8d1e9111933fa58c47442fa1f5e8173fd3..2a335f277bd0e4b8ad0f60d8226eb8aa public Path(List nodes, BlockPos target, boolean reachesTarget) { this.nodes = nodes; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index 55c27a3d9b540c4c4d7701bd0cdf167bb7af3dd4..28d6e31bfdf31d3e56024c731b833c4424313307 100644 +index 659ccb6532506b2a8c9feb55dc5aee962f6da795..f3e277dc79124d28e244d59e2a453748610e5ff9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -@@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable; +@@ -15,8 +15,11 @@ import org.bukkit.loot.LootTable; public abstract class CraftMob extends CraftLivingEntity implements Mob { public CraftMob(CraftServer server, net.minecraft.world.entity.Mob entity) { super(server, entity); diff --git a/patches/server/0275-Add-LivingEntity-getTargetEntity.patch b/patches/server/0275-Add-LivingEntity-getTargetEntity.patch index 42ee44744..938905a7c 100644 --- a/patches/server/0275-Add-LivingEntity-getTargetEntity.patch +++ b/patches/server/0275-Add-LivingEntity-getTargetEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index ef1cc74bd09afe7228a78146ff1b8f368874dc70..5dc45412d9251be9c8e516160b1aed9255968bbb 100644 +index 15af85ec11e40337338696c51083aef91591681b..369b2d92dbae896824b2e54cf30f8a607c43d451 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -116,6 +116,7 @@ import net.minecraft.world.level.storage.loot.LootTable; @@ -16,7 +16,7 @@ index ef1cc74bd09afe7228a78146ff1b8f368874dc70..5dc45412d9251be9c8e516160b1aed92 import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; import net.minecraft.world.scores.PlayerTeam; -@@ -3784,6 +3785,38 @@ public abstract class LivingEntity extends Entity { +@@ -3806,6 +3807,38 @@ public abstract class LivingEntity extends Entity { return level.clip(raytrace); } @@ -56,7 +56,7 @@ index ef1cc74bd09afe7228a78146ff1b8f368874dc70..5dc45412d9251be9c8e516160b1aed92 public int getShieldBlockingDelay() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 9c024b46522e2984ed662538302fbac68a77fd86..fb0e0c629d16bc97efc3e91f7ba6fe9e87fc950b 100644 +index 40e777b859151d036ac7ec4e71ed896df4cd689b..fb92f55ae3c8c54edce7565b27fb84f50ee85702 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1,5 +1,6 @@ @@ -66,7 +66,7 @@ index 9c024b46522e2984ed662538302fbac68a77fd86..fb0e0c629d16bc97efc3e91f7ba6fe9e import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import java.util.ArrayList; -@@ -218,6 +219,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -220,6 +221,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { new com.destroystokyo.paper.block.TargetBlockInfo(org.bukkit.craftbukkit.block.CraftBlock.at(getHandle().level, ((net.minecraft.world.phys.BlockHitResult)rayTrace).getBlockPos()), net.minecraft.server.MCUtil.toBukkitBlockFace(((net.minecraft.world.phys.BlockHitResult)rayTrace).getDirection())); } diff --git a/patches/server/0276-Add-sun-related-API.patch b/patches/server/0276-Add-sun-related-API.patch index e19d11236..483f2ac21 100644 --- a/patches/server/0276-Add-sun-related-API.patch +++ b/patches/server/0276-Add-sun-related-API.patch @@ -23,10 +23,10 @@ index ef0bff86d3f5f0c404f66b3e2e0a4976006909ee..3aa2e80e7d30d8824fd7f009282adfd8 public long getGameTime() { return world.levelData.getGameTime(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index 28d6e31bfdf31d3e56024c731b833c4424313307..881bb11507eafe87522ad4131ea7859f42918b3e 100644 +index f3e277dc79124d28e244d59e2a453748610e5ff9..206b4d187a486e2c8a3a36eacb2d33f9d2555fe8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -@@ -76,4 +76,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { +@@ -85,4 +85,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { public long getSeed() { return this.getHandle().lootTableSeed; } diff --git a/patches/server/0294-force-entity-dismount-during-teleportation.patch b/patches/server/0294-force-entity-dismount-during-teleportation.patch index 8f4bc21a2..c6c4c9f4f 100644 --- a/patches/server/0294-force-entity-dismount-during-teleportation.patch +++ b/patches/server/0294-force-entity-dismount-during-teleportation.patch @@ -41,10 +41,10 @@ index 4c35529c7ed67c2432ac67e7d8ffe295892757ff..f91da5bc234a8f1c120261823a1a4e42 if (entity1 != entity && this.connection != null) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 29c71c951ce7114dfb24f0c99c3bf8c2a6f6144f..cb2b47df90386ffb1305062f3f34a63549151e8b 100644 +index 0282b575d4ff68a306053f86b47908dd44dc54ed..424eed2daa3a9574cf1179a7f970f1565ea5fc71 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2315,11 +2315,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2329,11 +2329,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public void removeVehicle() { @@ -62,7 +62,7 @@ index 29c71c951ce7114dfb24f0c99c3bf8c2a6f6144f..cb2b47df90386ffb1305062f3f34a635 } } -@@ -2382,7 +2387,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2396,7 +2401,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return true; // CraftBukkit } @@ -74,7 +74,7 @@ index 29c71c951ce7114dfb24f0c99c3bf8c2a6f6144f..cb2b47df90386ffb1305062f3f34a635 if (entity.getVehicle() == this) { throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)"); } else { -@@ -2392,7 +2400,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2406,7 +2414,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (this.getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) { VehicleExitEvent event = new VehicleExitEvent( (Vehicle) this.getBukkitEntity(), @@ -83,7 +83,7 @@ index 29c71c951ce7114dfb24f0c99c3bf8c2a6f6144f..cb2b47df90386ffb1305062f3f34a635 ); // Suppress during worldgen if (this.valid) { -@@ -2406,7 +2414,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2420,7 +2428,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } // CraftBukkit end // Spigot start @@ -93,10 +93,10 @@ index 29c71c951ce7114dfb24f0c99c3bf8c2a6f6144f..cb2b47df90386ffb1305062f3f34a635 if (this.valid) { Bukkit.getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5dc45412d9251be9c8e516160b1aed9255968bbb..3aebd9999b1e0dba3405117a8223c99b35c7db12 100644 +index 369b2d92dbae896824b2e54cf30f8a607c43d451..1b907ca310ee217c9496f1b9a63d9cc694c177f0 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3382,9 +3382,15 @@ public abstract class LivingEntity extends Entity { +@@ -3404,9 +3404,15 @@ public abstract class LivingEntity extends Entity { @Override public void stopRiding() { diff --git a/patches/server/0306-Limit-Client-Sign-length-more.patch b/patches/server/0306-Limit-Client-Sign-length-more.patch index 998864a21..f357b73ac 100644 --- a/patches/server/0306-Limit-Client-Sign-length-more.patch +++ b/patches/server/0306-Limit-Client-Sign-length-more.patch @@ -22,7 +22,7 @@ it only impacts data sent from the client. Set -DPaper.maxSignLength=XX to change limit or -1 to disable diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c45910b192bcc6171a2ae98a525fdc7008c2185f..74d77d3dd5a7f05242d2105c8cfbe10b1a054a1f 100644 +index ac5f70ee86cc5a01b046e8e610434742448e3919..1c1ba459535296e029a8d39a5f78d60eb29cdb71 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -296,6 +296,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -33,7 +33,7 @@ index c45910b192bcc6171a2ae98a525fdc7008c2185f..74d77d3dd5a7f05242d2105c8cfbe10b public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player) { this.lastChatTimeStamp = new AtomicReference(Instant.EPOCH); -@@ -3288,7 +3289,19 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3296,7 +3297,19 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleSignUpdate(ServerboundSignUpdatePacket packet) { diff --git a/patches/server/0312-Entity-getEntitySpawnReason.patch b/patches/server/0312-Entity-getEntitySpawnReason.patch index ba1c9d222..fa232bad2 100644 --- a/patches/server/0312-Entity-getEntitySpawnReason.patch +++ b/patches/server/0312-Entity-getEntitySpawnReason.patch @@ -35,7 +35,7 @@ index 3cb257544d95e82f8de2d693f510c15980aa27c8..895d087fbdde840bd6b96b6c8d231fc9 }); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index cb2b47df90386ffb1305062f3f34a63549151e8b..482efc1c544cdd846f7330f4be43cc3e6eb397fc 100644 +index 424eed2daa3a9574cf1179a7f970f1565ea5fc71..a2a607e6ae867a4cabe1c2280154c99e93d0e7e9 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -74,6 +74,8 @@ import net.minecraft.world.InteractionHand; @@ -55,7 +55,7 @@ index cb2b47df90386ffb1305062f3f34a63549151e8b..482efc1c544cdd846f7330f4be43cc3e public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper private CraftEntity bukkitEntity; -@@ -1957,6 +1960,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1971,6 +1974,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } nbt.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ())); } @@ -65,7 +65,7 @@ index cb2b47df90386ffb1305062f3f34a63549151e8b..482efc1c544cdd846f7330f4be43cc3e // Save entity's from mob spawner status if (spawnedViaMobSpawner) { nbt.putBoolean("Paper.FromMobSpawner", true); -@@ -2102,6 +2108,26 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2116,6 +2122,26 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status @@ -105,10 +105,10 @@ index 0be0c7a323277093a6f8e476048eb9ee8712cbc9..c7e97263eee005fd673882e11c436542 // Spigot Start if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index f70cc39d7fdd9308fd328007fcadbaab1780ad5f..cd958bc3c00f53ebaf9b3ae39564d3abb6c819a1 100644 +index 2a4f26c5bae66121c5c21d7f1013b3b7753608a4..3bda8128c2956d817677e28ff87c9c5ed61c8bd2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1249,5 +1249,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1266,5 +1266,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public boolean fromMobSpawner() { return getHandle().spawnedViaMobSpawner; } diff --git a/patches/server/0313-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0313-Update-entity-Metadata-for-all-tracked-players.patch index a3b8d1788..3ddc7c5d0 100644 --- a/patches/server/0313-Update-entity-Metadata-for-all-tracked-players.patch +++ b/patches/server/0313-Update-entity-Metadata-for-all-tracked-players.patch @@ -22,10 +22,10 @@ index d6f34adbdf45bbef4a39e629dd7cb6d7fcb5db0f..7881176a900daa3306c691454f688c1f this.broadcast.accept(packet); if (this.entity instanceof ServerPlayer) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 74d77d3dd5a7f05242d2105c8cfbe10b1a054a1f..a93297667485c27721b3ef45042ea0d2466d0a61 100644 +index 1c1ba459535296e029a8d39a5f78d60eb29cdb71..9f60c0786b4676726036ca56906663698d26aaea 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2724,7 +2724,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2732,7 +2732,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic if (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem) { // Refresh the current entity metadata diff --git a/patches/server/0335-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0335-Prevent-consuming-the-wrong-itemstack.patch index 78e9ce8ae..6074727c0 100644 --- a/patches/server/0335-Prevent-consuming-the-wrong-itemstack.patch +++ b/patches/server/0335-Prevent-consuming-the-wrong-itemstack.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Prevent consuming the wrong itemstack diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3aebd9999b1e0dba3405117a8223c99b35c7db12..590b8af46f8e060aa568dde50025b4f4c6bb162e 100644 +index 1b907ca310ee217c9496f1b9a63d9cc694c177f0..df35685a016376fa056a8ecbfda2c01b38350b3c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3599,9 +3599,14 @@ public abstract class LivingEntity extends Entity { +@@ -3621,9 +3621,14 @@ public abstract class LivingEntity extends Entity { } public void startUsingItem(InteractionHand hand) { @@ -24,7 +24,7 @@ index 3aebd9999b1e0dba3405117a8223c99b35c7db12..590b8af46f8e060aa568dde50025b4f4 this.useItem = itemstack; this.useItemRemaining = itemstack.getUseDuration(); if (!this.level.isClientSide) { -@@ -3681,6 +3686,7 @@ public abstract class LivingEntity extends Entity { +@@ -3703,6 +3708,7 @@ public abstract class LivingEntity extends Entity { this.releaseUsingItem(); } else { if (!this.useItem.isEmpty() && this.isUsingItem()) { @@ -32,7 +32,7 @@ index 3aebd9999b1e0dba3405117a8223c99b35c7db12..590b8af46f8e060aa568dde50025b4f4 this.triggerItemUseEffects(this.useItem, 16); // CraftBukkit start - fire PlayerItemConsumeEvent ItemStack itemstack; -@@ -3715,8 +3721,8 @@ public abstract class LivingEntity extends Entity { +@@ -3737,8 +3743,8 @@ public abstract class LivingEntity extends Entity { } this.stopUsingItem(); diff --git a/patches/server/0336-Dont-send-unnecessary-sign-update.patch b/patches/server/0336-Dont-send-unnecessary-sign-update.patch index bfb40d62c..4d63dfa58 100644 --- a/patches/server/0336-Dont-send-unnecessary-sign-update.patch +++ b/patches/server/0336-Dont-send-unnecessary-sign-update.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Dont send unnecessary sign update diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 133d76c6a011d4c3f7ad037e535e8faa27f89874..ccd3ed84db4be3ee7b5d34de59a727c0c0ea677e 100644 +index 4ebae3246e3866bbdfa17e43bd0252d637885052..3af9f2d86cf2a9566e22865689101245647d05a5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3333,6 +3333,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3341,6 +3341,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic if (!tileentitysign.isEditable() || !this.player.getUUID().equals(tileentitysign.getPlayerWhoMayEdit())) { ServerGamePacketListenerImpl.LOGGER.warn("Player {} just tried to change non-editable sign", this.player.getName().getString()); diff --git a/patches/server/0338-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0338-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch deleted file mode 100644 index e1945e2b8..000000000 --- a/patches/server/0338-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Lukasz Derlatka -Date: Mon, 11 Nov 2019 16:08:13 +0100 -Subject: [PATCH] Fix AssertionError when player hand set to empty type - -Fixes an AssertionError when setting the player's item in hand to null or a new ItemStack of Air in PlayerInteractEvent -Fixes GH-2718 - -diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9d3a88ed093c5eda7a11133ebc97226c544fbd18..0df93b204ddf55a2a3b8af33d6a3273697eea91e 100644 ---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1870,6 +1870,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic - this.player.getBukkitEntity().updateInventory(); // SPIGOT-2524 - return; - } -+ // Paper start -+ itemstack = this.player.getItemInHand(enumhand); -+ if (itemstack.isEmpty()) return; -+ // Paper end - InteractionResult enuminteractionresult = this.player.gameMode.useItem(this.player, worldserver, itemstack, enumhand); - - if (enuminteractionresult.shouldSwing()) { diff --git a/patches/server/0339-Flat-bedrock-generator-settings.patch b/patches/server/0338-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0339-Flat-bedrock-generator-settings.patch rename to patches/server/0338-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0340-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0339-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0340-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/server/0339-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0341-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0340-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0341-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/server/0340-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0342-Duplicate-UUID-Resolve-Option.patch b/patches/server/0341-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/0342-Duplicate-UUID-Resolve-Option.patch rename to patches/server/0341-Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/0343-Optimize-Hoppers.patch b/patches/server/0342-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0343-Optimize-Hoppers.patch rename to patches/server/0342-Optimize-Hoppers.patch diff --git a/patches/server/0344-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0343-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/0344-PlayerDeathEvent-shouldDropExperience.patch rename to patches/server/0343-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/0345-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0344-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0345-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/server/0344-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0346-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0345-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0346-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/server/0345-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0347-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0346-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/0347-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/server/0346-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/0348-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0347-Optimise-IEntityAccess-getPlayerByUUID.patch similarity index 100% rename from patches/server/0348-Optimise-IEntityAccess-getPlayerByUUID.patch rename to patches/server/0347-Optimise-IEntityAccess-getPlayerByUUID.patch diff --git a/patches/server/0349-Fix-items-not-falling-correctly.patch b/patches/server/0348-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0349-Fix-items-not-falling-correctly.patch rename to patches/server/0348-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0350-Lag-compensate-eating.patch b/patches/server/0349-Lag-compensate-eating.patch similarity index 88% rename from patches/server/0350-Lag-compensate-eating.patch rename to patches/server/0349-Lag-compensate-eating.patch index 5e5385d34..2619ab0fc 100644 --- a/patches/server/0350-Lag-compensate-eating.patch +++ b/patches/server/0349-Lag-compensate-eating.patch @@ -7,10 +7,10 @@ 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 590b8af46f8e060aa568dde50025b4f4c6bb162e..383a892a5c34ec5e8f7d102f5a9bec11ae193c0e 100644 +index df35685a016376fa056a8ecbfda2c01b38350b3c..7e7128973153f4c3a737c1e956e41bab0e85c69a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3542,6 +3542,11 @@ public abstract class LivingEntity extends Entity { +@@ -3564,6 +3564,11 @@ public abstract class LivingEntity extends Entity { return ((Byte) this.entityData.get(LivingEntity.DATA_LIVING_ENTITY_FLAGS) & 2) > 0 ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND; } @@ -22,7 +22,7 @@ index 590b8af46f8e060aa568dde50025b4f4c6bb162e..383a892a5c34ec5e8f7d102f5a9bec11 private void updatingUsingItem() { if (this.isUsingItem()) { if (ItemStack.isSameIgnoreDurability(this.getItemInHand(this.getUsedItemHand()), this.useItem)) { -@@ -3559,8 +3564,12 @@ public abstract class LivingEntity extends Entity { +@@ -3581,8 +3586,12 @@ public abstract class LivingEntity extends Entity { if (this.shouldTriggerItemUseEffects()) { this.triggerItemUseEffects(stack, 5); } @@ -37,7 +37,7 @@ index 590b8af46f8e060aa568dde50025b4f4c6bb162e..383a892a5c34ec5e8f7d102f5a9bec11 this.completeUsingItem(); } -@@ -3608,7 +3617,10 @@ public abstract class LivingEntity extends Entity { +@@ -3630,7 +3639,10 @@ public abstract class LivingEntity extends Entity { if (!itemstack.isEmpty() && !this.isUsingItem() || forceUpdate) { // Paper use override flag this.useItem = itemstack; @@ -49,7 +49,7 @@ index 590b8af46f8e060aa568dde50025b4f4c6bb162e..383a892a5c34ec5e8f7d102f5a9bec11 if (!this.level.isClientSide) { this.setLivingEntityFlag(1, true); this.setLivingEntityFlag(2, hand == InteractionHand.OFF_HAND); -@@ -3633,7 +3645,10 @@ public abstract class LivingEntity extends Entity { +@@ -3655,7 +3667,10 @@ public abstract class LivingEntity extends Entity { } } else if (!this.isUsingItem() && !this.useItem.isEmpty()) { this.useItem = ItemStack.EMPTY; @@ -61,7 +61,7 @@ index 590b8af46f8e060aa568dde50025b4f4c6bb162e..383a892a5c34ec5e8f7d102f5a9bec11 } } -@@ -3766,7 +3781,10 @@ public abstract class LivingEntity extends Entity { +@@ -3788,7 +3803,10 @@ public abstract class LivingEntity extends Entity { } this.useItem = ItemStack.EMPTY; diff --git a/patches/server/0351-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0350-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0351-Optimize-call-to-getFluid-for-explosions.patch rename to patches/server/0350-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0352-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0351-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0352-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/server/0351-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0353-Add-effect-to-block-break-naturally.patch b/patches/server/0352-Add-effect-to-block-break-naturally.patch similarity index 100% rename from patches/server/0353-Add-effect-to-block-break-naturally.patch rename to patches/server/0352-Add-effect-to-block-break-naturally.patch diff --git a/patches/server/0354-Entity-Activation-Range-2.0.patch b/patches/server/0353-Entity-Activation-Range-2.0.patch similarity index 99% rename from patches/server/0354-Entity-Activation-Range-2.0.patch rename to patches/server/0353-Entity-Activation-Range-2.0.patch index 9dcdbe0ce..701c64d52 100644 --- a/patches/server/0354-Entity-Activation-Range-2.0.patch +++ b/patches/server/0353-Entity-Activation-Range-2.0.patch @@ -108,7 +108,7 @@ index 3cf5ad6a77659073b740a2be3946a39c110dd4b8..21fdca3b4bdc49d32deaf3f11d5fecc1 } else { passenger.stopRiding(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 482efc1c544cdd846f7330f4be43cc3e6eb397fc..022682dc729a2e595df09befc18d7d73143b7e74 100644 +index a2a607e6ae867a4cabe1c2280154c99e93d0e7e9..51fda8b02c6259540db220a55dd8ee1aa651a50c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -384,6 +384,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -144,7 +144,7 @@ index 482efc1c544cdd846f7330f4be43cc3e6eb397fc..022682dc729a2e595df09befc18d7d73 movement = this.maybeBackOffFromEdge(movement, movementType); Vec3 vec3d1 = this.collide(movement); diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 2ffc99730c3d5dbdec63881a1eca07d5fbb1754e..1a2e5e8c32a2fabe3b92ded6c630b8258b57bc0f 100644 +index 37102e8cdaeb558e80889ff553656f14eaaeb650..d7b137a84deea68c75ee0b3c99b089b8dff25947 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -210,6 +210,19 @@ public abstract class Mob extends LivingEntity { @@ -341,7 +341,7 @@ index 540c23f6297c34cf8e7bf8312ceaa5fc868f414c..2866385a64b22b7dc82b6122c62bcea6 + } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index e6bfc9cdf116b2233a638eec369a80eb8536aa18..4c1d34bd274d8e2a4003a286536652367da9488a 100644 +index 244035be96c5218a27e70c3f80ee9d7dcb4419d5..75e74a6bc0072eb9e77a0570d02d050ade0fa92d 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -158,6 +158,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0355-Increase-Light-Queue-Size.patch b/patches/server/0354-Increase-Light-Queue-Size.patch similarity index 100% rename from patches/server/0355-Increase-Light-Queue-Size.patch rename to patches/server/0354-Increase-Light-Queue-Size.patch diff --git a/patches/server/0356-Fix-Light-Command.patch b/patches/server/0355-Fix-Light-Command.patch similarity index 100% rename from patches/server/0356-Fix-Light-Command.patch rename to patches/server/0355-Fix-Light-Command.patch diff --git a/patches/server/0357-Anti-Xray.patch b/patches/server/0356-Anti-Xray.patch similarity index 99% rename from patches/server/0357-Anti-Xray.patch rename to patches/server/0356-Anti-Xray.patch index 646c29afb..d73ba252f 100644 --- a/patches/server/0357-Anti-Xray.patch +++ b/patches/server/0356-Anti-Xray.patch @@ -1132,7 +1132,7 @@ index 3fadf6b46cc722ad81cf810c0761cf717e9f9b78..af00442931f9f6cf878bd61137c2f29f public void destroyAndAck(BlockPos pos, int sequence, String reason) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 4c1d34bd274d8e2a4003a286536652367da9488a..8e5e773fffcb17d20328903d1b1fc9d9e0aefa3e 100644 +index 75e74a6bc0072eb9e77a0570d02d050ade0fa92d..7bd8ffb6bfba7f7188532ae3788701c08e1d624a 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -173,6 +173,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0358-Implement-alternative-item-despawn-rate.patch b/patches/server/0357-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0358-Implement-alternative-item-despawn-rate.patch rename to patches/server/0357-Implement-alternative-item-despawn-rate.patch diff --git a/patches/server/0359-Tracking-Range-Improvements.patch b/patches/server/0358-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0359-Tracking-Range-Improvements.patch rename to patches/server/0358-Tracking-Range-Improvements.patch diff --git a/patches/server/0360-Fix-items-vanishing-through-end-portal.patch b/patches/server/0359-Fix-items-vanishing-through-end-portal.patch similarity index 89% rename from patches/server/0360-Fix-items-vanishing-through-end-portal.patch rename to patches/server/0359-Fix-items-vanishing-through-end-portal.patch index 0ed6a4eaa..32e4e717c 100644 --- a/patches/server/0360-Fix-items-vanishing-through-end-portal.patch +++ b/patches/server/0359-Fix-items-vanishing-through-end-portal.patch @@ -13,10 +13,10 @@ Quickly loading the exact world spawn chunk before searching the heightmap resolves the issue without having to load all spawn chunks. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 022682dc729a2e595df09befc18d7d73143b7e74..240650cee26fc907f632e0c8ef3559a36460a3ba 100644 +index 51fda8b02c6259540db220a55dd8ee1aa651a50c..f94462c3aeec3a71b30de1834fb72934e77c35ac 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3109,6 +3109,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3123,6 +3123,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (flag1) { blockposition1 = ServerLevel.END_SPAWN_POINT; } else { diff --git a/patches/server/0361-implement-optional-per-player-mob-spawns.patch b/patches/server/0360-implement-optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/0361-implement-optional-per-player-mob-spawns.patch rename to patches/server/0360-implement-optional-per-player-mob-spawns.patch diff --git a/patches/server/0362-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0361-Avoid-hopper-searches-if-there-are-no-items.patch similarity index 100% rename from patches/server/0362-Avoid-hopper-searches-if-there-are-no-items.patch rename to patches/server/0361-Avoid-hopper-searches-if-there-are-no-items.patch diff --git a/patches/server/0363-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0362-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0363-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/server/0362-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0364-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0363-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/0364-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0363-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0365-Add-debug-for-sync-chunk-loads.patch b/patches/server/0364-Add-debug-for-sync-chunk-loads.patch similarity index 100% rename from patches/server/0365-Add-debug-for-sync-chunk-loads.patch rename to patches/server/0364-Add-debug-for-sync-chunk-loads.patch diff --git a/patches/server/0366-Remove-garbage-Java-version-check.patch b/patches/server/0365-Remove-garbage-Java-version-check.patch similarity index 100% rename from patches/server/0366-Remove-garbage-Java-version-check.patch rename to patches/server/0365-Remove-garbage-Java-version-check.patch diff --git a/patches/server/0367-Add-ThrownEggHatchEvent.patch b/patches/server/0366-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0367-Add-ThrownEggHatchEvent.patch rename to patches/server/0366-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0368-Entity-Jump-API.patch b/patches/server/0367-Entity-Jump-API.patch similarity index 92% rename from patches/server/0368-Entity-Jump-API.patch rename to patches/server/0367-Entity-Jump-API.patch index 20d793790..eb51ab24b 100644 --- a/patches/server/0368-Entity-Jump-API.patch +++ b/patches/server/0367-Entity-Jump-API.patch @@ -5,10 +5,10 @@ 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 383a892a5c34ec5e8f7d102f5a9bec11ae193c0e..878dd05e0a67a2c6bf48eab7f2d58bbfaf53d2d7 100644 +index 7e7128973153f4c3a737c1e956e41bab0e85c69a..a5b532a6051f9313bb5042bf61712015768b5426 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3218,8 +3218,10 @@ public abstract class LivingEntity extends Entity { +@@ -3240,8 +3240,10 @@ public abstract class LivingEntity extends Entity { } else if (this.isInLava() && (!this.onGround || d7 > d8)) { this.jumpInLiquid(FluidTags.LAVA); } else if ((this.onGround || flag && d7 <= d8) && this.noJumpDelay == 0) { @@ -48,10 +48,10 @@ index f747aa85beab98fbecdbe15b188be6614478bac6..a0eee7dc73bd4a96d9a1aa9555093820 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index ebebbd2536b9641b5b01d0e3fc060f89861eecdb..9887c98e3bc1c940f787328bfa2f6fcc22cbce1f 100644 +index fb92f55ae3c8c54edce7565b27fb84f50ee85702..ee6783220de6c3142810744a68fda51367589bd1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -829,5 +829,19 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -870,5 +870,19 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public org.bukkit.inventory.EquipmentSlot getHandRaised() { return getHandle().getUsedItemHand() == net.minecraft.world.InteractionHand.MAIN_HAND ? org.bukkit.inventory.EquipmentSlot.HAND : org.bukkit.inventory.EquipmentSlot.OFF_HAND; } diff --git a/patches/server/0369-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0368-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 91% rename from patches/server/0369-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0368-Add-option-to-nerf-pigmen-from-nether-portals.patch index 8f2b02bbb..a2cd3658b 100644 --- a/patches/server/0369-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/patches/server/0368-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 240650cee26fc907f632e0c8ef3559a36460a3ba..185f6dd93f325b638289acd723c6cbbbedac80e1 100644 +index f94462c3aeec3a71b30de1834fb72934e77c35ac..152c2f10a71c231a43a21e2016b040c785417589 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -386,6 +386,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -16,7 +16,7 @@ index 240650cee26fc907f632e0c8ef3559a36460a3ba..185f6dd93f325b638289acd723c6cbbb protected int numCollisions = 0; // Paper public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one @javax.annotation.Nullable -@@ -1978,6 +1979,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1992,6 +1993,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (spawnedViaMobSpawner) { nbt.putBoolean("Paper.FromMobSpawner", true); } @@ -26,7 +26,7 @@ index 240650cee26fc907f632e0c8ef3559a36460a3ba..185f6dd93f325b638289acd723c6cbbb // Paper end return nbt; } catch (Throwable throwable) { -@@ -2119,6 +2123,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2133,6 +2137,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status diff --git a/patches/server/0370-Make-the-GUI-graph-fancier.patch b/patches/server/0369-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0370-Make-the-GUI-graph-fancier.patch rename to patches/server/0369-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0371-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0370-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0371-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0370-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0372-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0371-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0372-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0371-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0373-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0372-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0373-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0372-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0374-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0373-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0374-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0373-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0375-Optimise-Chunk-getFluid.patch b/patches/server/0374-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0375-Optimise-Chunk-getFluid.patch rename to patches/server/0374-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0376-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0375-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0376-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0375-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0377-Add-tick-times-API-and-mspt-command.patch b/patches/server/0376-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0377-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0376-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0378-Expose-MinecraftServer-isRunning.patch b/patches/server/0377-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0378-Expose-MinecraftServer-isRunning.patch rename to patches/server/0377-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0379-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0378-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0379-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0378-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0380-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 100% rename from patches/server/0380-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch diff --git a/patches/server/0381-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0380-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0381-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0380-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0382-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0382-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/server/0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0383-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0383-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0384-Don-t-tick-dead-players.patch b/patches/server/0383-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0384-Don-t-tick-dead-players.patch rename to patches/server/0383-Don-t-tick-dead-players.patch diff --git a/patches/server/0385-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0385-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0386-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0385-Optimize-Collision-to-not-load-chunks.patch similarity index 98% rename from patches/server/0386-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0385-Optimize-Collision-to-not-load-chunks.patch index df1215538..e483706ce 100644 --- a/patches/server/0386-Optimize-Collision-to-not-load-chunks.patch +++ b/patches/server/0385-Optimize-Collision-to-not-load-chunks.patch @@ -26,7 +26,7 @@ index d362c9c83a73b5f49b54563b423c76c8ed78dfc6..256bd12178c8dca2889fbcedb9327cc4 entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ()); } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 185f6dd93f325b638289acd723c6cbbbedac80e1..001c1d55218671eaa9cee28ae42d756f352ff2fa 100644 +index 152c2f10a71c231a43a21e2016b040c785417589..a1f176432b366b5f106a32ca571d7ea617b19fd3 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -236,6 +236,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0387-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0386-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/0387-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0386-Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/0388-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0387-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0388-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0387-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0389-Improved-Watchdog-Support.patch b/patches/server/0388-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/0389-Improved-Watchdog-Support.patch rename to patches/server/0388-Improved-Watchdog-Support.patch diff --git a/patches/server/0390-Optimize-Pathfinding.patch b/patches/server/0389-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0390-Optimize-Pathfinding.patch rename to patches/server/0389-Optimize-Pathfinding.patch diff --git a/patches/server/0391-Reduce-Either-Optional-allocation.patch b/patches/server/0390-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0391-Reduce-Either-Optional-allocation.patch rename to patches/server/0390-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0392-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0391-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0392-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0391-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0393-Prevent-opening-inventories-when-frozen.patch b/patches/server/0392-Prevent-opening-inventories-when-frozen.patch similarity index 94% rename from patches/server/0393-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0392-Prevent-opening-inventories-when-frozen.patch index 8c7b292e0..5e7ef9485 100644 --- a/patches/server/0393-Prevent-opening-inventories-when-frozen.patch +++ b/patches/server/0392-Prevent-opening-inventories-when-frozen.patch @@ -27,10 +27,10 @@ index 61f97fab1e0e3d6c9206c397cecfff868cf0d9d2..227bcd9c1cfcc6bf8dedacdca28731a8 this.initMenu(container); return OptionalInt.of(this.containerCounter); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 404ed5e8f54d70a50de4232c6ea0f6163b34c2ab..3866c466fcc40f17f88063acb939f9091708a92f 100644 +index 883b6245f44f3fb82d7678e1092177ca646d484a..f5f30e1408892b4e728053bc5005e551396583a5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -@@ -323,7 +323,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { +@@ -326,7 +326,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { if (adventure$title == null) adventure$title = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(container.getBukkitView().getTitle()); // Paper //player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, CraftChatMessage.fromString(title)[0])); // Paper - comment @@ -39,7 +39,7 @@ index 404ed5e8f54d70a50de4232c6ea0f6163b34c2ab..3866c466fcc40f17f88063acb939f909 player.containerMenu = container; player.initMenu(container); } -@@ -397,7 +397,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { +@@ -400,7 +400,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { net.kyori.adventure.text.Component adventure$title = inventory.title(); // Paper if (adventure$title == null) adventure$title = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(inventory.getTitle()); // Paper //player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, CraftChatMessage.fromString(title)[0])); // Paper - comment diff --git a/patches/server/0394-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0393-Optimise-ArraySetSorted-removeIf.patch similarity index 100% rename from patches/server/0394-Optimise-ArraySetSorted-removeIf.patch rename to patches/server/0393-Optimise-ArraySetSorted-removeIf.patch diff --git a/patches/server/0395-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0394-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 90% rename from patches/server/0395-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0394-Don-t-run-entity-collision-code-if-not-needed.patch index 17bc39fe8..11403f5b9 100644 --- a/patches/server/0395-Don-t-run-entity-collision-code-if-not-needed.patch +++ b/patches/server/0394-Don-t-run-entity-collision-code-if-not-needed.patch @@ -7,10 +7,10 @@ Will not run if max entity craming is disabled and the max collisions per entity is less than or equal to 0 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 878dd05e0a67a2c6bf48eab7f2d58bbfaf53d2d7..b3b3b163fb1a506fb048dba173517eeeaf2f8007 100644 +index a5b532a6051f9313bb5042bf61712015768b5426..9a7d2b0d84ce422afa96b5c07c972e52c6ac00ed 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3315,10 +3315,16 @@ public abstract class LivingEntity extends Entity { +@@ -3337,10 +3337,16 @@ public abstract class LivingEntity extends Entity { protected void serverAiStep() {} protected void pushEntities() { diff --git a/patches/server/0396-Implement-Player-Client-Options-API.patch b/patches/server/0395-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0396-Implement-Player-Client-Options-API.patch rename to patches/server/0395-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0397-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0396-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0397-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0396-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0398-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0397-Fix-Chunk-Post-Processing-deadlock-risk.patch similarity index 100% rename from patches/server/0398-Fix-Chunk-Post-Processing-deadlock-risk.patch rename to patches/server/0397-Fix-Chunk-Post-Processing-deadlock-risk.patch diff --git a/patches/server/0399-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0398-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 100% rename from patches/server/0399-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0398-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch diff --git a/patches/server/0400-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0399-Load-Chunks-for-Login-Asynchronously.patch similarity index 99% rename from patches/server/0400-Load-Chunks-for-Login-Asynchronously.patch rename to patches/server/0399-Load-Chunks-for-Login-Asynchronously.patch index 8b3c65864..0495ef9ab 100644 --- a/patches/server/0400-Load-Chunks-for-Login-Asynchronously.patch +++ b/patches/server/0399-Load-Chunks-for-Login-Asynchronously.patch @@ -57,7 +57,7 @@ index 478109526cff7ceb0565cea3b5e97b9a07fbf8d1..3c1698ba0d3bc412ab957777d9b5211d public static final TicketType UNKNOWN = TicketType.create("unknown", Comparator.comparingLong(ChunkPos::toLong), 1); public static final TicketType PLUGIN = TicketType.create("plugin", (a, b) -> 0); // CraftBukkit diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0df93b204ddf55a2a3b8af33d6a3273697eea91e..88d4c2a9c628d32f1633a376eff37c3e6ae33a72 100644 +index 3af9f2d86cf2a9566e22865689101245647d05a5..fe722106e20e199eb914a09f8dbc1409e27f1d69 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -346,6 +346,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0401-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0400-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 89% rename from patches/server/0401-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0400-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch index 0a1150e1e..bd671c550 100644 --- a/patches/server/0401-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch +++ b/patches/server/0400-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch @@ -7,10 +7,10 @@ The code following this has better support for null worlds to move them back to the world spawn. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 001c1d55218671eaa9cee28ae42d756f352ff2fa..1b8f7bd5dd85136788b02cef64353d581cdf2108 100644 +index a1f176432b366b5f106a32ca571d7ea617b19fd3..69aef07129201308ae275434b754977c6ece5dd7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2096,9 +2096,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2110,9 +2110,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { bworld = server.getWorld(worldName); } diff --git a/patches/server/0402-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0401-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 92% rename from patches/server/0402-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0401-Add-PlayerAttackEntityCooldownResetEvent.patch index 98d462b59..9c571cf10 100644 --- a/patches/server/0402-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/patches/server/0401-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -5,10 +5,10 @@ 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 b3b3b163fb1a506fb048dba173517eeeaf2f8007..1eb53dd9c0ddef725e96aa7d5f6e335fb48eec9e 100644 +index 9a7d2b0d84ce422afa96b5c07c972e52c6ac00ed..e3d686ea473c1bd38af9ed181020110ee3d94f64 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2090,7 +2090,16 @@ public abstract class LivingEntity extends Entity { +@@ -2112,7 +2112,16 @@ public abstract class LivingEntity extends Entity { EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, originalDamage, hardHatModifier, blockingModifier, armorModifier, resistanceModifier, magicModifier, absorptionModifier, hardHat, blocking, armor, resistance, magic, absorption); if (damagesource.getEntity() instanceof net.minecraft.world.entity.player.Player) { diff --git a/patches/server/0403-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0402-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0403-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0402-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0404-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0403-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0404-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0403-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0405-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0404-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 95% rename from patches/server/0405-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0404-Fix-numerous-item-duplication-issues-and-teleport-is.patch index e5cb8f7d9..2cb660b24 100644 --- a/patches/server/0405-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/patches/server/0404-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -16,10 +16,10 @@ So even if something NEW comes up, it would be impossible to drop the same item twice because the source was destroyed. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1b8f7bd5dd85136788b02cef64353d581cdf2108..74e13ae8b1e6a9365d46f5684ee58e42658d2341 100644 +index 69aef07129201308ae275434b754977c6ece5dd7..8bdcf56a5a1c29f78e10f66de5adf5a3786ac092 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2226,11 +2226,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2240,11 +2240,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } else { // CraftBukkit start - Capture drops for death event if (this instanceof net.minecraft.world.entity.LivingEntity && !((net.minecraft.world.entity.LivingEntity) this).forceDrops) { @@ -34,7 +34,7 @@ index 1b8f7bd5dd85136788b02cef64353d581cdf2108..74e13ae8b1e6a9365d46f5684ee58e42 entityitem.setDefaultPickUpDelay(); // CraftBukkit start -@@ -2994,6 +2995,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3008,6 +3009,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @Nullable public Entity teleportTo(ServerLevel worldserver, PositionImpl location) { // CraftBukkit end @@ -47,7 +47,7 @@ index 1b8f7bd5dd85136788b02cef64353d581cdf2108..74e13ae8b1e6a9365d46f5684ee58e42 if (this.level instanceof ServerLevel && !this.isRemoved()) { this.level.getProfiler().push("changeDimension"); // CraftBukkit start -@@ -3020,6 +3027,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3034,6 +3041,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // CraftBukkit end this.level.getProfiler().popPush("reloading"); @@ -59,7 +59,7 @@ index 1b8f7bd5dd85136788b02cef64353d581cdf2108..74e13ae8b1e6a9365d46f5684ee58e42 Entity entity = this.getType().create(worldserver); if (entity != null) { -@@ -3033,10 +3045,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3047,10 +3059,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // CraftBukkit start - Forward the CraftEntity to the new entity this.getBukkitEntity().setHandle(entity); entity.bukkitEntity = this.getBukkitEntity(); @@ -70,7 +70,7 @@ index 1b8f7bd5dd85136788b02cef64353d581cdf2108..74e13ae8b1e6a9365d46f5684ee58e42 // CraftBukkit end } -@@ -3157,7 +3165,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3171,7 +3179,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public boolean canChangeDimensions() { @@ -80,7 +80,7 @@ index 1b8f7bd5dd85136788b02cef64353d581cdf2108..74e13ae8b1e6a9365d46f5684ee58e42 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 1eb53dd9c0ddef725e96aa7d5f6e335fb48eec9e..4a2a8566c9d68f21a98774fcecac0f4fa43d88c4 100644 +index e3d686ea473c1bd38af9ed181020110ee3d94f64..37d51104a7d38c2d16ae38a9adcbe37597c94fe2 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1643,9 +1643,9 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0406-Villager-Restocks-API.patch b/patches/server/0405-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0406-Villager-Restocks-API.patch rename to patches/server/0405-Villager-Restocks-API.patch diff --git a/patches/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0406-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 95% rename from patches/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0406-Validate-PickItem-Packet-and-kick-for-invalid.patch index 73612dfd5..a84ea8c5a 100644 --- a/patches/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch +++ b/patches/server/0406-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 88d4c2a9c628d32f1633a376eff37c3e6ae33a72..dac18223143ea10054787f8954744311be7df7aa 100644 +index fe722106e20e199eb914a09f8dbc1409e27f1d69..77cc62cc942687a40371741904525301a4ed5240 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/0408-Expose-game-version.patch b/patches/server/0407-Expose-game-version.patch similarity index 100% rename from patches/server/0408-Expose-game-version.patch rename to patches/server/0407-Expose-game-version.patch diff --git a/patches/server/0409-Optimize-Voxel-Shape-Merging.patch b/patches/server/0408-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0409-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0408-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0410-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0409-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 93% rename from patches/server/0410-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0409-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch index 6c54f8368..6e0cb176e 100644 --- a/patches/server/0410-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch +++ b/patches/server/0409-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch @@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache. Set system properly at server startup if not set already to help protect from this. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 987bc4577190d827718b5144656aaddf22599cab..5b48047242e20c216b110502935763ea433c55cd 100644 +index cce6886bb3973eed8f0c7ca7b1189547324fd4e2..0aef4fc4a89e627bc80504d7402f1ca2cdc95a74 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -28,6 +28,7 @@ public class Main { diff --git a/patches/server/0411-misc-debugging-dumps.patch b/patches/server/0410-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0411-misc-debugging-dumps.patch rename to patches/server/0410-misc-debugging-dumps.patch diff --git a/patches/server/0412-Prevent-teleporting-dead-entities.patch b/patches/server/0411-Prevent-teleporting-dead-entities.patch similarity index 92% rename from patches/server/0412-Prevent-teleporting-dead-entities.patch rename to patches/server/0411-Prevent-teleporting-dead-entities.patch index 526b593a8..bce03a0bd 100644 --- a/patches/server/0412-Prevent-teleporting-dead-entities.patch +++ b/patches/server/0411-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 dac18223143ea10054787f8954744311be7df7aa..245c1ff9fe02a6f8fe1f320e2a751c7579425b1f 100644 +index 77cc62cc942687a40371741904525301a4ed5240..bbed54d5a0e3c363614d694950688f8edc02841d 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/0413-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0412-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/server/0413-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/server/0412-Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/server/0414-Implement-Mob-Goal-API.patch b/patches/server/0413-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0414-Implement-Mob-Goal-API.patch rename to patches/server/0413-Implement-Mob-Goal-API.patch diff --git a/patches/server/0415-Add-villager-reputation-API.patch b/patches/server/0414-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0415-Add-villager-reputation-API.patch rename to patches/server/0414-Add-villager-reputation-API.patch diff --git a/patches/server/0416-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0415-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/0416-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0415-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0417-ExperienceOrbMergeEvent.patch b/patches/server/0416-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0417-ExperienceOrbMergeEvent.patch rename to patches/server/0416-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0418-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0417-Fix-PotionEffect-ignores-icon-flag.patch similarity index 87% rename from patches/server/0418-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0417-Fix-PotionEffect-ignores-icon-flag.patch index e542865e6..1091a96ab 100644 --- a/patches/server/0418-Fix-PotionEffect-ignores-icon-flag.patch +++ b/patches/server/0417-Fix-PotionEffect-ignores-icon-flag.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix PotionEffect ignores icon flag diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index be1540b0a5f95f8a85f91d5fe398cd2cf8832ec4..639d376bf382409410e26385134d36fd6e3b5f0c 100644 +index ee6783220de6c3142810744a68fda51367589bd1..55881c189e96bccd6538dfb6b4ea897b72d3936d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -412,7 +412,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -414,7 +414,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @Override public boolean addPotionEffect(PotionEffect effect, boolean force) { diff --git a/patches/server/0419-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0418-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0419-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0418-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0420-Potential-bed-API.patch b/patches/server/0419-Potential-bed-API.patch similarity index 92% rename from patches/server/0420-Potential-bed-API.patch rename to patches/server/0419-Potential-bed-API.patch index d63e2bb9e..633d9baf8 100644 --- a/patches/server/0420-Potential-bed-API.patch +++ b/patches/server/0419-Potential-bed-API.patch @@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 3866c466fcc40f17f88063acb939f9091708a92f..3a14cc3d0d692c8bbc90de1b1c5731158b1323e5 100644 +index f5f30e1408892b4e728053bc5005e551396583a5..15f6e1c04fefa1334301534646b8ed2535d16fa9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -12,6 +12,7 @@ import net.minecraft.nbt.CompoundTag; @@ -19,7 +19,7 @@ index 3866c466fcc40f17f88063acb939f9091708a92f..3a14cc3d0d692c8bbc90de1b1c573115 import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.MenuProvider; import net.minecraft.world.entity.Entity; -@@ -126,6 +127,22 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { +@@ -129,6 +130,22 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { return this.getHandle().sleepCounter; } diff --git a/patches/server/0421-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0420-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0421-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0420-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0422-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0421-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0422-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/server/0421-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0423-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0422-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 99% rename from patches/server/0423-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0422-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch index f775181ba..de3bd7b05 100644 --- a/patches/server/0423-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch +++ b/patches/server/0422-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch @@ -34,7 +34,7 @@ index 38bb502e9f1272020a23a3ef8ebb0cb1a5a251ef..b18b0e1b5e059f08fd3117eaa0fb28a1 this.level.getProfiler().push("explosion_blocks"); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index c488e069a19d4bf082c94032571fcc77c0bada50..d5e80a0d953e7792669f21011bc685adaec78464 100644 +index 4c93c2ee69c2728d798a750981275f4fc6840525..160a3cb1d70f765d277169bb4928238b6a575f26 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -429,6 +429,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0424-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0423-Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from patches/server/0424-Reduce-MutableInt-allocations-from-light-engine.patch rename to patches/server/0423-Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/patches/server/0425-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0424-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0425-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0424-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0426-Ensure-safe-gateway-teleport.patch b/patches/server/0425-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0426-Ensure-safe-gateway-teleport.patch rename to patches/server/0425-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0427-Add-option-for-console-having-all-permissions.patch b/patches/server/0426-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0427-Add-option-for-console-having-all-permissions.patch rename to patches/server/0426-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0428-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0427-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 100% rename from patches/server/0428-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/server/0427-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch diff --git a/patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0428-Use-distance-map-to-optimise-entity-tracker.patch similarity index 99% rename from patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/server/0428-Use-distance-map-to-optimise-entity-tracker.patch index 6b7c2e2af..28b5efb45 100644 --- a/patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch +++ b/patches/server/0428-Use-distance-map-to-optimise-entity-tracker.patch @@ -280,7 +280,7 @@ index 43ad735f57ab513311d700b42d7d0f2f1e43d0e7..b0e0f85e04438affb8d8e0f75055ea83 return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false; } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 74e13ae8b1e6a9365d46f5684ee58e42658d2341..0a0fb24cd12d77e0c29eb6e0a20eacfc04330bf3 100644 +index 8bdcf56a5a1c29f78e10f66de5adf5a3786ac092..afe081b095bb53c7a1a1d2145e60b8b5426d2ce0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -57,6 +57,7 @@ import net.minecraft.network.syncher.EntityDataSerializers; diff --git a/patches/server/0430-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0429-Optimize-ServerLevels-chunk-level-checking-methods.patch similarity index 100% rename from patches/server/0430-Optimize-ServerLevels-chunk-level-checking-methods.patch rename to patches/server/0429-Optimize-ServerLevels-chunk-level-checking-methods.patch diff --git a/patches/server/0431-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0430-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0431-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0430-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0432-Maps-shouldn-t-load-chunks.patch b/patches/server/0431-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0432-Maps-shouldn-t-load-chunks.patch rename to patches/server/0431-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0433-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0432-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0433-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/server/0432-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0434-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0433-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0434-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0433-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0435-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0434-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0435-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0434-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0436-Fix-sand-duping.patch b/patches/server/0435-Fix-sand-duping.patch similarity index 100% rename from patches/server/0436-Fix-sand-duping.patch rename to patches/server/0435-Fix-sand-duping.patch diff --git a/patches/server/0437-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0436-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0437-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0436-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0438-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0437-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 94% rename from patches/server/0438-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0437-Prevent-position-desync-in-playerconnection-causing-.patch index 8abc2018d..ba844e85b 100644 --- a/patches/server/0438-Prevent-position-desync-in-playerconnection-causing-.patch +++ b/patches/server/0437-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 245c1ff9fe02a6f8fe1f320e2a751c7579425b1f..0885f265cadb1ebc1f6bdfcd2a39502b0617f185 100644 +index bbed54d5a0e3c363614d694950688f8edc02841d..30a69fa8f8266909fe98bea7ea781789c74bf50b 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/0439-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0438-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0439-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0438-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0440-Improve-Arrow-API.patch b/patches/server/0439-Improve-Arrow-API.patch similarity index 100% rename from patches/server/0440-Improve-Arrow-API.patch rename to patches/server/0439-Improve-Arrow-API.patch diff --git a/patches/server/0441-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0440-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 92% rename from patches/server/0441-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0440-Add-and-implement-PlayerRecipeBookClickEvent.patch index da6eb3b6c..c067c44ca 100644 --- a/patches/server/0441-Add-and-implement-PlayerRecipeBookClickEvent.patch +++ b/patches/server/0440-Add-and-implement-PlayerRecipeBookClickEvent.patch @@ -5,10 +5,10 @@ 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 fd2358003a400ec5229721c22160d9c80ad67858..b00c66e68cb457ddedcde2ed7b0be791ffd78718 100644 +index 30a69fa8f8266909fe98bea7ea781789c74bf50b..b7865696d9b939791b0315ab2a231e2dc5872de8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3224,9 +3224,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3228,9 +3228,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic if (!this.player.containerMenu.stillValid(this.player)) { ServerGamePacketListenerImpl.LOGGER.debug("Player {} interacted with invalid menu {}", this.player, this.player.containerMenu); } else { diff --git a/patches/server/0442-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0441-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0442-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0441-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0443-Add-permission-for-command-blocks.patch b/patches/server/0442-Add-permission-for-command-blocks.patch similarity index 98% rename from patches/server/0443-Add-permission-for-command-blocks.patch rename to patches/server/0442-Add-permission-for-command-blocks.patch index 4acfd8ed3..a0bcd3db1 100644 --- a/patches/server/0443-Add-permission-for-command-blocks.patch +++ b/patches/server/0442-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 2da61f9cc0f930538348bc185063c3d7dfeeb3b2..02635061fe59156a1c94ad3bf05d2fc534a8cf29 100644 +index b7865696d9b939791b0315ab2a231e2dc5872de8..02b6cf65f6abedfd4933e4e64d254f190e061301 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/0444-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0443-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 89% rename from patches/server/0444-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0443-Ensure-Entity-AABB-s-are-never-invalid.patch index 756a326a3..8dc151efd 100644 --- a/patches/server/0444-Ensure-Entity-AABB-s-are-never-invalid.patch +++ b/patches/server/0443-Ensure-Entity-AABB-s-are-never-invalid.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 0a0fb24cd12d77e0c29eb6e0a20eacfc04330bf3..7e36e53d44b5efbd6498caecb717bec1dcbec96d 100644 +index afe081b095bb53c7a1a1d2145e60b8b5426d2ce0..3ebe5297aa2fde1cb347f738738f5d74f6a61b9a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -662,8 +662,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -19,7 +19,7 @@ index 0a0fb24cd12d77e0c29eb6e0a20eacfc04330bf3..7e36e53d44b5efbd6498caecb717bec1 } protected AABB makeBoundingBox() { -@@ -3870,6 +3870,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3884,6 +3884,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public final void setPosRaw(double x, double y, double z) { @@ -31,7 +31,7 @@ index 0a0fb24cd12d77e0c29eb6e0a20eacfc04330bf3..7e36e53d44b5efbd6498caecb717bec1 if (this.position.x != x || this.position.y != y || this.position.z != z) { this.position = new Vec3(x, y, z); int i = Mth.floor(x); -@@ -3887,6 +3892,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3901,6 +3906,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.levelCallback.onMove(); } diff --git a/patches/server/0445-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0444-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 98% rename from patches/server/0445-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0444-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index 014961923..f734c3b46 100644 --- a/patches/server/0445-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/server/0444-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -89,10 +89,10 @@ index 29a03760f092a004a47e75120841d80e696b6c3d..be7d2275548936beade4aba02dc5b14f 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 2cce979398f1e15811356941f89d15ca4463ebd5..d7118172a9f587716f24cd2aa5deb1566bef2daf 100644 +index 02b6cf65f6abedfd4933e4e64d254f190e061301..c59e90ba0de83eeda3719b6303bee9796b4a1af0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3494,7 +3494,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3498,7 +3498,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic public void handleChangeDifficulty(ServerboundChangeDifficultyPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); if (this.player.hasPermissions(2) || this.isSingleplayerOwner()) { diff --git a/patches/server/0446-Paper-dumpitem-command.patch b/patches/server/0445-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0446-Paper-dumpitem-command.patch rename to patches/server/0445-Paper-dumpitem-command.patch diff --git a/patches/server/0447-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0446-Don-t-allow-null-UUID-s-for-chat.patch similarity index 100% rename from patches/server/0447-Don-t-allow-null-UUID-s-for-chat.patch rename to patches/server/0446-Don-t-allow-null-UUID-s-for-chat.patch diff --git a/patches/server/0448-Improve-Legacy-Component-serialization-size.patch b/patches/server/0447-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0448-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0447-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0449-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0448-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0449-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0448-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0450-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0449-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0450-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0449-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0451-incremental-chunk-and-player-saving.patch b/patches/server/0450-incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/0451-incremental-chunk-and-player-saving.patch rename to patches/server/0450-incremental-chunk-and-player-saving.patch diff --git a/patches/server/0452-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0451-Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from patches/server/0452-Stop-copy-on-write-operations-for-updating-light-dat.patch rename to patches/server/0451-Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/patches/server/0453-Support-old-UUID-format-for-NBT.patch b/patches/server/0452-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0453-Support-old-UUID-format-for-NBT.patch rename to patches/server/0452-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0454-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0453-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/0454-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/server/0453-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/0455-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0454-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0455-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0454-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0456-Remove-some-streams-from-structures.patch b/patches/server/0455-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0456-Remove-some-streams-from-structures.patch rename to patches/server/0455-Remove-some-streams-from-structures.patch diff --git a/patches/server/0457-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0456-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0457-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0456-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0458-Support-components-in-ItemMeta.patch b/patches/server/0457-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0458-Support-components-in-ItemMeta.patch rename to patches/server/0457-Support-components-in-ItemMeta.patch diff --git a/patches/server/0459-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0458-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch similarity index 100% rename from patches/server/0459-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch rename to patches/server/0458-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch diff --git a/patches/server/0460-Add-entity-liquid-API.patch b/patches/server/0459-Add-entity-liquid-API.patch similarity index 88% rename from patches/server/0460-Add-entity-liquid-API.patch rename to patches/server/0459-Add-entity-liquid-API.patch index 0f1072e58..57a97d8ed 100644 --- a/patches/server/0460-Add-entity-liquid-API.patch +++ b/patches/server/0459-Add-entity-liquid-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add entity liquid API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index cd958bc3c00f53ebaf9b3ae39564d3abb6c819a1..863cd2c84dd207f984ddad977e9fd23860247c68 100644 +index 3bda8128c2956d817677e28ff87c9c5ed61c8bd2..c2282592a3e5c8e08acb30a8fe6f3a83dfe6d93d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1254,5 +1254,29 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1271,5 +1271,29 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason() { return getHandle().spawnReason; } diff --git a/patches/server/0461-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0460-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0461-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0460-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0462-Spawn-player-in-correct-world-on-login.patch b/patches/server/0461-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0462-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0461-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0463-Add-PrepareResultEvent.patch b/patches/server/0462-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0463-Add-PrepareResultEvent.patch rename to patches/server/0462-Add-PrepareResultEvent.patch diff --git a/patches/server/0464-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0463-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 84% rename from patches/server/0464-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0463-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch index 110614ac6..0319fe7f4 100644 --- a/patches/server/0464-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch +++ b/patches/server/0463-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch @@ -5,10 +5,10 @@ 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 4a2a8566c9d68f21a98774fcecac0f4fa43d88c4..09513bc7a5b78580da415d486369b9403e99c773 100644 +index 37d51104a7d38c2d16ae38a9adcbe37597c94fe2..049d4422136a342556951dc0114435f6c2ede946 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3413,7 +3413,7 @@ public abstract class LivingEntity extends Entity { +@@ -3435,7 +3435,7 @@ public abstract class LivingEntity extends Entity { Entity entity = this.getVehicle(); super.stopRiding(suppressCancellation); // Paper - suppress diff --git a/patches/server/0465-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0464-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0465-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0464-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0466-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0465-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from patches/server/0466-Optimize-the-advancement-data-player-iteration-to-be.patch rename to patches/server/0465-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/patches/server/0467-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0466-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0467-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0466-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0468-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0467-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0468-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0467-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0469-Fix-SPIGOT-5989.patch b/patches/server/0468-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0469-Fix-SPIGOT-5989.patch rename to patches/server/0468-Fix-SPIGOT-5989.patch diff --git a/patches/server/0470-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0469-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0470-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0469-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0471-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0470-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0471-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0470-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0472-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0471-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0472-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0471-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0473-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0472-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 100% rename from patches/server/0473-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to patches/server/0472-Add-missing-strikeLighting-call-to-World-spigot-stri.patch diff --git a/patches/server/0474-Fix-some-rails-connecting-improperly.patch b/patches/server/0473-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0474-Fix-some-rails-connecting-improperly.patch rename to patches/server/0473-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0475-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0474-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0475-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0474-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0476-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0475-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0476-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0475-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0477-Brand-support.patch b/patches/server/0476-Brand-support.patch similarity index 93% rename from patches/server/0477-Brand-support.patch rename to patches/server/0476-Brand-support.patch index 5e746a6bc..96c458463 100644 --- a/patches/server/0477-Brand-support.patch +++ b/patches/server/0476-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 d7118172a9f587716f24cd2aa5deb1566bef2daf..c4b36f8eab6f73bccfe92a5d4b66ef44306a5e36 100644 +index c59e90ba0de83eeda3719b6303bee9796b4a1af0..da6a0171bd63ac68635de1c23fc9eafa732503bd 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 @@ -17,7 +17,7 @@ index d7118172a9f587716f24cd2aa5deb1566bef2daf..c4b36f8eab6f73bccfe92a5d4b66ef44 public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player) { this.lastChatTimeStamp = new AtomicReference(Instant.EPOCH); this.lastSeenMessagesValidator = new LastSeenMessagesValidator(); -@@ -3449,6 +3451,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3453,6 +3455,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic private static final ResourceLocation CUSTOM_REGISTER = new ResourceLocation("register"); private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister"); @@ -26,7 +26,7 @@ index d7118172a9f587716f24cd2aa5deb1566bef2daf..c4b36f8eab6f73bccfe92a5d4b66ef44 @Override public void handleCustomPayload(ServerboundCustomPayloadPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); -@@ -3476,6 +3480,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3480,6 +3484,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic try { byte[] data = new byte[packet.data.readableBytes()]; packet.data.readBytes(data); @@ -42,7 +42,7 @@ index d7118172a9f587716f24cd2aa5deb1566bef2daf..c4b36f8eab6f73bccfe92a5d4b66ef44 this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), packet.identifier.toString(), data); } catch (Exception ex) { ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex); -@@ -3485,6 +3498,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3489,6 +3502,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } diff --git a/patches/server/0478-Add-setMaxPlayers-API.patch b/patches/server/0477-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0478-Add-setMaxPlayers-API.patch rename to patches/server/0477-Add-setMaxPlayers-API.patch diff --git a/patches/server/0479-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0478-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 83% rename from patches/server/0479-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0478-Add-playPickupItemAnimation-to-LivingEntity.patch index deca8c130..93c4be55f 100644 --- a/patches/server/0479-Add-playPickupItemAnimation-to-LivingEntity.patch +++ b/patches/server/0478-Add-playPickupItemAnimation-to-LivingEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index a9e7ef578c89905ff23beb85f0114f984eaaaaa7..594db7ab7c78f4f7f17781f339431bf5f133b8bf 100644 +index 55881c189e96bccd6538dfb6b4ea897b72d3936d..679e08544fc1e6973605dd2f3953c12a0d338ddd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -843,5 +843,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -884,5 +884,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { ((Mob) getHandle()).getJumpControl().jump(); } } diff --git a/patches/server/0480-Don-t-require-FACING-data.patch b/patches/server/0479-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0480-Don-t-require-FACING-data.patch rename to patches/server/0479-Don-t-require-FACING-data.patch diff --git a/patches/server/0481-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0480-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0481-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0480-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0482-Add-moon-phase-API.patch b/patches/server/0481-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0482-Add-moon-phase-API.patch rename to patches/server/0481-Add-moon-phase-API.patch diff --git a/patches/server/0483-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0482-Improve-Chunk-Status-Transition-Speed.patch similarity index 100% rename from patches/server/0483-Improve-Chunk-Status-Transition-Speed.patch rename to patches/server/0482-Improve-Chunk-Status-Transition-Speed.patch diff --git a/patches/server/0484-Prevent-headless-pistons-from-being-created.patch b/patches/server/0483-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0484-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0483-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0485-Add-BellRingEvent.patch b/patches/server/0484-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0485-Add-BellRingEvent.patch rename to patches/server/0484-Add-BellRingEvent.patch diff --git a/patches/server/0486-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0485-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0486-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0485-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0487-Buffer-joins-to-world.patch b/patches/server/0486-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0487-Buffer-joins-to-world.patch rename to patches/server/0486-Buffer-joins-to-world.patch diff --git a/patches/server/0488-Eigencraft-redstone-implementation.patch b/patches/server/0487-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0488-Eigencraft-redstone-implementation.patch rename to patches/server/0487-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0489-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0488-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0489-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0488-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0490-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0489-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0490-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0489-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0491-Fix-CraftTeam-null-check.patch b/patches/server/0490-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0491-Fix-CraftTeam-null-check.patch rename to patches/server/0490-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0492-Add-more-Evoker-API.patch b/patches/server/0491-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0492-Add-more-Evoker-API.patch rename to patches/server/0491-Add-more-Evoker-API.patch diff --git a/patches/server/0493-Add-methods-to-get-translation-keys.patch b/patches/server/0492-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0493-Add-methods-to-get-translation-keys.patch rename to patches/server/0492-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0494-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0493-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0494-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0493-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0495-Cache-block-data-strings.patch b/patches/server/0494-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0495-Cache-block-data-strings.patch rename to patches/server/0494-Cache-block-data-strings.patch diff --git a/patches/server/0496-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0495-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 91% rename from patches/server/0496-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0495-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index 66b1d24e2..ec03ac9e5 100644 --- a/patches/server/0496-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/server/0495-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 ecd3d2cb0a4da4360c420f8c733a5898c54ba72e..70ef7e4a86cc080ff47dcc648088bf007d6ddee6 100644 +index da6a0171bd63ac68635de1c23fc9eafa732503bd..214771e661ca3303af167fda3b623d83f0f63055 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 @@ -31,7 +31,7 @@ index ecd3d2cb0a4da4360c420f8c733a5898c54ba72e..70ef7e4a86cc080ff47dcc648088bf00 } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7e36e53d44b5efbd6498caecb717bec1dcbec96d..1ed2670ab0687793b9298c2c1deb92da93e7bfd2 100644 +index 3ebe5297aa2fde1cb347f738738f5d74f6a61b9a..332bce00d355981c657993b504767814dfdd7f05 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -158,6 +158,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -42,7 +42,7 @@ index 7e36e53d44b5efbd6498caecb717bec1dcbec96d..1ed2670ab0687793b9298c2c1deb92da static boolean isLevelAtLeast(CompoundTag tag, int level) { return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level; } -@@ -1651,6 +1652,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1665,6 +1666,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public void moveTo(double x, double y, double z, float yaw, float pitch) { @@ -69,10 +69,10 @@ index e3d8814cbad30da795632afddf8ebc87eff72106..ee619590aa49323059947fbaee9e88d6 if (entity instanceof Mob) { Mob entityinsentient = (Mob) entity; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 863cd2c84dd207f984ddad977e9fd23860247c68..ab270a14263d6a264bb74de3b924584ac41ed523 100644 +index c2282592a3e5c8e08acb30a8fe6f3a83dfe6d93d..40e6cd06f6b0cab2718c165cb38e772e90795917 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -559,7 +559,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -561,7 +561,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } // entity.setLocation() throws no event, and so cannot be cancelled diff --git a/patches/server/0497-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0496-Add-additional-open-container-api-to-HumanEntity.patch similarity index 95% rename from patches/server/0497-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0496-Add-additional-open-container-api-to-HumanEntity.patch index 53f2348da..1c28c3f9c 100644 --- a/patches/server/0497-Add-additional-open-container-api-to-HumanEntity.patch +++ b/patches/server/0496-Add-additional-open-container-api-to-HumanEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add additional open container api to HumanEntity diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 3a14cc3d0d692c8bbc90de1b1c5731158b1323e5..acf609e8d880156ba980b701816c475166c27bdb 100644 +index 15f6e1c04fefa1334301534646b8ed2535d16fa9..b8ba4e278de5c9a591789928c21bff26dcec2fb7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -@@ -459,6 +459,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { +@@ -462,6 +462,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { return this.getHandle().containerMenu.getBukkitView(); } diff --git a/patches/server/0498-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0497-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0498-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0497-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0499-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0498-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0499-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0498-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0500-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0499-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch similarity index 100% rename from patches/server/0500-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch rename to patches/server/0499-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch diff --git a/patches/server/0501-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0500-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 90% rename from patches/server/0501-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0500-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch index be65d5330..7c7dcd77b 100644 --- a/patches/server/0501-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch +++ b/patches/server/0500-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1ed2670ab0687793b9298c2c1deb92da93e7bfd2..511255467688d4c9397037753d2d4821af29bb79 100644 +index 332bce00d355981c657993b504767814dfdd7f05..71c674d7b8dfdd401f163cc707f2c9746da30c65 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4074,4 +4074,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4088,4 +4088,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { void accept(Entity entity, double x, double y, double z); } diff --git a/patches/server/0502-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0501-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0502-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0501-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0503-Entity-isTicking.patch b/patches/server/0502-Entity-isTicking.patch similarity index 83% rename from patches/server/0503-Entity-isTicking.patch rename to patches/server/0502-Entity-isTicking.patch index 86502ef7a..12f888c73 100644 --- a/patches/server/0503-Entity-isTicking.patch +++ b/patches/server/0502-Entity-isTicking.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 511255467688d4c9397037753d2d4821af29bb79..532678194c2724e31a19f0e4d73d79d84ef6699c 100644 +index 71c674d7b8dfdd401f163cc707f2c9746da30c65..902531525c213bd39aaac138f30ee1fc3e7c24a7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -59,6 +59,7 @@ import net.minecraft.resources.ResourceKey; @@ -16,7 +16,7 @@ index 511255467688d4c9397037753d2d4821af29bb79..532678194c2724e31a19f0e4d73d79d8 import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.TicketType; -@@ -4079,5 +4080,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4093,5 +4094,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public static int nextEntityId() { return ENTITY_COUNTER.incrementAndGet(); } @@ -27,10 +27,10 @@ index 511255467688d4c9397037753d2d4821af29bb79..532678194c2724e31a19f0e4d73d79d8 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index ab270a14263d6a264bb74de3b924584ac41ed523..fa1e996157fb3470c08669801e7482af70714b11 100644 +index 40e6cd06f6b0cab2718c165cb38e772e90795917..142e6be6a41500b6e3b49173b7432e63de7ad3da 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1278,5 +1278,9 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1295,5 +1295,9 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public boolean isInLava() { return getHandle().isInLava(); } diff --git a/patches/server/0504-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0503-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0504-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0503-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0505-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0504-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0505-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0504-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0506-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0505-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0506-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0505-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0507-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0506-Fix-for-large-move-vectors-crashing-server.patch similarity index 98% rename from patches/server/0507-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0506-Fix-for-large-move-vectors-crashing-server.patch index 415947895..0b19e6961 100644 --- a/patches/server/0507-Fix-for-large-move-vectors-crashing-server.patch +++ b/patches/server/0506-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 70ef7e4a86cc080ff47dcc648088bf007d6ddee6..3b422cd28b3fb8a172a734e3d59636b293d4a5cb 100644 +index 214771e661ca3303af167fda3b623d83f0f63055..3d7d23a02e4aceb95ec36fbca9d02294f08c5780 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/0508-Optimise-getType-calls.patch b/patches/server/0507-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0508-Optimise-getType-calls.patch rename to patches/server/0507-Optimise-getType-calls.patch diff --git a/patches/server/0509-Villager-resetOffers.patch b/patches/server/0508-Villager-resetOffers.patch similarity index 100% rename from patches/server/0509-Villager-resetOffers.patch rename to patches/server/0508-Villager-resetOffers.patch diff --git a/patches/server/0510-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0509-Improve-inlinig-for-some-hot-IBlockData-methods.patch similarity index 100% rename from patches/server/0510-Improve-inlinig-for-some-hot-IBlockData-methods.patch rename to patches/server/0509-Improve-inlinig-for-some-hot-IBlockData-methods.patch diff --git a/patches/server/0511-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0510-Retain-block-place-order-when-capturing-blockstates.patch similarity index 93% rename from patches/server/0511-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0510-Retain-block-place-order-when-capturing-blockstates.patch index ae8ed41c9..d600fe08e 100644 --- a/patches/server/0511-Retain-block-place-order-when-capturing-blockstates.patch +++ b/patches/server/0510-Retain-block-place-order-when-capturing-blockstates.patch @@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling cases where a captured entry is overriden) - but for now this will do. diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index d5e80a0d953e7792669f21011bc685adaec78464..d9a88b29cfefcdbce7bfc477b6c1af0e51079102 100644 +index 160a3cb1d70f765d277169bb4928238b6a575f26..525df1e5515fff204f790edcd0a051e851c03d33 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -155,7 +155,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0512-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0511-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0512-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0511-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0513-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0512-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0513-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0512-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0514-Player-elytra-boost-API.patch b/patches/server/0513-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0514-Player-elytra-boost-API.patch rename to patches/server/0513-Player-elytra-boost-API.patch diff --git a/patches/server/0515-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0514-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0515-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0514-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0516-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0515-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0516-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0515-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0517-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0516-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0517-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0516-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0518-Add-ignore-discounts-API.patch b/patches/server/0517-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0518-Add-ignore-discounts-API.patch rename to patches/server/0517-Add-ignore-discounts-API.patch diff --git a/patches/server/0519-Toggle-for-removing-existing-dragon.patch b/patches/server/0518-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0519-Toggle-for-removing-existing-dragon.patch rename to patches/server/0518-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0520-Fix-client-lag-on-advancement-loading.patch b/patches/server/0519-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0520-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0519-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0521-Item-no-age-no-player-pickup.patch b/patches/server/0520-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0521-Item-no-age-no-player-pickup.patch rename to patches/server/0520-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0522-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0521-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0522-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0521-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0523-Beacon-API-custom-effect-ranges.patch b/patches/server/0522-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0523-Beacon-API-custom-effect-ranges.patch rename to patches/server/0522-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0524-Add-API-for-quit-reason.patch b/patches/server/0523-Add-API-for-quit-reason.patch similarity index 98% rename from patches/server/0524-Add-API-for-quit-reason.patch rename to patches/server/0523-Add-API-for-quit-reason.patch index 20ba1338d..67527963c 100644 --- a/patches/server/0524-Add-API-for-quit-reason.patch +++ b/patches/server/0523-Add-API-for-quit-reason.patch @@ -37,7 +37,7 @@ index 6f2b52165c1935511790a429792d3754251537c8..9b4436bdb697d8350eac57282f8fad81 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 3b422cd28b3fb8a172a734e3d59636b293d4a5cb..a6820c2262dd2198b772eae491c40ee379ec2da7 100644 +index 3d7d23a02e4aceb95ec36fbca9d02294f08c5780..8e12c4d4b54c2f0a265dc627d7981282fc6fda6e 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/0525-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0524-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0525-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0524-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0526-Expose-world-spawn-angle.patch b/patches/server/0525-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0526-Expose-world-spawn-angle.patch rename to patches/server/0525-Expose-world-spawn-angle.patch diff --git a/patches/server/0527-Add-Destroy-Speed-API.patch b/patches/server/0526-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0527-Add-Destroy-Speed-API.patch rename to patches/server/0526-Add-Destroy-Speed-API.patch diff --git a/patches/server/0528-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0527-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0528-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0527-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0529-Add-LivingEntity-clearActiveItem.patch b/patches/server/0528-Add-LivingEntity-clearActiveItem.patch similarity index 84% rename from patches/server/0529-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0528-Add-LivingEntity-clearActiveItem.patch index bed181937..2eb3c37c5 100644 --- a/patches/server/0529-Add-LivingEntity-clearActiveItem.patch +++ b/patches/server/0528-Add-LivingEntity-clearActiveItem.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 594db7ab7c78f4f7f17781f339431bf5f133b8bf..6e2e217d965ea6b8601e5ba0f8a44b817ee6654d 100644 +index 679e08544fc1e6973605dd2f3953c12a0d338ddd..4e7cb29909fd82d26029e4c78580ead500db5c2a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -810,6 +810,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -851,6 +851,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { return getHandle().getUseItem().asBukkitMirror(); } diff --git a/patches/server/0530-Add-PlayerItemCooldownEvent.patch b/patches/server/0529-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0530-Add-PlayerItemCooldownEvent.patch rename to patches/server/0529-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0531-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0530-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0531-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0530-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0532-More-lightning-API.patch b/patches/server/0531-More-lightning-API.patch similarity index 100% rename from patches/server/0532-More-lightning-API.patch rename to patches/server/0531-More-lightning-API.patch diff --git a/patches/server/0533-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0532-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 95% rename from patches/server/0533-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0532-Climbing-should-not-bypass-cramming-gamerule.patch index 50b7fcd2d..55702b598 100644 --- a/patches/server/0533-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0532-Climbing-should-not-bypass-cramming-gamerule.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 532678194c2724e31a19f0e4d73d79d84ef6699c..11a5a0b3002300b882511b4ebafe96af5e230cb8 100644 +index 902531525c213bd39aaac138f30ee1fc3e7c24a7..96bb4a32a04851bd3a83f2b214efd2297ff8b57e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1832,6 +1832,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1846,6 +1846,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public boolean isPushable() { @@ -45,10 +45,10 @@ index 22f36cd3df49160f1b6668befdd05c2268edaa49..e39965c2e50bc8ee424ea07819346e06 } 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 09513bc7a5b78580da415d486369b9403e99c773..502d54845e1bcf538149a51be995320c6df10acb 100644 +index 049d4422136a342556951dc0114435f6c2ede946..d6ad8cfb509920c448fc51ec02e867b1552730df 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3335,7 +3335,7 @@ public abstract class LivingEntity extends Entity { +@@ -3357,7 +3357,7 @@ public abstract class LivingEntity extends Entity { return; } // Paper end - don't run getEntities if we're not going to use its result @@ -57,7 +57,7 @@ index 09513bc7a5b78580da415d486369b9403e99c773..502d54845e1bcf538149a51be995320c if (!list.isEmpty()) { // Paper - move up -@@ -3498,9 +3498,16 @@ public abstract class LivingEntity extends Entity { +@@ -3520,9 +3520,16 @@ public abstract class LivingEntity extends Entity { return !this.isRemoved() && this.collides; // CraftBukkit } diff --git a/patches/server/0534-Added-missing-default-perms-for-commands.patch b/patches/server/0533-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0534-Added-missing-default-perms-for-commands.patch rename to patches/server/0533-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0535-Add-PlayerShearBlockEvent.patch b/patches/server/0534-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0535-Add-PlayerShearBlockEvent.patch rename to patches/server/0534-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0536-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0535-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0536-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0535-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0537-Limit-recipe-packets.patch b/patches/server/0536-Limit-recipe-packets.patch similarity index 94% rename from patches/server/0537-Limit-recipe-packets.patch rename to patches/server/0536-Limit-recipe-packets.patch index c6f393383..f40301fce 100644 --- a/patches/server/0537-Limit-recipe-packets.patch +++ b/patches/server/0536-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 bae8cb6dea250a389c02efe8667c5a898ff49909..bdab60032896ad24add7d2efb49db07a1793670a 100644 +index 8e12c4d4b54c2f0a265dc627d7981282fc6fda6e..32227020d0cba1aba3ec0fcda5f4b4cd4b1ce394 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 @@ -24,7 +24,7 @@ index bae8cb6dea250a389c02efe8667c5a898ff49909..bdab60032896ad24add7d2efb49db07a /* Use thread-safe field access instead if (this.chatSpamTickCount > 0) { --this.chatSpamTickCount; -@@ -3243,6 +3245,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3247,6 +3249,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) { diff --git a/patches/server/0538-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0537-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0538-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0537-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0539-Player-Chunk-Load-Unload-Events.patch b/patches/server/0538-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0539-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0538-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0540-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0539-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0540-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0539-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0541-Expose-LivingEntity-hurt-direction.patch b/patches/server/0540-Expose-LivingEntity-hurt-direction.patch similarity index 85% rename from patches/server/0541-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0540-Expose-LivingEntity-hurt-direction.patch index 4eb56db7d..ff8defb04 100644 --- a/patches/server/0541-Expose-LivingEntity-hurt-direction.patch +++ b/patches/server/0540-Expose-LivingEntity-hurt-direction.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose LivingEntity hurt direction diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 6e2e217d965ea6b8601e5ba0f8a44b817ee6654d..a0b46e05dc9c384b3dd70de00d89911c492ef493 100644 +index 4e7cb29909fd82d26029e4c78580ead500db5c2a..d16ea002ca558502be2f04528f0346d9aacff30f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -855,5 +855,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -896,5 +896,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public void playPickupItemAnimation(org.bukkit.entity.Item item, int quantity) { getHandle().take(((CraftItem) item).getHandle(), quantity); } diff --git a/patches/server/0542-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0541-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0542-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0541-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0543-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0542-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0543-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0542-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0544-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0543-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0544-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0543-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0545-Implement-TargetHitEvent.patch b/patches/server/0544-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0545-Implement-TargetHitEvent.patch rename to patches/server/0544-Implement-TargetHitEvent.patch diff --git a/patches/server/0546-MC-4-Fix-item-position-desync.patch b/patches/server/0545-MC-4-Fix-item-position-desync.patch similarity index 93% rename from patches/server/0546-MC-4-Fix-item-position-desync.patch rename to patches/server/0545-MC-4-Fix-item-position-desync.patch index 4172d387c..2630f549d 100644 --- a/patches/server/0546-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0545-MC-4-Fix-item-position-desync.patch @@ -27,10 +27,10 @@ index 3768a71491ef7836b9739bdaec7a077c523dbacd..a57957ace1a72b3308487f180a366c38 public Vec3 decode(long x, long y, long z) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 11a5a0b3002300b882511b4ebafe96af5e230cb8..81c70cf84618f4e987c68dba081317a658c6cd91 100644 +index 96bb4a32a04851bd3a83f2b214efd2297ff8b57e..9770cc15579d90480993135a5a54ad1ac1133df1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3890,6 +3890,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3904,6 +3904,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) { // Paper end diff --git a/patches/server/0547-Additional-Block-Material-API-s.patch b/patches/server/0546-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0547-Additional-Block-Material-API-s.patch rename to patches/server/0546-Additional-Block-Material-API-s.patch diff --git a/patches/server/0548-Fix-harming-potion-dupe.patch b/patches/server/0547-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0548-Fix-harming-potion-dupe.patch rename to patches/server/0547-Fix-harming-potion-dupe.patch diff --git a/patches/server/0549-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0548-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0549-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0548-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0550-Cache-burn-durations.patch b/patches/server/0549-Cache-burn-durations.patch similarity index 100% rename from patches/server/0550-Cache-burn-durations.patch rename to patches/server/0549-Cache-burn-durations.patch diff --git a/patches/server/0551-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0550-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0551-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0550-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0552-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0551-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0552-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0551-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0553-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0552-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0553-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0552-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0554-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0553-Fix-interact-event-not-being-called-in-adventure.patch similarity index 92% rename from patches/server/0554-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0553-Fix-interact-event-not-being-called-in-adventure.patch index 9395c91ad..8cd15192d 100644 --- a/patches/server/0554-Fix-interact-event-not-being-called-in-adventure.patch +++ b/patches/server/0553-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 bdab60032896ad24add7d2efb49db07a1793670a..0840813bf89eb5d51f9dae02d5100ea9ba3de928 100644 +index 32227020d0cba1aba3ec0fcda5f4b4cd4b1ce394..c0cca7442d3bb7df393088d66c5962bcda78e609 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 @@ -18,7 +18,7 @@ index bdab60032896ad24add7d2efb49db07a1793670a..0840813bf89eb5d51f9dae02d5100ea9 this.player.swing(enumhand, true); } } -@@ -2606,7 +2606,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2610,7 +2610,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic // SPIGOT-5607: Only call interact event if no block or entity is being clicked. Use bukkit ray trace method, because it handles blocks and entities at the same time org.bukkit.util.RayTraceResult result = this.player.level.getWorld().rayTrace(origin, origin.getDirection(), d3, org.bukkit.FluidCollisionMode.NEVER, false, 0.1, entity -> entity != this.player.getBukkitEntity()); diff --git a/patches/server/0555-Zombie-API-breaking-doors.patch b/patches/server/0554-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0555-Zombie-API-breaking-doors.patch rename to patches/server/0554-Zombie-API-breaking-doors.patch diff --git a/patches/server/0556-Fix-nerfed-slime-when-splitting.patch b/patches/server/0555-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0556-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0555-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0557-Add-EntityLoadCrossbowEvent.patch b/patches/server/0556-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0557-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0556-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0558-Guardian-beam-workaround.patch b/patches/server/0557-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0558-Guardian-beam-workaround.patch rename to patches/server/0557-Guardian-beam-workaround.patch diff --git a/patches/server/0559-Added-WorldGameRuleChangeEvent.patch b/patches/server/0558-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0559-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0558-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0560-Added-ServerResourcesReloadedEvent.patch b/patches/server/0559-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0560-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0559-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0561-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0560-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0561-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0560-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0562-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0561-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0562-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0561-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0563-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0562-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0563-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0562-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0564-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0563-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0564-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0563-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0565-Configurable-door-breaking-difficulty.patch b/patches/server/0564-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0565-Configurable-door-breaking-difficulty.patch rename to patches/server/0564-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0566-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0565-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0566-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0565-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0567-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0566-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0567-Implement-API-to-expose-exact-interaction-point.patch rename to patches/server/0566-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0568-Remove-stale-POIs.patch b/patches/server/0567-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0568-Remove-stale-POIs.patch rename to patches/server/0567-Remove-stale-POIs.patch diff --git a/patches/server/0569-Fix-villager-boat-exploit.patch b/patches/server/0568-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0569-Fix-villager-boat-exploit.patch rename to patches/server/0568-Fix-villager-boat-exploit.patch diff --git a/patches/server/0570-Add-sendOpLevel-API.patch b/patches/server/0569-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0570-Add-sendOpLevel-API.patch rename to patches/server/0569-Add-sendOpLevel-API.patch diff --git a/patches/server/0571-Add-PaperRegistry.patch b/patches/server/0570-Add-PaperRegistry.patch similarity index 100% rename from patches/server/0571-Add-PaperRegistry.patch rename to patches/server/0570-Add-PaperRegistry.patch diff --git a/patches/server/0572-Add-StructuresLocateEvent.patch b/patches/server/0571-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0572-Add-StructuresLocateEvent.patch rename to patches/server/0571-Add-StructuresLocateEvent.patch diff --git a/patches/server/0573-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0572-Collision-option-for-requiring-a-player-participant.patch similarity index 94% rename from patches/server/0573-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0572-Collision-option-for-requiring-a-player-participant.patch index 885959960..e8dceea39 100644 --- a/patches/server/0573-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/server/0572-Collision-option-for-requiring-a-player-participant.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Collision option for requiring a player participant diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 81c70cf84618f4e987c68dba081317a658c6cd91..bfac12f0e89c4c7d48321ea608363518742304af 100644 +index 9770cc15579d90480993135a5a54ad1ac1133df1..525e712c5715f1fa323fae94d4158c4e66068fe3 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1715,6 +1715,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1729,6 +1729,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public void push(Entity entity) { if (!this.isPassengerOfSameVehicle(entity)) { if (!entity.noPhysics && !this.noPhysics) { diff --git a/patches/server/0574-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0573-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0574-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0573-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0575-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0574-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0575-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0574-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0576-Make-schedule-command-per-world.patch b/patches/server/0575-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0576-Make-schedule-command-per-world.patch rename to patches/server/0575-Make-schedule-command-per-world.patch diff --git a/patches/server/0577-Configurable-max-leash-distance.patch b/patches/server/0576-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0577-Configurable-max-leash-distance.patch rename to patches/server/0576-Configurable-max-leash-distance.patch diff --git a/patches/server/0578-Implement-BlockPreDispenseEvent.patch b/patches/server/0577-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0578-Implement-BlockPreDispenseEvent.patch rename to patches/server/0577-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0579-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0578-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0579-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0578-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0580-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0579-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0580-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0579-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0581-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0580-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0581-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0580-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0582-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0581-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 96% rename from patches/server/0582-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0581-Add-dropLeash-variable-to-EntityUnleashEvent.patch index 71ca7beca..1ab6c748f 100644 --- a/patches/server/0582-Add-dropLeash-variable-to-EntityUnleashEvent.patch +++ b/patches/server/0581-Add-dropLeash-variable-to-EntityUnleashEvent.patch @@ -5,10 +5,10 @@ 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 1a2e5e8c32a2fabe3b92ded6c630b8258b57bc0f..837c0a8bd15388bdb60d6950a437640459adde3c 100644 +index d7b137a84deea68c75ee0b3c99b089b8dff25947..e08d69af81f4ca0535be522eef4792e4127f454c 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1242,12 +1242,15 @@ public abstract class Mob extends LivingEntity { +@@ -1248,12 +1248,15 @@ public abstract class Mob extends LivingEntity { return InteractionResult.PASS; } else if (this.getLeashHolder() == player) { // CraftBukkit start - fire PlayerUnleashEntityEvent @@ -26,7 +26,7 @@ index 1a2e5e8c32a2fabe3b92ded6c630b8258b57bc0f..837c0a8bd15388bdb60d6950a4376404 return InteractionResult.sidedSuccess(this.level.isClientSide); } else { InteractionResult enuminteractionresult = this.checkAndHandleImportantInteractions(player, hand); -@@ -1410,8 +1413,11 @@ public abstract class Mob extends LivingEntity { +@@ -1416,8 +1419,11 @@ public abstract class Mob extends LivingEntity { if (this.leashHolder != null) { if (!this.isAlive() || !this.leashHolder.isAlive()) { @@ -40,7 +40,7 @@ index 1a2e5e8c32a2fabe3b92ded6c630b8258b57bc0f..837c0a8bd15388bdb60d6950a4376404 } } -@@ -1474,8 +1480,11 @@ public abstract class Mob extends LivingEntity { +@@ -1480,8 +1486,11 @@ public abstract class Mob extends LivingEntity { boolean flag1 = super.startRiding(entity, force); if (flag1 && this.isLeashed()) { @@ -54,7 +54,7 @@ index 1a2e5e8c32a2fabe3b92ded6c630b8258b57bc0f..837c0a8bd15388bdb60d6950a4376404 } return flag1; -@@ -1653,8 +1662,11 @@ public abstract class Mob extends LivingEntity { +@@ -1659,8 +1668,11 @@ public abstract class Mob extends LivingEntity { @Override protected void removeAfterChangingDimensions() { super.removeAfterChangingDimensions(); diff --git a/patches/server/0583-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0582-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0583-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0582-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0584-add-DragonEggFormEvent.patch b/patches/server/0583-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0584-add-DragonEggFormEvent.patch rename to patches/server/0583-add-DragonEggFormEvent.patch diff --git a/patches/server/0585-EntityMoveEvent.patch b/patches/server/0584-EntityMoveEvent.patch similarity index 95% rename from patches/server/0585-EntityMoveEvent.patch rename to patches/server/0584-EntityMoveEvent.patch index 739f60de9..921e7daaf 100644 --- a/patches/server/0585-EntityMoveEvent.patch +++ b/patches/server/0584-EntityMoveEvent.patch @@ -29,10 +29,10 @@ index 3f4e3e57999245a83263e88e221723e72a11b31e..a1b0256c8faceae89e1eaf5e26c8b588 return new Throwable(entity + " Added to world at " + new java.util.Date()); } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 502d54845e1bcf538149a51be995320c6df10acb..ede6e560cf0fe7dadab481f0d27a5edc4218d8bd 100644 +index d6ad8cfb509920c448fc51ec02e867b1552730df..f774d25eaaa1b7966b16251619da80a2d5c9228c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3281,6 +3281,20 @@ public abstract class LivingEntity extends Entity { +@@ -3303,6 +3303,20 @@ public abstract class LivingEntity extends Entity { this.pushEntities(); this.level.getProfiler().pop(); diff --git a/patches/server/0586-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0585-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0586-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0585-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0587-Inline-shift-direction-fields.patch b/patches/server/0586-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0587-Inline-shift-direction-fields.patch rename to patches/server/0586-Inline-shift-direction-fields.patch diff --git a/patches/server/0588-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0587-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0588-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0587-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0589-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0588-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0589-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0588-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0590-living-entity-allow-attribute-registration.patch b/patches/server/0589-living-entity-allow-attribute-registration.patch similarity index 94% rename from patches/server/0590-living-entity-allow-attribute-registration.patch rename to patches/server/0589-living-entity-allow-attribute-registration.patch index 88cf7f15c..8b29222be 100644 --- a/patches/server/0590-living-entity-allow-attribute-registration.patch +++ b/patches/server/0589-living-entity-allow-attribute-registration.patch @@ -41,10 +41,10 @@ index 46c313d581b9af6aa0a48f97ae3cc800a88535f2..07d700382fc356837045c46d320b7b69 return net.minecraft.core.Registry.ATTRIBUTE.get(CraftNamespacedKey.toMinecraft(attribute.getKey())); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 0293d6fd1bb29f75fa1fa1cdfa36b3f679c1bc45..6555db49ff57bba13a7eb3c0bf7ecb66d7828dce 100644 +index d16ea002ca558502be2f04528f0346d9aacff30f..1322f5a059743e7e2245ef2e25e9bffda138aa7c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -686,6 +686,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -688,6 +688,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { return this.getHandle().craftAttributes.getAttribute(attribute); } diff --git a/patches/server/0591-fix-dead-slime-setSize-invincibility.patch b/patches/server/0590-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0591-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0590-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0592-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0591-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0592-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0591-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0593-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0592-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0593-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0592-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0594-Expose-Tracked-Players.patch b/patches/server/0593-Expose-Tracked-Players.patch similarity index 87% rename from patches/server/0594-Expose-Tracked-Players.patch rename to patches/server/0593-Expose-Tracked-Players.patch index 2a57f6e90..e3f023c81 100644 --- a/patches/server/0594-Expose-Tracked-Players.patch +++ b/patches/server/0593-Expose-Tracked-Players.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose Tracked Players diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index fa1e996157fb3470c08669801e7482af70714b11..e9828bab16ac05babccfb1fefad85860c1a4768c 100644 +index 142e6be6a41500b6e3b49173b7432e63de7ad3da..b30fb13db5524dcd05a155b014b93089af05c994 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1282,5 +1282,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1299,5 +1299,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public boolean isTicking() { return getHandle().isTicking(); } diff --git a/patches/server/0595-Remove-streams-from-SensorNearest.patch b/patches/server/0594-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0595-Remove-streams-from-SensorNearest.patch rename to patches/server/0594-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0596-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0595-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0596-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0595-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0597-Improve-ServerGUI.patch b/patches/server/0596-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0597-Improve-ServerGUI.patch rename to patches/server/0596-Improve-ServerGUI.patch diff --git a/patches/server/0598-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0597-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0598-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0597-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0599-fix-converting-txt-to-json-file.patch b/patches/server/0598-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0599-fix-converting-txt-to-json-file.patch rename to patches/server/0598-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0600-Add-worldborder-events.patch b/patches/server/0599-Add-worldborder-events.patch similarity index 100% rename from patches/server/0600-Add-worldborder-events.patch rename to patches/server/0599-Add-worldborder-events.patch diff --git a/patches/server/0601-added-PlayerNameEntityEvent.patch b/patches/server/0600-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0601-added-PlayerNameEntityEvent.patch rename to patches/server/0600-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0602-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0601-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0602-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0601-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0603-Add-recipe-to-cook-events.patch b/patches/server/0602-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0603-Add-recipe-to-cook-events.patch rename to patches/server/0602-Add-recipe-to-cook-events.patch diff --git a/patches/server/0604-Add-Block-isValidTool.patch b/patches/server/0603-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0604-Add-Block-isValidTool.patch rename to patches/server/0603-Add-Block-isValidTool.patch diff --git a/patches/server/0605-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0604-Allow-using-signs-inside-spawn-protection.patch similarity index 94% rename from patches/server/0605-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0604-Allow-using-signs-inside-spawn-protection.patch index d48b61abd..e2dfe62f5 100644 --- a/patches/server/0605-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/server/0604-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 2ad4df9895728185d6e5db2e8525ed3b08a518a1..582f8bbc3eb169d2cf41cba9ab324c933466b2b2 100644 +index c0cca7442d3bb7df393088d66c5962bcda78e609..6c64270b9d87ae3d08400ddd4effa689ce58070f 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/0606-Expand-world-key-API.patch b/patches/server/0605-Expand-world-key-API.patch similarity index 100% rename from patches/server/0606-Expand-world-key-API.patch rename to patches/server/0605-Expand-world-key-API.patch diff --git a/patches/server/0607-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0606-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0607-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0606-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0608-Item-Rarity-API.patch b/patches/server/0607-Item-Rarity-API.patch similarity index 100% rename from patches/server/0608-Item-Rarity-API.patch rename to patches/server/0607-Item-Rarity-API.patch diff --git a/patches/server/0609-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0608-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0609-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0608-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0610-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0609-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0610-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0609-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0611-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0610-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0611-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0610-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0612-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0611-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0612-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0611-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0613-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0612-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 91% rename from patches/server/0613-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0612-Don-t-ignore-result-of-PlayerEditBookEvent.patch index 8fc5df118..661e62955 100644 --- a/patches/server/0613-Don-t-ignore-result-of-PlayerEditBookEvent.patch +++ b/patches/server/0612-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 582f8bbc3eb169d2cf41cba9ab324c933466b2b2..ed1b8507c98cbc11ec6dd3ceae2800bd69d99cf2 100644 +index 6c64270b9d87ae3d08400ddd4effa689ce58070f..63649e0d5547d1b904a6605868dfad52214c7b3c 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/0614-Entity-load-save-limit-per-chunk.patch b/patches/server/0613-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0614-Entity-load-save-limit-per-chunk.patch rename to patches/server/0613-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0615-Expose-protocol-version.patch b/patches/server/0614-Expose-protocol-version.patch similarity index 100% rename from patches/server/0615-Expose-protocol-version.patch rename to patches/server/0614-Expose-protocol-version.patch diff --git a/patches/server/0616-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0615-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0616-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0615-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0617-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0616-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 88% rename from patches/server/0617-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0616-Fix-PlayerItemConsumeEvent-cancelling-properly.patch index 6079bd7fd..419a5f5e5 100644 --- a/patches/server/0617-Fix-PlayerItemConsumeEvent-cancelling-properly.patch +++ b/patches/server/0616-Fix-PlayerItemConsumeEvent-cancelling-properly.patch @@ -9,10 +9,10 @@ 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 ede6e560cf0fe7dadab481f0d27a5edc4218d8bd..644d71c024103c39d7532559c810038d687106e5 100644 +index f774d25eaaa1b7966b16251619da80a2d5c9228c..d427cd90177b14062ea56dcf6fa5fedddcdbb624 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3755,6 +3755,7 @@ public abstract class LivingEntity extends Entity { +@@ -3777,6 +3777,7 @@ public abstract class LivingEntity extends Entity { level.getCraftServer().getPluginManager().callEvent(event); if (event.isCancelled()) { diff --git a/patches/server/0618-Add-bypass-host-check.patch b/patches/server/0617-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0618-Add-bypass-host-check.patch rename to patches/server/0617-Add-bypass-host-check.patch diff --git a/patches/server/0619-Set-area-affect-cloud-rotation.patch b/patches/server/0618-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0619-Set-area-affect-cloud-rotation.patch rename to patches/server/0618-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0620-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0619-add-isDeeplySleeping-to-HumanEntity.patch similarity index 83% rename from patches/server/0620-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0619-add-isDeeplySleeping-to-HumanEntity.patch index 18ba539fd..23d24c369 100644 --- a/patches/server/0620-add-isDeeplySleeping-to-HumanEntity.patch +++ b/patches/server/0619-add-isDeeplySleeping-to-HumanEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] add isDeeplySleeping to HumanEntity diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index acf609e8d880156ba980b701816c475166c27bdb..6149e74262ca6c4c00686a89c273c59bfaac3e05 100644 +index b8ba4e278de5c9a591789928c21bff26dcec2fb7..44dab523264c594aa9c619e3ee2e0d7f93982ddc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -@@ -122,6 +122,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { +@@ -125,6 +125,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { } } diff --git a/patches/server/0621-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0620-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0621-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0620-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0622-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0621-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0622-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0621-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0623-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0622-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0623-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0622-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0624-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0623-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0624-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/server/0623-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0625-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0624-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 88% rename from patches/server/0625-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0624-fix-PlayerItemHeldEvent-firing-twice.patch index ad8570497..3840306aa 100644 --- a/patches/server/0625-fix-PlayerItemHeldEvent-firing-twice.patch +++ b/patches/server/0624-fix-PlayerItemHeldEvent-firing-twice.patch @@ -5,10 +5,10 @@ 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 ed1b8507c98cbc11ec6dd3ceae2800bd69d99cf2..35b906d74a4cc03a5878cedff2ee9e694bb03ad4 100644 +index 63649e0d5547d1b904a6605868dfad52214c7b3c..917aa2bd63db9a63c75267564d0c3602b0f01392 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2053,6 +2053,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2054,6 +2054,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); if (this.player.isImmobile()) return; // CraftBukkit if (packet.getSlot() >= 0 && packet.getSlot() < Inventory.getSelectionSize()) { diff --git a/patches/server/0626-Added-PlayerDeepSleepEvent.patch b/patches/server/0625-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0626-Added-PlayerDeepSleepEvent.patch rename to patches/server/0625-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0627-More-World-API.patch b/patches/server/0626-More-World-API.patch similarity index 100% rename from patches/server/0627-More-World-API.patch rename to patches/server/0626-More-World-API.patch diff --git a/patches/server/0628-Added-PlayerBedFailEnterEvent.patch b/patches/server/0627-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0628-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0627-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0629-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0628-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0629-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0628-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0630-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0629-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0630-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0629-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0631-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0630-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0631-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0630-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0632-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0631-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 95% rename from patches/server/0632-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0631-add-RespawnFlags-to-PlayerRespawnEvent.patch index f6c9a8499..d03dd9a29 100644 --- a/patches/server/0632-add-RespawnFlags-to-PlayerRespawnEvent.patch +++ b/patches/server/0631-add-RespawnFlags-to-PlayerRespawnEvent.patch @@ -5,10 +5,10 @@ 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 a65ca51125de3935e610f9f5fdb047268d0c0102..c78d2aa1d4c2066716e274a26496ddd8eaf1be0a 100644 +index 917aa2bd63db9a63c75267564d0c3602b0f01392..161b5d6f0d420ac7b6ed112d1b03d42c3aaec421 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2890,7 +2890,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2894,7 +2894,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic case PERFORM_RESPAWN: if (this.player.wonGame) { this.player.wonGame = false; diff --git a/patches/server/0633-Add-Channel-initialization-listeners.patch b/patches/server/0632-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0633-Add-Channel-initialization-listeners.patch rename to patches/server/0632-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0634-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0633-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0634-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0633-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0635-Add-more-WanderingTrader-API.patch b/patches/server/0634-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0635-Add-more-WanderingTrader-API.patch rename to patches/server/0634-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0636-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0635-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0636-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0635-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0637-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0636-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0637-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0636-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0638-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0638-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0639-Inventory-close.patch b/patches/server/0638-Inventory-close.patch similarity index 100% rename from patches/server/0639-Inventory-close.patch rename to patches/server/0638-Inventory-close.patch diff --git a/patches/server/0640-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0639-call-PortalCreateEvent-players-and-end-platform.patch similarity index 100% rename from patches/server/0640-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0639-call-PortalCreateEvent-players-and-end-platform.patch diff --git a/patches/server/0641-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0640-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0641-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0640-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0642-Fix-CraftPotionBrewer-cache.patch b/patches/server/0641-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0642-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0641-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0643-Add-basic-Datapack-API.patch b/patches/server/0642-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0643-Add-basic-Datapack-API.patch rename to patches/server/0642-Add-basic-Datapack-API.patch diff --git a/patches/server/0644-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0643-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0644-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0643-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0645-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0644-additions-to-PlayerGameModeChangeEvent.patch similarity index 98% rename from patches/server/0645-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0644-additions-to-PlayerGameModeChangeEvent.patch index 22997bcc3..5262ad725 100644 --- a/patches/server/0645-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0644-additions-to-PlayerGameModeChangeEvent.patch @@ -126,10 +126,10 @@ 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 c78d2aa1d4c2066716e274a26496ddd8eaf1be0a..a10d09f2129a3e3a8dd72f32494e80bce14905b9 100644 +index 161b5d6f0d420ac7b6ed112d1b03d42c3aaec421..de4c3849cc60151de8f3a873adad2bc36e30fbc4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2899,7 +2899,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2903,7 +2903,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.player = this.server.getPlayerList().respawn(this.player, false); if (this.server.isHardcore()) { diff --git a/patches/server/0646-ItemStack-repair-check-API.patch b/patches/server/0645-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0646-ItemStack-repair-check-API.patch rename to patches/server/0645-ItemStack-repair-check-API.patch diff --git a/patches/server/0647-More-Enchantment-API.patch b/patches/server/0646-More-Enchantment-API.patch similarity index 97% rename from patches/server/0647-More-Enchantment-API.patch rename to patches/server/0646-More-Enchantment-API.patch index 2f72e0f25..538c746f7 100644 --- a/patches/server/0647-More-Enchantment-API.patch +++ b/patches/server/0646-More-Enchantment-API.patch @@ -64,10 +64,10 @@ index 31a22f26070059e5379730c1940ff1c5fb109be1..873185fd4d4c994130f2e7c271b3e03c public net.minecraft.world.item.enchantment.Enchantment getHandle() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index a0ed78ffbfe8a236da273f796a016fe06875e10a..c33e33d2eba4630113a4399a0883af4b24ad943a 100644 +index 1322f5a059743e7e2245ef2e25e9bffda138aa7c..3ba00e72d9760ec0dcde93d54cd7868eea23ec8a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -872,5 +872,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -913,5 +913,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public void setHurtDirection(float hurtDirection) { getHandle().hurtDir = hurtDirection; } diff --git a/patches/server/0648-Move-range-check-for-block-placing-up.patch b/patches/server/0647-Move-range-check-for-block-placing-up.patch similarity index 92% rename from patches/server/0648-Move-range-check-for-block-placing-up.patch rename to patches/server/0647-Move-range-check-for-block-placing-up.patch index bb8c5f2ba..f4a82e33e 100644 --- a/patches/server/0648-Move-range-check-for-block-placing-up.patch +++ b/patches/server/0647-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 66d5b3d44fb56aa6142f730e4742bb8f04f4d1c8..da9001a29b2ec2f715336c8187e6c918dd32db5e 100644 +index de4c3849cc60151de8f3a873adad2bc36e30fbc4..3ef39ebeb76f43d521266402e170bd1af6af2348 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/0649-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0648-Fix-and-optimise-world-force-upgrading.patch similarity index 99% rename from patches/server/0649-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0648-Fix-and-optimise-world-force-upgrading.patch index a7d3f9724..95adf64b1 100644 --- a/patches/server/0649-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0648-Fix-and-optimise-world-force-upgrading.patch @@ -303,7 +303,7 @@ index 3c5b7f4b2db421d56e5832e283bd60702b2d67de..84e76fbe3eca77b112c9dff936e21cba if (dimensionKey == LevelStem.OVERWORLD) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index d9a88b29cfefcdbce7bfc477b6c1af0e51079102..c21274a72dca31c9160ecbcfa7eb42de64e91454 100644 +index 525df1e5515fff204f790edcd0a051e851c03d33..ea2e75b227673f8b0016254f8c52a6721c8adf33 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -182,6 +182,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0650-Add-Mob-lookAt-API.patch b/patches/server/0649-Add-Mob-lookAt-API.patch similarity index 95% rename from patches/server/0650-Add-Mob-lookAt-API.patch rename to patches/server/0649-Add-Mob-lookAt-API.patch index 14378270e..34a4f0308 100644 --- a/patches/server/0650-Add-Mob-lookAt-API.patch +++ b/patches/server/0649-Add-Mob-lookAt-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Mob#lookAt API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index 881bb11507eafe87522ad4131ea7859f42918b3e..d9008049188c1933f2b6b39b9219983ff947b4bf 100644 +index 206b4d187a486e2c8a3a36eacb2d33f9d2555fe8..e19014a6e0d293973574c40c90c556aca17e0b0d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -@@ -82,5 +82,53 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { +@@ -91,5 +91,53 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { public boolean isInDaylight() { return getHandle().isSunBurnTick(); } diff --git a/patches/server/0651-Add-Unix-domain-socket-support.patch b/patches/server/0650-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0651-Add-Unix-domain-socket-support.patch rename to patches/server/0650-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0652-Add-EntityInsideBlockEvent.patch b/patches/server/0651-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0652-Add-EntityInsideBlockEvent.patch rename to patches/server/0651-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0653-Attributes-API-for-item-defaults.patch b/patches/server/0652-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0653-Attributes-API-for-item-defaults.patch rename to patches/server/0652-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0654-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0653-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0654-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0653-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0655-More-Lidded-Block-API.patch b/patches/server/0654-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0655-More-Lidded-Block-API.patch rename to patches/server/0654-More-Lidded-Block-API.patch diff --git a/patches/server/0656-Limit-item-frame-cursors-on-maps.patch b/patches/server/0655-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0656-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0655-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0657-Add-PlayerKickEvent-causes.patch b/patches/server/0656-Add-PlayerKickEvent-causes.patch similarity index 96% rename from patches/server/0657-Add-PlayerKickEvent-causes.patch rename to patches/server/0656-Add-PlayerKickEvent-causes.patch index 87c2e68e7..aadf1414f 100644 --- a/patches/server/0657-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0656-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 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c856d4c987 100644 +index 3ef39ebeb76f43d521266402e170bd1af6af2348..55c5348e793fa560d7042cf90076a8f7a3b76547 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 @@ -222,7 +222,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 return; } } -@@ -1962,7 +1972,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1963,7 +1973,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); if (packet.getAction() == ServerboundResourcePackPacket.Action.DECLINED && this.server.isResourcePackRequired()) { ServerGamePacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack rejection", this.player.getName()); @@ -231,7 +231,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 } // Paper start PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packet.action.ordinal()]; -@@ -2075,7 +2085,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2076,7 +2086,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.player.resetLastActionTime(); } else { ServerGamePacketListenerImpl.LOGGER.warn("{} tried to set an invalid carried item", this.player.getName().getString()); @@ -240,7 +240,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 } } -@@ -2088,7 +2098,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2089,7 +2099,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } // CraftBukkit end if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.message())) { @@ -249,7 +249,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 } else { if (this.tryHandleChat(packet.message(), packet.timeStamp(), packet.lastSeenMessages())) { // this.server.submit(() -> { // CraftBukkit - async chat -@@ -2116,7 +2126,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2117,7 +2127,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleChatCommand(ServerboundChatCommandPacket packet) { if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.command())) { @@ -258,7 +258,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 } else { if (this.tryHandleChat(packet.command(), packet.timeStamp(), packet.lastSeenMessages())) { this.server.submit(() -> { -@@ -2202,7 +2212,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2203,7 +2213,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic private boolean tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) { if (!this.updateChatOrder(timestamp)) { ServerGamePacketListenerImpl.LOGGER.warn("{} sent out-of-order chat: '{}'", this.player.getName().getString(), message); @@ -267,7 +267,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 return false; } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false)); -@@ -2461,7 +2471,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2465,7 +2475,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } if (!playerchatmessage.verify(chatsender)) { @@ -276,7 +276,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 return false; } } -@@ -2489,7 +2499,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2493,7 +2503,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic // this.chatSpamTickCount += 20; if (this.chatSpamTickCount.addAndGet(20) > 200 && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // CraftBukkit end @@ -285,7 +285,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 } } -@@ -2592,7 +2602,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2596,7 +2606,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic private void handleValidationFailure(Set reasons) { ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message from {}, reasons: {}", this.player.getName().getString(), reasons.stream().map(LastSeenMessagesValidator.ErrorCondition::message).collect(Collectors.joining(","))); @@ -294,7 +294,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 } @Override -@@ -2733,7 +2743,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2737,7 +2747,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } if (i > 4096) { @@ -303,7 +303,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 } } -@@ -2748,7 +2758,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2752,7 +2762,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic // Spigot Start if ( entity == this.player && !this.player.isSpectator() ) { @@ -312,7 +312,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 return; } // Spigot End -@@ -2846,7 +2856,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2850,7 +2860,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } // CraftBukkit end } else { @@ -321,7 +321,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 ServerGamePacketListenerImpl.LOGGER.warn("Player {} tried to attack an invalid entity", ServerGamePacketListenerImpl.this.player.getName().getString()); } } -@@ -3254,7 +3264,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3258,7 +3268,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic // Paper start if (!org.bukkit.Bukkit.isPrimaryThread()) { if (recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) { @@ -330,7 +330,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 return; } } -@@ -3457,7 +3467,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3461,7 +3471,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } else if (!this.isSingleplayerOwner()) { // Paper start - This needs to be handled on the main thread for plugins server.submit(() -> { @@ -339,7 +339,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 }); // Paper end } -@@ -3503,7 +3513,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3507,7 +3517,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } } catch (Exception ex) { ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex); @@ -348,7 +348,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 } } else if (packet.identifier.equals(CUSTOM_UNREGISTER)) { try { -@@ -3513,7 +3523,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3517,7 +3527,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } } catch (Exception ex) { ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex); @@ -357,7 +357,7 @@ index 0b9365e60b36550e356cd2e43bad63951d2e315d..7fe9e406a865abb256e02a697c0412c8 } } else { try { -@@ -3531,7 +3541,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3535,7 +3545,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), packet.identifier.toString(), data); } catch (Exception ex) { ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex); diff --git a/patches/server/0658-Add-PufferFishStateChangeEvent.patch b/patches/server/0657-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0658-Add-PufferFishStateChangeEvent.patch rename to patches/server/0657-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0659-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0658-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0659-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0658-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0660-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0659-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0660-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0659-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0661-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0660-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0661-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0660-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0662-Add-BellRevealRaiderEvent.patch b/patches/server/0661-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0662-Add-BellRevealRaiderEvent.patch rename to patches/server/0661-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0663-Fix-invulnerable-end-crystals.patch b/patches/server/0662-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0663-Fix-invulnerable-end-crystals.patch rename to patches/server/0662-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0664-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0663-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0664-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0663-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0665-Fix-dangerous-end-portal-logic.patch b/patches/server/0664-Fix-dangerous-end-portal-logic.patch similarity index 96% rename from patches/server/0665-Fix-dangerous-end-portal-logic.patch rename to patches/server/0664-Fix-dangerous-end-portal-logic.patch index f8757be01..bb45e6156 100644 --- a/patches/server/0665-Fix-dangerous-end-portal-logic.patch +++ b/patches/server/0664-Fix-dangerous-end-portal-logic.patch @@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was designed to happen in the first place. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bfac12f0e89c4c7d48321ea608363518742304af..4888873a5efa026a1082c9f216eecc950b6f2471 100644 +index 525e712c5715f1fa323fae94d4158c4e66068fe3..0b524fb57af63ad3b9e11a30e7b2d0fd219664ad 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -459,6 +459,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -51,7 +51,7 @@ index bfac12f0e89c4c7d48321ea608363518742304af..4888873a5efa026a1082c9f216eecc95 public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); -@@ -2621,6 +2651,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2635,6 +2665,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } this.processPortalCooldown(); diff --git a/patches/server/0666-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0665-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0666-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0665-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0667-Make-item-validations-configurable.patch b/patches/server/0666-Make-item-validations-configurable.patch similarity index 93% rename from patches/server/0667-Make-item-validations-configurable.patch rename to patches/server/0666-Make-item-validations-configurable.patch index 8c87e474a..d079cc7ed 100644 --- a/patches/server/0667-Make-item-validations-configurable.patch +++ b/patches/server/0666-Make-item-validations-configurable.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Make item validations configurable diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -index fefa4d83c5699be0b55794cd28d13d27b66ef108..d662cb0567884ec91c900f5c90ecb36912b127dd 100644 +index e8413ad360e9b6c4eef13edf9dd0095e7e64bce2..a5d7fae348b0b262a0a8a5e8e76f1bc75ca52a16 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -@@ -92,11 +92,11 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { +@@ -88,11 +88,11 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { super(tag); if (tag.contains(BOOK_TITLE.NBT)) { @@ -22,7 +22,7 @@ index fefa4d83c5699be0b55794cd28d13d27b66ef108..d662cb0567884ec91c900f5c90ecb369 } if (tag.contains(RESOLVED.NBT)) { -@@ -124,7 +124,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { +@@ -120,7 +120,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { } else { page = this.validatePage(page); } diff --git a/patches/server/0668-Line-Of-Sight-Changes.patch b/patches/server/0667-Line-Of-Sight-Changes.patch similarity index 93% rename from patches/server/0668-Line-Of-Sight-Changes.patch rename to patches/server/0667-Line-Of-Sight-Changes.patch index 23a60d3d6..80cd9d95a 100644 --- a/patches/server/0668-Line-Of-Sight-Changes.patch +++ b/patches/server/0667-Line-Of-Sight-Changes.patch @@ -5,10 +5,10 @@ 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 644d71c024103c39d7532559c810038d687106e5..2694f7af35deff5c94929350589b2564f7bbdeff 100644 +index d427cd90177b14062ea56dcf6fa5fedddcdbb624..4dee04c8012245b94191454943d68ee20fae887a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3484,7 +3484,8 @@ public abstract class LivingEntity extends Entity { +@@ -3506,7 +3506,8 @@ public abstract class LivingEntity extends Entity { Vec3 vec3d = new Vec3(this.getX(), this.getEyeY(), this.getZ()); Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ()); @@ -40,7 +40,7 @@ index 84d84ceda1855bd1d11b2917c16fdb845a7600fe..d1fca0e3227b5f37c11367548be362f5 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 8fe1f5deddfee329c020d93c990dc686fe2b458e..ca176b9331345e343c19a02b6ba2ea886d20962d 100644 +index 3ba00e72d9760ec0dcde93d54cd7868eea23ec8a..310dcf72f24fcbb86bc5b118536a8ebfc084eb7e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -29,6 +29,9 @@ import net.minecraft.world.entity.projectile.ThrownEgg; @@ -53,7 +53,7 @@ index 8fe1f5deddfee329c020d93c990dc686fe2b458e..ca176b9331345e343c19a02b6ba2ea88 import org.apache.commons.lang.Validate; import org.bukkit.FluidCollisionMode; import org.bukkit.Location; -@@ -557,6 +560,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -559,6 +562,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { return this.getHandle().hasLineOfSight(((CraftEntity) other).getHandle()); } diff --git a/patches/server/0669-add-per-world-spawn-limits.patch b/patches/server/0668-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0669-add-per-world-spawn-limits.patch rename to patches/server/0668-add-per-world-spawn-limits.patch diff --git a/patches/server/0670-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0669-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0670-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/server/0669-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0671-Add-more-LimitedRegion-API.patch b/patches/server/0670-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0671-Add-more-LimitedRegion-API.patch rename to patches/server/0670-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0672-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0671-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0672-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0671-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0673-Missing-Entity-Behavior-API.patch b/patches/server/0672-Missing-Entity-Behavior-API.patch similarity index 98% rename from patches/server/0673-Missing-Entity-Behavior-API.patch rename to patches/server/0672-Missing-Entity-Behavior-API.patch index 31cf843b1..ba264fa32 100644 --- a/patches/server/0673-Missing-Entity-Behavior-API.patch +++ b/patches/server/0672-Missing-Entity-Behavior-API.patch @@ -447,12 +447,12 @@ index da1488c9cae53bd554727c850da2192adda2478a..30a0eac179c86b0fe94a2a40b5bfcd3e + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java -index 27a8a2b1e03254b1fc6fe8edc3ff77841a42f5f6..8d77b870fd9de69b57ae1affdfbd2a02f62e75c7 100644 +index b10bcbc19362f0f8596ebcf3f3e1060486cfc74f..e24eec79402843105a13de2bb8554260908057cc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java -@@ -58,4 +58,16 @@ public abstract class CraftRaider extends CraftMonster implements Raider { - public void setCanJoinRaid(boolean join) { - this.getHandle().setCanJoinRaid(join); +@@ -65,4 +65,16 @@ public abstract class CraftRaider extends CraftMonster implements Raider { + public Sound getCelebrationSound() { + return CraftSound.getBukkit(this.getHandle().getCelebrateSound()); } + + // Paper start diff --git a/patches/server/0674-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0673-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 92% rename from patches/server/0674-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0673-Ensure-disconnect-for-book-edit-is-called-on-main.patch index 8dfe520cc..a2ab09f58 100644 --- a/patches/server/0674-Ensure-disconnect-for-book-edit-is-called-on-main.patch +++ b/patches/server/0673-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 b87d5dda2ac847cdc4c83b713568d9e9a37d0c8f..6d3929916da5ea45c5f9f3d0d11b3bd4db9660ef 100644 +index 55c5348e793fa560d7042cf90076a8f7a3b76547..63bfea707e0664e19726692546dd0ac8a86f8b8f 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/0675-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0674-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0675-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0674-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0676-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0675-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 96% rename from patches/server/0676-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0675-Use-getChunkIfLoadedImmediately-in-places.patch index c6816f80a..1e0ae5d1c 100644 --- a/patches/server/0676-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/patches/server/0675-Use-getChunkIfLoadedImmediately-in-places.patch @@ -30,7 +30,7 @@ index 6e9f1f01227a94480043ba3120c77f1ae080ec02..d0c4c9c172c8caa3eaf6c0bf56a8be9f if (chunk != null) { for (int j2 = k; j2 <= j1; ++j2) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index c21274a72dca31c9160ecbcfa7eb42de64e91454..2a4e6c6f732d9cd2567352b7fca2c284b0bb9c1b 100644 +index ea2e75b227673f8b0016254f8c52a6721c8adf33..4b7ed29a7a38cf7f8fb488c9c34471fafcdf2f25 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -199,6 +199,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0677-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0676-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0677-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0676-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0678-Adds-PlayerArmSwingEvent.patch b/patches/server/0677-Adds-PlayerArmSwingEvent.patch similarity index 88% rename from patches/server/0678-Adds-PlayerArmSwingEvent.patch rename to patches/server/0677-Adds-PlayerArmSwingEvent.patch index 6bed9fc64..a21292ebf 100644 --- a/patches/server/0678-Adds-PlayerArmSwingEvent.patch +++ b/patches/server/0677-Adds-PlayerArmSwingEvent.patch @@ -5,10 +5,10 @@ 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 4e969e37c3ba9ada9ee770a599e52873ada78cdc..74f1221e51e8b0875c4242c9ec2f635aa0827bea 100644 +index 63bfea707e0664e19726692546dd0ac8a86f8b8f..7d594e23dc7c393f258b16ec5f04e60fc31f91c8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2627,7 +2627,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2631,7 +2631,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } // Arm swing animation diff --git a/patches/server/0679-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0678-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 96% rename from patches/server/0679-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0678-Fixes-kick-event-leave-message-not-being-sent.patch index f8473df41..8ca4f8856 100644 --- a/patches/server/0679-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0678-Fixes-kick-event-leave-message-not-being-sent.patch @@ -17,7 +17,7 @@ index 9a60cf249e0b9f089b0966c670e6046e7e1ed08a..787f2b23352fbfb66a76ca5fce6de94c 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 47043ebc5054a03ac56d171dc0c8c54bff0230c3..513a0e9c941a3ce7c3123d2476454ccc21dbeeba 100644 +index 7d594e23dc7c393f258b16ec5f04e60fc31f91c8..ebaf6ddcdccf4e2a5836782e58770e2cf1008f9d 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 @@ -37,7 +37,7 @@ index 47043ebc5054a03ac56d171dc0c8c54bff0230c3..513a0e9c941a3ce7c3123d2476454ccc this.connection.setReadOnly(); MinecraftServer minecraftserver = this.server; Connection networkmanager = this.connection; -@@ -1997,6 +1996,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1998,6 +1997,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void onDisconnect(Component reason) { @@ -49,7 +49,7 @@ index 47043ebc5054a03ac56d171dc0c8c54bff0230c3..513a0e9c941a3ce7c3123d2476454ccc // CraftBukkit start - Rarely it would send a disconnect line twice if (this.processedDisconnect) { return; -@@ -2013,7 +2017,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2014,7 +2018,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.player.disconnect(); // Paper start - Adventure diff --git a/patches/server/0680-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0679-Add-config-for-mobs-immune-to-default-effects.patch similarity index 97% rename from patches/server/0680-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0679-Add-config-for-mobs-immune-to-default-effects.patch index 600a8111c..66f43a21f 100644 --- a/patches/server/0680-Add-config-for-mobs-immune-to-default-effects.patch +++ b/patches/server/0679-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 2694f7af35deff5c94929350589b2564f7bbdeff..b0f38933d25397773ac8668f9d1e759d6b43884d 100644 +index 4dee04c8012245b94191454943d68ee20fae887a..6e2301f58f103b70b491fd59d5a6657593ac94b7 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/0681-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0680-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0681-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0680-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0682-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0681-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0682-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0681-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0683-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0682-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0683-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0682-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0684-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0683-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0684-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0683-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0685-Stinger-API.patch b/patches/server/0684-Stinger-API.patch similarity index 90% rename from patches/server/0685-Stinger-API.patch rename to patches/server/0684-Stinger-API.patch index 33f895931..bfa434970 100644 --- a/patches/server/0685-Stinger-API.patch +++ b/patches/server/0684-Stinger-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Stinger API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index ca176b9331345e343c19a02b6ba2ea886d20962d..c022751e3b45469cc0ad6732e2d6ff08918bafa4 100644 +index 310dcf72f24fcbb86bc5b118536a8ebfc084eb7e..1994dd3c272395a27474ec1b37a924a24fc50fd6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -321,7 +321,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -323,7 +323,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { Preconditions.checkArgument(count >= 0, "New arrow amount must be >= 0"); this.getHandle().getEntityData().set(net.minecraft.world.entity.LivingEntity.DATA_ARROW_COUNT_ID, count); } diff --git a/patches/server/0686-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0685-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 91% rename from patches/server/0686-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0685-Fix-incosistency-issue-with-empty-map-items-in-CB.patch index a58750b22..3f1afe6bf 100644 --- a/patches/server/0686-Fix-incosistency-issue-with-empty-map-items-in-CB.patch +++ b/patches/server/0685-Fix-incosistency-issue-with-empty-map-items-in-CB.patch @@ -18,10 +18,10 @@ index d407cf849a31a7a77fda07aa687ebb254f43d6ab..45a7e01288f780cf8a812d8e0ae12c4f public static int createNewSavedData(Level world, int x, int z, int scale, boolean showIcons, boolean unlimitedTracking, ResourceKey dimension) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java -index 96ab7d53f4e089c7666872f9fd0f09283259a726..8e634ccb91b58000412c572903e57d30ddb2caba 100644 +index 6f16f12b4cb9b53878416f1cea532548c418f518..e802623e2ef5fb8c423429335ee7dbabc45a1b74 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java -@@ -144,6 +144,7 @@ class CraftMetaMap extends CraftMetaItem implements MapMeta { +@@ -138,6 +138,7 @@ class CraftMetaMap extends CraftMetaItem implements MapMeta { @Override public int getMapId() { diff --git a/patches/server/0687-Add-System.out-err-catcher.patch b/patches/server/0686-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0687-Add-System.out-err-catcher.patch rename to patches/server/0686-Add-System.out-err-catcher.patch diff --git a/patches/server/0688-Fix-test-not-bootstrapping.patch b/patches/server/0687-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0688-Fix-test-not-bootstrapping.patch rename to patches/server/0687-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0689-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0688-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0689-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0688-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0690-Improve-boat-collision-performance.patch b/patches/server/0689-Improve-boat-collision-performance.patch similarity index 96% rename from patches/server/0690-Improve-boat-collision-performance.patch rename to patches/server/0689-Improve-boat-collision-performance.patch index 242644a66..f6283ceb9 100644 --- a/patches/server/0690-Improve-boat-collision-performance.patch +++ b/patches/server/0689-Improve-boat-collision-performance.patch @@ -17,7 +17,7 @@ index 4fce18c52c8144460ebf0c1e336dce712d796cc6..384ddb03af26ae360fd22e2e231d9d14 }; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b0f38933d25397773ac8668f9d1e759d6b43884d..bc01742e3e762fbb5b7eb712a9211e4a8d411e03 100644 +index 6e2301f58f103b70b491fd59d5a6657593ac94b7..76ef3f561e3f8e0c0f9732feb64aacca93b57431 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 { @@ -44,7 +44,7 @@ index b0f38933d25397773ac8668f9d1e759d6b43884d..bc01742e3e762fbb5b7eb712a9211e4a d0 = (Math.random() - Math.random()) * 0.01D; } -@@ -2141,7 +2142,7 @@ public abstract class LivingEntity extends Entity { +@@ -2163,7 +2164,7 @@ public abstract class LivingEntity extends Entity { this.hurtCurrentlyUsedShield((float) -event.getDamage(DamageModifier.BLOCKING)); Entity entity = damagesource.getDirectEntity(); diff --git a/patches/server/0691-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0690-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0691-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0690-Prevent-AFK-kick-while-watching-end-credits.patch index ac9275d80..e20f45173 100644 --- a/patches/server/0691-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0690-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 513a0e9c941a3ce7c3123d2476454ccc21dbeeba..fe2b99d0cde747c86cdc04c3d48f717b94747101 100644 +index ebaf6ddcdccf4e2a5836782e58770e2cf1008f9d..a4ed338b3317378fdad694d3b0b12379128ffd26 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/0692-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0691-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0692-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0691-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0693-Add-PlayerSetSpawnEvent.patch b/patches/server/0692-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0693-Add-PlayerSetSpawnEvent.patch rename to patches/server/0692-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0694-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0693-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0694-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0693-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0695-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0694-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0695-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0694-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0696-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0695-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0696-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0695-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0697-Added-EntityDamageItemEvent.patch b/patches/server/0696-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0697-Added-EntityDamageItemEvent.patch rename to patches/server/0696-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0698-Optimize-indirect-passenger-iteration.patch b/patches/server/0697-Optimize-indirect-passenger-iteration.patch similarity index 93% rename from patches/server/0698-Optimize-indirect-passenger-iteration.patch rename to patches/server/0697-Optimize-indirect-passenger-iteration.patch index 6ae8c4e69..9768e1b56 100644 --- a/patches/server/0698-Optimize-indirect-passenger-iteration.patch +++ b/patches/server/0697-Optimize-indirect-passenger-iteration.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Optimize indirect passenger iteration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4888873a5efa026a1082c9f216eecc950b6f2471..460b51374e41c3d88e1c3641fb9f2f0205399b54 100644 +index 0b524fb57af63ad3b9e11a30e7b2d0fd219664ad..307f3e4fa66bdf4f9b0864a7ba4aaa29f6e3b8d1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3596,26 +3596,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3610,26 +3610,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } private Stream getIndirectPassengersStream() { diff --git a/patches/server/0699-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0698-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0699-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/server/0698-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0700-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0699-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0700-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0699-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0701-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0700-Make-EntityUnleashEvent-cancellable.patch similarity index 94% rename from patches/server/0701-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0700-Make-EntityUnleashEvent-cancellable.patch index 10b64ca85..b16ad47f2 100644 --- a/patches/server/0701-Make-EntityUnleashEvent-cancellable.patch +++ b/patches/server/0700-Make-EntityUnleashEvent-cancellable.patch @@ -5,10 +5,10 @@ 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 837c0a8bd15388bdb60d6950a437640459adde3c..a49dfe4f81d449c5dd7ba5b8f9af7fec5c54f5de 100644 +index e08d69af81f4ca0535be522eef4792e4127f454c..5fb88a3b7242a2712a568aaccebe601f89bfee3a 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -1482,7 +1482,7 @@ public abstract class Mob extends LivingEntity { +@@ -1488,7 +1488,7 @@ public abstract class Mob extends LivingEntity { if (flag1 && this.isLeashed()) { // Paper start - drop leash variable EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.UNKNOWN, true); diff --git a/patches/server/0702-Clear-bucket-NBT-after-dispense.patch b/patches/server/0701-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0702-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0701-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0703-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0702-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0703-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0702-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0704-Add-BlockBreakBlockEvent.patch b/patches/server/0703-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0704-Add-BlockBreakBlockEvent.patch rename to patches/server/0703-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0705-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0704-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0705-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0704-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0706-More-CommandBlock-API.patch b/patches/server/0705-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0706-More-CommandBlock-API.patch rename to patches/server/0705-More-CommandBlock-API.patch diff --git a/patches/server/0707-Add-missing-team-sidebar-display-slots.patch b/patches/server/0706-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0707-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0706-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0708-Add-back-EntityPortalExitEvent.patch b/patches/server/0707-Add-back-EntityPortalExitEvent.patch similarity index 93% rename from patches/server/0708-Add-back-EntityPortalExitEvent.patch rename to patches/server/0707-Add-back-EntityPortalExitEvent.patch index 79c8ecd49..3dec60a42 100644 --- a/patches/server/0708-Add-back-EntityPortalExitEvent.patch +++ b/patches/server/0707-Add-back-EntityPortalExitEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add back EntityPortalExitEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 460b51374e41c3d88e1c3641fb9f2f0205399b54..3f4436a2257376f604926ff35c8589ba59c859e2 100644 +index 307f3e4fa66bdf4f9b0864a7ba4aaa29f6e3b8d1..f212451892c73320cc9fa0e08b059948cc1b3162 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3098,6 +3098,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3112,6 +3112,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } else { // CraftBukkit start worldserver = shapedetectorshape.world; @@ -32,7 +32,7 @@ index 460b51374e41c3d88e1c3641fb9f2f0205399b54..3f4436a2257376f604926ff35c8589ba if (worldserver == this.level) { // SPIGOT-6782: Just move the entity if a plugin changed the world to the one the entity is already in this.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, shapedetectorshape.xRot); -@@ -3117,8 +3134,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3131,8 +3148,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (entity != null) { entity.restoreFrom(this); diff --git a/patches/server/0709-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0708-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0709-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0708-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0710-Get-entity-default-attributes.patch b/patches/server/0709-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0710-Get-entity-default-attributes.patch rename to patches/server/0709-Get-entity-default-attributes.patch diff --git a/patches/server/0711-Left-handed-API.patch b/patches/server/0710-Left-handed-API.patch similarity index 83% rename from patches/server/0711-Left-handed-API.patch rename to patches/server/0710-Left-handed-API.patch index 8a6c26a27..51c41178e 100644 --- a/patches/server/0711-Left-handed-API.patch +++ b/patches/server/0710-Left-handed-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Left handed API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index d9008049188c1933f2b6b39b9219983ff947b4bf..d775e19402188e35f79affb4ed636b6533f90ab5 100644 +index e19014a6e0d293973574c40c90c556aca17e0b0d..9187f92f1708478dfffcd9de65898fd409a1b0c1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -@@ -130,5 +130,15 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { +@@ -139,5 +139,15 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { public int getMaxHeadPitch() { return getHandle().getMaxHeadXRot(); } diff --git a/patches/server/0712-Add-advancement-display-API.patch b/patches/server/0711-Add-advancement-display-API.patch similarity index 100% rename from patches/server/0712-Add-advancement-display-API.patch rename to patches/server/0711-Add-advancement-display-API.patch diff --git a/patches/server/0713-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0712-Add-ItemFactory-getMonsterEgg-API.patch similarity index 100% rename from patches/server/0713-Add-ItemFactory-getMonsterEgg-API.patch rename to patches/server/0712-Add-ItemFactory-getMonsterEgg-API.patch diff --git a/patches/server/0714-Add-critical-damage-API.patch b/patches/server/0713-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0714-Add-critical-damage-API.patch rename to patches/server/0713-Add-critical-damage-API.patch diff --git a/patches/server/0715-Fix-issues-with-mob-conversion.patch b/patches/server/0714-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0715-Fix-issues-with-mob-conversion.patch rename to patches/server/0714-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0716-Add-isCollidable-methods-to-various-places.patch b/patches/server/0715-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0716-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0715-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0717-Goat-ram-API.patch b/patches/server/0716-Goat-ram-API.patch similarity index 100% rename from patches/server/0717-Goat-ram-API.patch rename to patches/server/0716-Goat-ram-API.patch diff --git a/patches/server/0718-Add-API-for-resetting-a-single-score.patch b/patches/server/0717-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0718-Add-API-for-resetting-a-single-score.patch rename to patches/server/0717-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0719-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0718-Add-Raw-Byte-Entity-Serialization.patch similarity index 93% rename from patches/server/0719-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0718-Add-Raw-Byte-Entity-Serialization.patch index a4fbf9a56..cf158a3d0 100644 --- a/patches/server/0719-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/server/0718-Add-Raw-Byte-Entity-Serialization.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Raw Byte Entity Serialization diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3f4436a2257376f604926ff35c8589ba59c859e2..6f3147713b5bec3b2771e1ec52917fd4aee681bc 100644 +index f212451892c73320cc9fa0e08b059948cc1b3162..5936fb0d27266e0e91eae5cf49e15f67aeb208bf 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1921,6 +1921,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1935,6 +1935,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } } @@ -25,10 +25,10 @@ index 3f4436a2257376f604926ff35c8589ba59c859e2..6f3147713b5bec3b2771e1ec52917fd4 return this.isPassenger() ? false : this.saveAsPassenger(nbt); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index e9828bab16ac05babccfb1fefad85860c1a4768c..f04dcefde38c03403f05305ef044b0ee7608eaa3 100644 +index b30fb13db5524dcd05a155b014b93089af05c994..a1ef4ba683b1721359fb162b5f97ceefd7207184 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1295,5 +1295,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1312,5 +1312,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } return set; } diff --git a/patches/server/0720-Vanilla-command-permission-fixes.patch b/patches/server/0719-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0720-Vanilla-command-permission-fixes.patch rename to patches/server/0719-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0721-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch similarity index 100% rename from patches/server/0721-Do-not-allow-the-server-to-unload-chunks-at-request-.patch rename to patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch diff --git a/patches/server/0722-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0722-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0723-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch similarity index 100% rename from patches/server/0723-Correctly-handle-recursion-for-chunkholder-updates.patch rename to patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch diff --git a/patches/server/0724-Fix-GameProfileCache-concurrency.patch b/patches/server/0723-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0724-Fix-GameProfileCache-concurrency.patch rename to patches/server/0723-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0725-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch similarity index 100% rename from patches/server/0725-Fix-chunks-refusing-to-unload-at-low-TPS.patch rename to patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch diff --git a/patches/server/0726-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch similarity index 100% rename from patches/server/0726-Do-not-allow-ticket-level-changes-while-unloading-pl.patch rename to patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch diff --git a/patches/server/0727-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch similarity index 100% rename from patches/server/0727-Do-not-allow-ticket-level-changes-when-updating-chun.patch rename to patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch diff --git a/patches/server/0728-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0727-Log-when-the-async-catcher-is-tripped.patch similarity index 100% rename from patches/server/0728-Log-when-the-async-catcher-is-tripped.patch rename to patches/server/0727-Log-when-the-async-catcher-is-tripped.patch diff --git a/patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0729-Prevent-unload-calls-removing-tickets-for-sync-loads.patch similarity index 100% rename from patches/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch rename to patches/server/0729-Prevent-unload-calls-removing-tickets-for-sync-loads.patch diff --git a/patches/server/0731-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0730-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0731-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0730-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0732-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0731-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0732-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0731-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0733-Optimise-general-POI-access.patch b/patches/server/0732-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0733-Optimise-general-POI-access.patch rename to patches/server/0732-Optimise-general-POI-access.patch diff --git a/patches/server/0734-Add-more-async-catchers.patch b/patches/server/0733-Add-more-async-catchers.patch similarity index 100% rename from patches/server/0734-Add-more-async-catchers.patch rename to patches/server/0733-Add-more-async-catchers.patch diff --git a/patches/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch similarity index 99% rename from patches/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch rename to patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch index 0318fbaff..5179560e7 100644 --- a/patches/server/0735-Rewrite-entity-bounding-box-lookup-calls.patch +++ b/patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch @@ -953,7 +953,7 @@ index 32d6e4b194c3c4eca7009059f8d185896b5ae556..51d3150e732f95be13f5f54d994dab1f + // Paper end } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6f3147713b5bec3b2771e1ec52917fd4aee681bc..9567822f314cd3978ed63bb867e57b610d76228e 100644 +index 5936fb0d27266e0e91eae5cf49e15f67aeb208bf..f8458173dd717ca5fd9d265dcdaee0f0ef1a833c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -490,6 +490,56 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -1013,7 +1013,7 @@ index 6f3147713b5bec3b2771e1ec52917fd4aee681bc..9567822f314cd3978ed63bb867e57b61 public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); this.passengers = ImmutableList.of(); -@@ -2358,11 +2408,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2372,11 +2422,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return InteractionResult.PASS; } @@ -1229,7 +1229,7 @@ index a1a52669c19af22e3b5267d43584cb00d1646453..f635b610e68d129aa0ae60c54b83da69 Visibility visibility = PersistentEntitySectionManager.getEffectiveStatus(this.entity, this.currentSection.getStatus()); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index 518dfbb7dbd4221937636cf46d27109de6f431a4..e86b3ee5c8225d9f789cf426cc1418fde0fa12f0 100644 +index d9c2e7e18e1ede37d92cecb8ddb32dae1472bd1c..2224b9cfbc3be59037ef49ce278989ea3a710bb5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -134,9 +134,7 @@ public class CraftChunk implements Chunk { diff --git a/patches/server/0736-Optimise-chunk-tick-iteration.patch b/patches/server/0735-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0736-Optimise-chunk-tick-iteration.patch rename to patches/server/0735-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0737-Execute-chunk-tasks-mid-tick.patch b/patches/server/0736-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0737-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0736-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0738-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0737-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0738-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0737-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0739-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0738-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0739-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0738-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0740-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0739-Detail-more-information-in-watchdog-dumps.patch similarity index 98% rename from patches/server/0740-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0739-Detail-more-information-in-watchdog-dumps.patch index 7b40f83dd..0fc0b9475 100644 --- a/patches/server/0740-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/server/0739-Detail-more-information-in-watchdog-dumps.patch @@ -124,7 +124,7 @@ index 7324f2ad437a15c42f84ba2deeb58861c0552209..92aafd475d58d1ef2e2736d9363c4b10 private void tickPassenger(Entity vehicle, Entity passenger) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9567822f314cd3978ed63bb867e57b610d76228e..37123198bdf0188f59f289a31570663938fdc3c1 100644 +index f8458173dd717ca5fd9d265dcdaee0f0ef1a833c..51239bc47d6d2cfd8d345fb67fe0d92fabe53209 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -971,7 +971,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -184,7 +184,7 @@ index 9567822f314cd3978ed63bb867e57b610d76228e..37123198bdf0188f59f289a315706639 } protected boolean isHorizontalCollisionMinor(Vec3 adjustedMovement) { -@@ -3948,7 +3990,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3962,7 +4004,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public void setDeltaMovement(Vec3 velocity) { @@ -194,7 +194,7 @@ index 9567822f314cd3978ed63bb867e57b610d76228e..37123198bdf0188f59f289a315706639 } public void setDeltaMovement(double x, double y, double z) { -@@ -4024,7 +4068,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4038,7 +4082,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } // Paper end - fix MC-4 if (this.position.x != x || this.position.y != y || this.position.z != z) { diff --git a/patches/server/0741-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0740-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0741-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0740-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0742-Distance-manager-tick-timings.patch b/patches/server/0741-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0742-Distance-manager-tick-timings.patch rename to patches/server/0741-Distance-manager-tick-timings.patch diff --git a/patches/server/0743-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0742-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0743-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0742-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0743-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 94% rename from patches/server/0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0743-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch index 300dfa888..8f16f744a 100644 --- a/patches/server/0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch +++ b/patches/server/0743-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch @@ -13,7 +13,7 @@ Paper recently reverted this optimisation, so it's been reintroduced here. diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 7c4ec47829bb0818f489544f2b396852d42a35d3..e7487e0a21727666889cc2ec8841cca2b2c965d5 100644 +index 90b3ca30a5ab381acde66393eb1fed5be677e5c8..8eabdd921cc976d9a1b9d3e8c315eeb22de3a968 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -368,6 +368,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0745-Add-packet-limiter-config.patch b/patches/server/0744-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0745-Add-packet-limiter-config.patch rename to patches/server/0744-Add-packet-limiter-config.patch diff --git a/patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0745-Use-correct-LevelStem-registry-when-loading-default-.patch similarity index 100% rename from patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch rename to patches/server/0745-Use-correct-LevelStem-registry-when-loading-default-.patch diff --git a/patches/server/0747-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0746-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0747-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0746-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0748-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0747-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0748-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/server/0747-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0749-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0748-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0749-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0748-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0750-Time-scoreboard-search.patch b/patches/server/0749-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0750-Time-scoreboard-search.patch rename to patches/server/0749-Time-scoreboard-search.patch diff --git a/patches/server/0751-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0750-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0751-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0750-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0752-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0751-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0752-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0751-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0753-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0752-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0753-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0752-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0754-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0753-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0754-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0753-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0755-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0754-Allow-removal-addition-of-entities-to-entity-ticklis.patch similarity index 100% rename from patches/server/0755-Allow-removal-addition-of-entities-to-entity-ticklis.patch rename to patches/server/0754-Allow-removal-addition-of-entities-to-entity-ticklis.patch diff --git a/patches/server/0756-Optimise-random-block-ticking.patch b/patches/server/0755-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0756-Optimise-random-block-ticking.patch rename to patches/server/0755-Optimise-random-block-ticking.patch diff --git a/patches/server/0757-Optimise-non-flush-packet-sending.patch b/patches/server/0756-Optimise-non-flush-packet-sending.patch similarity index 100% rename from patches/server/0757-Optimise-non-flush-packet-sending.patch rename to patches/server/0756-Optimise-non-flush-packet-sending.patch diff --git a/patches/server/0758-Optimise-nearby-player-lookups.patch b/patches/server/0757-Optimise-nearby-player-lookups.patch similarity index 98% rename from patches/server/0758-Optimise-nearby-player-lookups.patch rename to patches/server/0757-Optimise-nearby-player-lookups.patch index 539831eea..f491e4b47 100644 --- a/patches/server/0758-Optimise-nearby-player-lookups.patch +++ b/patches/server/0757-Optimise-nearby-player-lookups.patch @@ -9,7 +9,7 @@ since the penalty of a map lookup could outweigh the benefits of searching less players (as it basically did in the outside range patch). diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index df6857ebcddc9a7bab6b82b71bfd447508b078b3..be5a742207623d186c5b936c669eb690c30d0719 100644 +index 538f21e6bc29c0307441fe4899dc7f600d2d1a04..09f262de1b12b09013f8277b25d13ffcf53b96d8 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java @@ -89,6 +89,12 @@ public class ChunkHolder { @@ -39,7 +39,7 @@ index df6857ebcddc9a7bab6b82b71bfd447508b078b3..be5a742207623d186c5b936c669eb690 // Paper end diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index b6da7ae1827c4009dc8b22745e82890e1bb0b5ef..95c49072e4e90a44873c96af8173d364a5614dff 100644 +index f47e2d4a7343f3e3ee68f36688720cedc58861dc..aa1b6b692f9107ef1b5091714f1ecc8b29da9897 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -165,6 +165,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -209,10 +209,10 @@ index bcd1b2534af33e7a9d184e0ea4c9c0a4b58dacc8..25149dde919738859f6fb6b2d0405e90 this.handlingTick = true; diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index a49dfe4f81d449c5dd7ba5b8f9af7fec5c54f5de..3646b969fa51b9683ab4137e530c3a6f6fc6c465 100644 +index 5fb88a3b7242a2712a568aaccebe601f89bfee3a..557e90e54439ce0430075403392b5052d5181feb 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -802,7 +802,12 @@ public abstract class Mob extends LivingEntity { +@@ -808,7 +808,12 @@ public abstract class Mob extends LivingEntity { if (this.level.getDifficulty() == Difficulty.PEACEFUL && this.shouldDespawnInPeaceful()) { this.discard(); } else if (!this.isPersistenceRequired() && !this.requiresCustomPersistence()) { @@ -227,7 +227,7 @@ index a49dfe4f81d449c5dd7ba5b8f9af7fec5c54f5de..3646b969fa51b9683ab4137e530c3a6f if (entityhuman != null) { double d0 = entityhuman.distanceToSqr((Entity) this); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 45be0dc44b98ca90b68e6ff3278e4de21934d7a2..17c0110fd5ccb8399af797cc892ca285b1fb7964 100644 +index 76a2d00324a85419548005e0aa3cbd8b891b8257..931de769a3b7c993d151f3ee8e1038d95d3899a3 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -205,6 +205,69 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0759-Optimise-WorldServer-notify.patch b/patches/server/0758-Optimise-WorldServer-notify.patch similarity index 99% rename from patches/server/0759-Optimise-WorldServer-notify.patch rename to patches/server/0758-Optimise-WorldServer-notify.patch index 0e414d014..275c5f092 100644 --- a/patches/server/0759-Optimise-WorldServer-notify.patch +++ b/patches/server/0758-Optimise-WorldServer-notify.patch @@ -8,7 +8,7 @@ Instead, only iterate over navigators in the current region that are eligible for repathing. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 95c49072e4e90a44873c96af8173d364a5614dff..b98a918ed6d2fabda5bb596dcd13e52033473ebe 100644 +index aa1b6b692f9107ef1b5091714f1ecc8b29da9897..69b8f5dcae4ea75ea9d63c36b3f5b4383fe232f9 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -302,15 +302,81 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0760-Remove-streams-for-villager-AI.patch b/patches/server/0759-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0760-Remove-streams-for-villager-AI.patch rename to patches/server/0759-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0761-Rewrite-dataconverter-system.patch b/patches/server/0760-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0761-Rewrite-dataconverter-system.patch rename to patches/server/0760-Rewrite-dataconverter-system.patch diff --git a/patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0761-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0761-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0763-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0762-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0763-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0762-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0763-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch similarity index 97% rename from patches/server/0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch rename to patches/server/0763-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch index d601eb888..33087ceab 100644 --- a/patches/server/0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch +++ b/patches/server/0763-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch @@ -16,7 +16,7 @@ of a chance that we're about to eat a dirtload of chunk load callbacks, thus making this issue much more of an issue diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index e86b3ee5c8225d9f789cf426cc1418fde0fa12f0..f0b41e4d08691f2f97b0a4396b5d6c8fd75b2c86 100644 +index 2224b9cfbc3be59037ef49ce278989ea3a710bb5..0b9312dc5ee43d2d450dc6e9f07a9ac0320955ca 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -130,46 +130,6 @@ public class CraftChunk implements Chunk { diff --git a/patches/server/0765-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0764-Async-catch-modifications-to-critical-entity-state.patch similarity index 100% rename from patches/server/0765-Async-catch-modifications-to-critical-entity-state.patch rename to patches/server/0764-Async-catch-modifications-to-critical-entity-state.patch diff --git a/patches/server/0766-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0765-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0766-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0765-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0767-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0766-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0767-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0766-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0768-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0767-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0768-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0767-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0768-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 92% rename from patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0768-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index 0f32675f8..b218b2916 100644 --- a/patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/patches/server/0768-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 fe2b99d0cde747c86cdc04c3d48f717b94747101..f63ff3240b477e86e45bd7572ab0dda308bab5f3 100644 +index a4ed338b3317378fdad694d3b0b12379128ffd26..678c0b1c37b16e405205933a16f0d2d29359fd12 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/0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0769-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 95% rename from patches/server/0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0769-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch index 81bcca30a..8bc6527cd 100644 --- a/patches/server/0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch +++ b/patches/server/0769-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch @@ -11,10 +11,10 @@ This commit hence simply fixes this by using the proper body colour value when updating the pattern color. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java -index 41eca0171faa5dc03b4e426a75f29b7bb4c3f6e2..acdc5c81850f9191061d4a804bd3524e717d24a2 100644 +index 581e0f4d68d6eb8eb04449586ffdba35e8b3ad2b..9a045a7793ec20334853a0e1c3529b31899214b3 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java -@@ -113,7 +113,7 @@ class CraftMetaTropicalFishBucket extends CraftMetaItem implements TropicalFishB +@@ -107,7 +107,7 @@ class CraftMetaTropicalFishBucket extends CraftMetaItem implements TropicalFishB if (this.variant == null) { this.variant = 0; } diff --git a/patches/server/0771-Ensure-valid-vehicle-status.patch b/patches/server/0770-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0771-Ensure-valid-vehicle-status.patch rename to patches/server/0770-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0772-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0771-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0772-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0771-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0773-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0772-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0773-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0772-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0774-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0773-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0774-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0773-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0775-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0774-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0775-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0774-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0776-Preserve-overstacked-loot.patch b/patches/server/0775-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0776-Preserve-overstacked-loot.patch rename to patches/server/0775-Preserve-overstacked-loot.patch diff --git a/patches/server/0777-Update-head-rotation-in-missing-places.patch b/patches/server/0776-Update-head-rotation-in-missing-places.patch similarity index 84% rename from patches/server/0777-Update-head-rotation-in-missing-places.patch rename to patches/server/0776-Update-head-rotation-in-missing-places.patch index 04499b065..9b18797ea 100644 --- a/patches/server/0777-Update-head-rotation-in-missing-places.patch +++ b/patches/server/0776-Update-head-rotation-in-missing-places.patch @@ -8,10 +8,10 @@ This is because bukkit uses a separate head rotation field for yaw. This issue only applies to players. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 37123198bdf0188f59f289a31570663938fdc3c1..71fd35d9d89d878109b0d4d0ae73a99063059eec 100644 +index 51239bc47d6d2cfd8d345fb67fe0d92fabe53209..cef2cad3c278c4d2258f68dcbe6936c6637ca90a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1749,6 +1749,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1763,6 +1763,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.setXRot(Mth.clamp(pitch, -90.0F, 90.0F) % 360.0F); this.yRotO = this.getYRot(); this.xRotO = this.getXRot(); @@ -19,7 +19,7 @@ index 37123198bdf0188f59f289a31570663938fdc3c1..71fd35d9d89d878109b0d4d0ae73a990 } public void absMoveTo(double x, double y, double z) { -@@ -1787,6 +1788,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1801,6 +1802,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.setXRot(pitch); this.setOldPosAndRot(); this.reapplyPosition(); diff --git a/patches/server/0778-prevent-unintended-light-block-manipulation.patch b/patches/server/0777-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0778-prevent-unintended-light-block-manipulation.patch rename to patches/server/0777-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0779-Fix-CraftCriteria-defaults-map.patch b/patches/server/0778-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0779-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0778-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0780-Fix-upstreams-block-state-factories.patch b/patches/server/0779-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0780-Fix-upstreams-block-state-factories.patch rename to patches/server/0779-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0781-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0780-Add-config-option-for-logging-player-ip-addresses.patch similarity index 100% rename from patches/server/0781-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/server/0780-Add-config-option-for-logging-player-ip-addresses.patch diff --git a/patches/server/0782-Configurable-feature-seeds.patch b/patches/server/0781-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0782-Configurable-feature-seeds.patch rename to patches/server/0781-Configurable-feature-seeds.patch diff --git a/patches/server/0783-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0782-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0783-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/server/0782-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0784-Add-root-admin-user-detection.patch b/patches/server/0783-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0784-Add-root-admin-user-detection.patch rename to patches/server/0783-Add-root-admin-user-detection.patch diff --git a/patches/server/0785-Always-allow-item-changing-in-Fireball.patch b/patches/server/0784-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0785-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0784-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0786-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0785-don-t-attempt-to-teleport-dead-entities.patch similarity index 91% rename from patches/server/0786-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0785-don-t-attempt-to-teleport-dead-entities.patch index 2685387e3..0d9f0564a 100644 --- a/patches/server/0786-don-t-attempt-to-teleport-dead-entities.patch +++ b/patches/server/0785-don-t-attempt-to-teleport-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 71fd35d9d89d878109b0d4d0ae73a99063059eec..bf039f3e2d1a228f0a169b42031d9708f3193a92 100644 +index cef2cad3c278c4d2258f68dcbe6936c6637ca90a..036894c89e6dcc98b4e53c859d531163ed155a32 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -779,7 +779,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0787-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0786-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 90% rename from patches/server/0787-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0786-Prevent-excessive-velocity-through-repeated-crits.patch index 2b1bccc6b..51d947382 100644 --- a/patches/server/0787-Prevent-excessive-velocity-through-repeated-crits.patch +++ b/patches/server/0786-Prevent-excessive-velocity-through-repeated-crits.patch @@ -5,10 +5,10 @@ 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 bc01742e3e762fbb5b7eb712a9211e4a8d411e03..4091253c84b5a722a75fa6dc8f5f0002b29ebf8e 100644 +index 76ef3f561e3f8e0c0f9732feb64aacca93b57431..8ac7d25e6e1a22829d6c45522409763bbb1328a0 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2626,14 +2626,27 @@ public abstract class LivingEntity extends Entity { +@@ -2648,14 +2648,27 @@ public abstract class LivingEntity extends Entity { return this.hasEffect(MobEffects.JUMP) ? (double) (0.1F * (float) (this.getEffect(MobEffects.JUMP).getAmplifier() + 1)) : 0.0D; } diff --git a/patches/server/0788-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0787-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0788-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0787-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0789-Rewrite-the-light-engine.patch b/patches/server/0788-Rewrite-the-light-engine.patch similarity index 99% rename from patches/server/0789-Rewrite-the-light-engine.patch rename to patches/server/0788-Rewrite-the-light-engine.patch index 7784f1b57..1be70f40a 100644 --- a/patches/server/0789-Rewrite-the-light-engine.patch +++ b/patches/server/0788-Rewrite-the-light-engine.patch @@ -4456,7 +4456,7 @@ index 190df802cb24aa360f6cf4d291e38b4b3fe4a2ac..68645bbbab9b4225048b647252d8f462 final CommandSender sender, final ServerLevel world, diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index 5b4c3ca92dffff876af18db106310cb14e8612b1..5482be03a667939ff009b6810d5cc90c8601e983 100644 +index 09f262de1b12b09013f8277b25d13ffcf53b96d8..73712d6b9c828427d4c066c6d8672534575f3793 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java @@ -55,7 +55,7 @@ public class ChunkHolder { @@ -4469,7 +4469,7 @@ index 5b4c3ca92dffff876af18db106310cb14e8612b1..5482be03a667939ff009b6810d5cc90c private final DebugBuffer chunkToSaveHistory; public int oldTicketLevel; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index adce96d372e0f9b6c3813b2153a5dcbb32a4e75c..dc8d915956c04b3e9b596e3cb62f1a0498ef1787 100644 +index 69b8f5dcae4ea75ea9d63c36b3f5b4383fe232f9..fe10c770b511fa8a38ece2bf9679492a85b28eff 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -133,7 +133,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0790-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0789-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 100% rename from patches/server/0790-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/server/0789-Always-parse-protochunk-light-sources-unless-it-is-m.patch diff --git a/patches/server/0791-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0790-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0791-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0790-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0792-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0791-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 95% rename from patches/server/0792-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0791-Prevent-sending-oversized-item-data-in-equipment-and.patch index ec1d45e5e..63ed303a2 100644 --- a/patches/server/0792-Prevent-sending-oversized-item-data-in-equipment-and.patch +++ b/patches/server/0791-Prevent-sending-oversized-item-data-in-equipment-and.patch @@ -34,10 +34,10 @@ index cc418554b655ea4111631e4a1abf69776e150e7c..319dfa82dff1fe188a52bed5aa2d3957 } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 4091253c84b5a722a75fa6dc8f5f0002b29ebf8e..d8522072adb93d47fdd7cfa947132c23c2386952 100644 +index 8ac7d25e6e1a22829d6c45522409763bbb1328a0..e7560eb298b563231407de832a81bb2c97e3c4cf 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3112,7 +3112,10 @@ public abstract class LivingEntity extends Entity { +@@ -3134,7 +3134,10 @@ public abstract class LivingEntity extends Entity { equipmentChanges.forEach((enumitemslot, itemstack) -> { ItemStack itemstack1 = itemstack.copy(); @@ -49,7 +49,7 @@ index 4091253c84b5a722a75fa6dc8f5f0002b29ebf8e..d8522072adb93d47fdd7cfa947132c23 switch (enumitemslot.getType()) { case HAND: this.setLastHandItem(enumitemslot, itemstack1); -@@ -3125,6 +3128,34 @@ public abstract class LivingEntity extends Entity { +@@ -3147,6 +3150,34 @@ public abstract class LivingEntity extends Entity { ((ServerLevel) this.level).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list)); } diff --git a/patches/server/0793-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0792-Hide-unnecessary-itemmeta-from-clients.patch similarity index 94% rename from patches/server/0793-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0792-Hide-unnecessary-itemmeta-from-clients.patch index 46c41e8b9..9442632b5 100644 --- a/patches/server/0793-Hide-unnecessary-itemmeta-from-clients.patch +++ b/patches/server/0792-Hide-unnecessary-itemmeta-from-clients.patch @@ -18,10 +18,10 @@ index 319dfa82dff1fe188a52bed5aa2d39575853b793..919758363c7b703cb200582768e68c97 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 97f1b8585c0fa6f1abbec0a0172157c61b6d0614..3e8284838eecb3c71410dcaf684cf8727265d2b6 100644 +index 678c0b1c37b16e405205933a16f0d2d29359fd12..1d024bfbada440c93b1174568feaa67544f7f0d2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2812,8 +2812,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2816,8 +2816,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } // Paper end // SPIGOT-7136 - Allays @@ -33,10 +33,10 @@ index 97f1b8585c0fa6f1abbec0a0172157c61b6d0614..3e8284838eecb3c71410dcaf684cf872 } } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d8522072adb93d47fdd7cfa947132c23c2386952..8dc54061802f0253193bda79bded1d5265591519 100644 +index e7560eb298b563231407de832a81bb2c97e3c4cf..d6ecdeab398d7bfde3d760ada0374245f03014b3 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3114,7 +3114,7 @@ public abstract class LivingEntity extends Entity { +@@ -3136,7 +3136,7 @@ public abstract class LivingEntity extends Entity { // Paper start - prevent oversized data ItemStack toSend = sanitizeItemStack(itemstack1, true); @@ -45,7 +45,7 @@ index d8522072adb93d47fdd7cfa947132c23c2386952..8dc54061802f0253193bda79bded1d52 // Paper end switch (enumitemslot.getType()) { case HAND: -@@ -3128,6 +3128,59 @@ public abstract class LivingEntity extends Entity { +@@ -3150,6 +3150,59 @@ public abstract class LivingEntity extends Entity { ((ServerLevel) this.level).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list)); } diff --git a/patches/server/0794-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0793-Fix-kelp-modifier-changing-growth-for-other-crops.patch similarity index 100% rename from patches/server/0794-Fix-kelp-modifier-changing-growth-for-other-crops.patch rename to patches/server/0793-Fix-kelp-modifier-changing-growth-for-other-crops.patch diff --git a/patches/server/0795-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0794-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0795-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0794-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0796-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0795-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0796-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0795-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0797-Add-player-health-update-API.patch b/patches/server/0796-Add-player-health-update-API.patch similarity index 100% rename from patches/server/0797-Add-player-health-update-API.patch rename to patches/server/0796-Add-player-health-update-API.patch diff --git a/patches/server/0798-Optimize-HashMapPalette.patch b/patches/server/0797-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0798-Optimize-HashMapPalette.patch rename to patches/server/0797-Optimize-HashMapPalette.patch diff --git a/patches/server/0799-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0798-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 98% rename from patches/server/0799-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0798-Allow-delegation-to-vanilla-chunk-gen.patch index b7371b996..22aa1ee9b 100644 --- a/patches/server/0799-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/server/0798-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 7f874c53cdb1815e3337c51ab564b7dafb20c939..fe0b8b623b8853aaa4fd0a105f502cfebb763dfb 100644 +index 4adacf6f849fe41918690fb8f195727a9c880b53..96ad0b334b2985c295be4f20df06e6eb73fbb22f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2329,6 +2329,90 @@ public final class CraftServer implements Server { diff --git a/patches/server/0800-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0799-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 99% rename from patches/server/0800-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0799-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch index ded6d6290..25285e3f6 100644 --- a/patches/server/0800-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch +++ b/patches/server/0799-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch @@ -1215,7 +1215,7 @@ index fc14fc8017d89c27b0aeb10a5f38dafde5c15f53..70d648bc5e795355d28579cc2fda43c3 } // CraftBukkit start diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bf039f3e2d1a228f0a169b42031d9708f3193a92..983b3b73ed071b1958e96b5be33e1b1097b95659 100644 +index 036894c89e6dcc98b4e53c859d531163ed155a32..4f19b25518d92c05a1ae49be905abe7dd2f69638 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1160,9 +1160,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -1366,7 +1366,7 @@ index bf039f3e2d1a228f0a169b42031d9708f3193a92..983b3b73ed071b1958e96b5be33e1b10 } public static Vec3 collideBoundingBox(@Nullable Entity entity, Vec3 movement, AABB entityBoundingBox, Level world, List collisions) { -@@ -2440,11 +2521,30 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2454,11 +2535,30 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { float f = this.dimensions.width * 0.8F; AABB axisalignedbb = AABB.ofSize(this.getEyePosition(), (double) f, 1.0E-6D, (double) f); diff --git a/patches/server/0801-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0800-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 99% rename from patches/server/0801-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0800-Optimise-collision-checking-in-player-move-packet-ha.patch index 357ae5a70..a55596dbe 100644 --- a/patches/server/0801-Optimise-collision-checking-in-player-move-packet-ha.patch +++ b/patches/server/0800-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 583f61adf2122ff94be79814a04616a42a827f75..5c9d7320536be70100f7e1d843e8c4e0c0802a19 100644 +index 1d024bfbada440c93b1174568feaa67544f7f0d2..f5a2299e43e4e7863aff9f0fb5ed1773b1330c7a 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/0802-Actually-unload-POI-data.patch b/patches/server/0801-Actually-unload-POI-data.patch similarity index 100% rename from patches/server/0802-Actually-unload-POI-data.patch rename to patches/server/0801-Actually-unload-POI-data.patch diff --git a/patches/server/0803-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0802-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 96% rename from patches/server/0803-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0802-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch index 4eb953eb3..344c081f9 100644 --- a/patches/server/0803-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch +++ b/patches/server/0802-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix ChunkSnapshot#isSectionEmpty(int) and optimize diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index f0b41e4d08691f2f97b0a4396b5d6c8fd75b2c86..947b0b10fb965f30513fd0df5bc0910fb9cb9a71 100644 +index 0b9312dc5ee43d2d450dc6e9f07a9ac0320955ca..4c109bbc4694e9d3d8804cc64650f79abf315e3a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -283,13 +283,17 @@ public class CraftChunk implements Chunk { diff --git a/patches/server/0804-Update-Log4j.patch b/patches/server/0803-Update-Log4j.patch similarity index 100% rename from patches/server/0804-Update-Log4j.patch rename to patches/server/0803-Update-Log4j.patch diff --git a/patches/server/0805-Add-more-Campfire-API.patch b/patches/server/0804-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0805-Add-more-Campfire-API.patch rename to patches/server/0804-Add-more-Campfire-API.patch diff --git a/patches/server/0806-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0805-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0806-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0805-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0807-Fix-tripwire-state-inconsistency.patch b/patches/server/0806-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0807-Fix-tripwire-state-inconsistency.patch rename to patches/server/0806-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0808-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0807-Fix-fluid-logging-on-Block-breakNaturally.patch similarity index 100% rename from patches/server/0808-Fix-fluid-logging-on-Block-breakNaturally.patch rename to patches/server/0807-Fix-fluid-logging-on-Block-breakNaturally.patch diff --git a/patches/server/0809-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0808-Forward-CraftEntity-in-teleport-command.patch similarity index 88% rename from patches/server/0809-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0808-Forward-CraftEntity-in-teleport-command.patch index fccb9245d..92fe7d6f8 100644 --- a/patches/server/0809-Forward-CraftEntity-in-teleport-command.patch +++ b/patches/server/0808-Forward-CraftEntity-in-teleport-command.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Forward CraftEntity in teleport command diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 983b3b73ed071b1958e96b5be33e1b1097b95659..ccef7676eee4024885fee3c6350410100a97c748 100644 +index 4f19b25518d92c05a1ae49be905abe7dd2f69638..c6f203f95f70ca6286946e2ccc40de05d8eabc49 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3262,6 +3262,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3276,6 +3276,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public void restoreFrom(Entity original) { @@ -22,7 +22,7 @@ index 983b3b73ed071b1958e96b5be33e1b1097b95659..ccef7676eee4024885fee3c635041010 CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag()); nbttagcompound.remove("Dimension"); -@@ -3343,10 +3350,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3357,10 +3364,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (worldserver.getTypeKey() == LevelStem.END) { // CraftBukkit ServerLevel.makeObsidianPlatform(worldserver, this); // CraftBukkit } diff --git a/patches/server/0810-Improve-scoreboard-entries.patch b/patches/server/0809-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0810-Improve-scoreboard-entries.patch rename to patches/server/0809-Improve-scoreboard-entries.patch diff --git a/patches/server/0811-Entity-powdered-snow-API.patch b/patches/server/0810-Entity-powdered-snow-API.patch similarity index 90% rename from patches/server/0811-Entity-powdered-snow-API.patch rename to patches/server/0810-Entity-powdered-snow-API.patch index dec5da088..e3764b481 100644 --- a/patches/server/0811-Entity-powdered-snow-API.patch +++ b/patches/server/0810-Entity-powdered-snow-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity powdered snow API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index ff8562821ebb363c755e9d316679226d9febe54f..e12dcc33e859950efec36b91ad9a43e435545d5b 100644 +index a1ef4ba683b1721359fb162b5f97ceefd7207184..385368d0c6a13f9b1b907bcc48d1fb2a845262ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1305,5 +1305,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1322,5 +1322,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { entity.setRot(location.getYaw(), location.getPitch()); return !entity.valid && entity.level.addFreshEntity(entity, reason); } diff --git a/patches/server/0812-Add-API-for-item-entity-health.patch b/patches/server/0811-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0812-Add-API-for-item-entity-health.patch rename to patches/server/0811-Add-API-for-item-entity-health.patch diff --git a/patches/server/0813-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0812-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0813-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0812-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0814-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0813-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0814-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0813-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0815-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0814-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0815-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0814-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0816-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0815-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0816-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0815-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0817-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0816-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0817-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0816-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0818-Fix-bees-aging-inside-hives.patch b/patches/server/0817-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0818-Fix-bees-aging-inside-hives.patch rename to patches/server/0817-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0819-Bucketable-API.patch b/patches/server/0818-Bucketable-API.patch similarity index 100% rename from patches/server/0819-Bucketable-API.patch rename to patches/server/0818-Bucketable-API.patch diff --git a/patches/server/0820-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0819-Check-player-world-in-endPortalSoundRadius.patch similarity index 100% rename from patches/server/0820-Check-player-world-in-endPortalSoundRadius.patch rename to patches/server/0819-Check-player-world-in-endPortalSoundRadius.patch diff --git a/patches/server/0821-Validate-usernames.patch b/patches/server/0820-Validate-usernames.patch similarity index 100% rename from patches/server/0821-Validate-usernames.patch rename to patches/server/0820-Validate-usernames.patch diff --git a/patches/server/0822-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0821-Fix-saving-configs-with-more-long-comments.patch similarity index 100% rename from patches/server/0822-Fix-saving-configs-with-more-long-comments.patch rename to patches/server/0821-Fix-saving-configs-with-more-long-comments.patch diff --git a/patches/server/0823-Make-water-animal-spawn-height-configurable.patch b/patches/server/0822-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0823-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0822-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0824-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0823-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0824-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0823-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0825-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0824-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0825-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0824-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0826-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0825-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0826-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0825-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0827-Multiple-Entries-with-Scoreboards.patch b/patches/server/0826-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0827-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0826-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0828-Reset-placed-block-on-exception.patch b/patches/server/0827-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0828-Reset-placed-block-on-exception.patch rename to patches/server/0827-Reset-placed-block-on-exception.patch diff --git a/patches/server/0829-Add-configurable-height-for-slime-spawn.patch b/patches/server/0828-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0829-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0828-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0830-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0829-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0830-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0829-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0831-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0830-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0831-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0830-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0832-Kick-on-main-for-illegal-chat.patch b/patches/server/0831-Kick-on-main-for-illegal-chat.patch similarity index 91% rename from patches/server/0832-Kick-on-main-for-illegal-chat.patch rename to patches/server/0831-Kick-on-main-for-illegal-chat.patch index 06510268a..054da6947 100644 --- a/patches/server/0832-Kick-on-main-for-illegal-chat.patch +++ b/patches/server/0831-Kick-on-main-for-illegal-chat.patch @@ -7,10 +7,10 @@ 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 5c9d7320536be70100f7e1d843e8c4e0c0802a19..26402aa8879e4e50c619c1e9d8e30ef49c3b8a34 100644 +index f5a2299e43e4e7863aff9f0fb5ed1773b1330c7a..b82d6ebb30c0fdc49f21d993c6a1affbecc27af7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2174,7 +2174,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2175,7 +2175,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } // CraftBukkit end if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.message())) { @@ -20,7 +20,7 @@ index 5c9d7320536be70100f7e1d843e8c4e0c0802a19..26402aa8879e4e50c619c1e9d8e30ef4 } else { if (this.tryHandleChat(packet.message(), packet.timeStamp(), packet.lastSeenMessages())) { // this.server.submit(() -> { // CraftBukkit - async chat -@@ -2202,7 +2204,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2203,7 +2205,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleChatCommand(ServerboundChatCommandPacket packet) { if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.command())) { @@ -30,7 +30,7 @@ index 5c9d7320536be70100f7e1d843e8c4e0c0802a19..26402aa8879e4e50c619c1e9d8e30ef4 } else { if (this.tryHandleChat(packet.command(), packet.timeStamp(), packet.lastSeenMessages())) { this.server.submit(() -> { -@@ -2288,7 +2292,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2289,7 +2293,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic private boolean tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) { if (!this.updateChatOrder(timestamp)) { ServerGamePacketListenerImpl.LOGGER.warn("{} sent out-of-order chat: '{}'", this.player.getName().getString(), message); diff --git a/patches/server/0833-Multi-Block-Change-API-Implementation.patch b/patches/server/0832-Multi-Block-Change-API-Implementation.patch similarity index 97% rename from patches/server/0833-Multi-Block-Change-API-Implementation.patch rename to patches/server/0832-Multi-Block-Change-API-Implementation.patch index 16d48b2da..6ae11e6a7 100644 --- a/patches/server/0833-Multi-Block-Change-API-Implementation.patch +++ b/patches/server/0832-Multi-Block-Change-API-Implementation.patch @@ -25,7 +25,7 @@ index 82ea4fabd5732052a286d50bcff8bbcc2c4aa7d7..652bea6868a03a5315965f79c76172fb public void write(FriendlyByteBuf buf) { buf.writeLong(this.sectionPos.asLong()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 67833efdd2c4babe20a01691a44ec6f153656729..c569bf167addfedcb0d8c55b2d2cfcb52e05d0a6 100644 +index 8882651847fc9a8d2e4222f10eb389b553da48ca..86d9250ce0a49635362a2710bf3c064936d1c77f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -29,6 +29,7 @@ import java.util.logging.Logger; diff --git a/patches/server/0834-Fix-NotePlayEvent.patch b/patches/server/0833-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0834-Fix-NotePlayEvent.patch rename to patches/server/0833-Fix-NotePlayEvent.patch diff --git a/patches/server/0835-Freeze-Tick-Lock-API.patch b/patches/server/0834-Freeze-Tick-Lock-API.patch similarity index 86% rename from patches/server/0835-Freeze-Tick-Lock-API.patch rename to patches/server/0834-Freeze-Tick-Lock-API.patch index bb6de3cbf..7705d0053 100644 --- a/patches/server/0835-Freeze-Tick-Lock-API.patch +++ b/patches/server/0834-Freeze-Tick-Lock-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ccef7676eee4024885fee3c6350410100a97c748..473b7c0bd9c49192041e3a6e4c8a9d760344a44a 100644 +index c6f203f95f70ca6286946e2ccc40de05d8eabc49..f1e471fee49d0213a97251be1b6793d5fb2165f2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -397,6 +397,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -25,7 +25,7 @@ index ccef7676eee4024885fee3c6350410100a97c748..473b7c0bd9c49192041e3a6e4c8a9d76 this.setTicksFrozen(0); this.level.levelEvent((Player) null, 1009, this.blockPosition, 1); } -@@ -2247,6 +2248,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2261,6 +2262,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (fromNetherPortal) { nbt.putBoolean("Paper.FromNetherPortal", true); } @@ -35,7 +35,7 @@ index ccef7676eee4024885fee3c6350410100a97c748..473b7c0bd9c49192041e3a6e4c8a9d76 // Paper end return nbt; } catch (Throwable throwable) { -@@ -2411,6 +2415,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2425,6 +2429,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (spawnReason == null) { spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT; } @@ -46,10 +46,10 @@ index ccef7676eee4024885fee3c6350410100a97c748..473b7c0bd9c49192041e3a6e4c8a9d76 } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8dc54061802f0253193bda79bded1d5265591519..44c0f77bdeeb9061b1dfcd904ed2c63910e30e42 100644 +index d6ecdeab398d7bfde3d760ada0374245f03014b3..73d931489c76f2effe71362a46a69087a1a09463 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3354,7 +3354,7 @@ public abstract class LivingEntity extends Entity { +@@ -3376,7 +3376,7 @@ public abstract class LivingEntity extends Entity { boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES); int i; @@ -59,10 +59,10 @@ index 8dc54061802f0253193bda79bded1d5265591519..44c0f77bdeeb9061b1dfcd904ed2c639 if (this.isInPowderSnow && this.canFreeze()) { this.setTicksFrozen(Math.min(this.getTicksRequiredToFreeze(), i + 1)); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index df3c8e5342f9284970371d81f84c5ccabaaa00c2..0bae967bb9830784d98c2a1cccca512660c6324a 100644 +index 385368d0c6a13f9b1b907bcc48d1fb2a845262ef..c4ffccddce33cf461d9b04ccbb90026544f16b7d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -642,6 +642,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -644,6 +644,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return this.getHandle().isFullyFrozen(); } diff --git a/patches/server/0836-Dolphin-API.patch b/patches/server/0835-Dolphin-API.patch similarity index 100% rename from patches/server/0836-Dolphin-API.patch rename to patches/server/0835-Dolphin-API.patch diff --git a/patches/server/0837-More-PotionEffectType-API.patch b/patches/server/0836-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0837-More-PotionEffectType-API.patch rename to patches/server/0836-More-PotionEffectType-API.patch diff --git a/patches/server/0838-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0837-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0838-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0837-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0839-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0838-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 98% rename from patches/server/0839-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0838-API-for-creating-command-sender-which-forwards-feedb.patch index ca623b502..1e348f430 100644 --- a/patches/server/0839-API-for-creating-command-sender-which-forwards-feedb.patch +++ b/patches/server/0838-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 3fe38a9a6f4c25b91a25bc2320a7d7fcbe446d9d..17d4afb04a0a767283fcccb0cc00ab0043b49e22 100644 +index 2b57b60a3ecb5ac170f2d70532dc8439c5a3459f..169f0162479a4a52a6637a9d16eef13c098c8d1a 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/0840-Add-config-for-stronghold-seed.patch b/patches/server/0839-Add-config-for-stronghold-seed.patch similarity index 100% rename from patches/server/0840-Add-config-for-stronghold-seed.patch rename to patches/server/0839-Add-config-for-stronghold-seed.patch diff --git a/patches/server/0841-Implement-regenerateChunk.patch b/patches/server/0840-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0841-Implement-regenerateChunk.patch rename to patches/server/0840-Implement-regenerateChunk.patch diff --git a/patches/server/0842-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0841-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0842-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0841-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0843-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0842-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 91% rename from patches/server/0843-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0842-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch index 2539ce04f..6a270423c 100644 --- a/patches/server/0843-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch +++ b/patches/server/0842-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 17d4afb04a0a767283fcccb0cc00ab0043b49e22..8669584f7e89e89145631f86bf123b8a82c38e97 100644 +index 169f0162479a4a52a6637a9d16eef13c098c8d1a..b1703293e46fcc3abe9b994657288b3dc41f034a 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/0844-Add-GameEvent-tags.patch b/patches/server/0843-Add-GameEvent-tags.patch similarity index 97% rename from patches/server/0844-Add-GameEvent-tags.patch rename to patches/server/0843-Add-GameEvent-tags.patch index c4848660e..71d11d1e6 100644 --- a/patches/server/0844-Add-GameEvent-tags.patch +++ b/patches/server/0843-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 8669584f7e89e89145631f86bf123b8a82c38e97..ac8f105371e61a93eb416e086ece0243bd251625 100644 +index b1703293e46fcc3abe9b994657288b3dc41f034a..989dcf684ae448e6ff678bd2e72601005a770803 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/0845-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0844-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 94% rename from patches/server/0845-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0844-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch index 979e14609..89a4c1af2 100644 --- a/patches/server/0845-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch +++ b/patches/server/0844-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch @@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether, for example. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a4433426efd0823cd8145a50b38127f63e90adc9..1444391ded50ec10e9bfeb073b01c885c429b8bd 100644 +index 28e2f22cc2e5b6dd47705cdd5095ff2394979c8f..98654c77b2925228458fae447510ec1d6b217370 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1314,6 +1314,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop SPAWN_EGG_MATERIALS = Sets.newHashSet( + // Paper start -+ case ALLAY_SPAWN_EGG: -+ case FROG_SPAWN_EGG: -+ case TADPOLE_SPAWN_EGG: -+ case WARDEN_SPAWN_EGG: ++ Material. ALLAY_SPAWN_EGG, ++ Material. FROG_SPAWN_EGG, ++ Material. TADPOLE_SPAWN_EGG, ++ Material. WARDEN_SPAWN_EGG, + // Paper end - return true; - default: - return false; + Material.AXOLOTL_SPAWN_EGG, + Material.BAT_SPAWN_EGG, + Material.BEE_SPAWN_EGG, diff --git a/patches/server/0904-Add-WardenAngerChangeEvent.patch b/patches/server/0903-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0904-Add-WardenAngerChangeEvent.patch rename to patches/server/0903-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0905-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0904-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0905-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0904-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0906-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0905-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0906-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0905-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0907-Nameable-Banner-API.patch b/patches/server/0906-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0907-Nameable-Banner-API.patch rename to patches/server/0906-Nameable-Banner-API.patch diff --git a/patches/server/0908-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0907-Don-t-broadcast-messages-to-command-blocks.patch similarity index 95% rename from patches/server/0908-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0907-Don-t-broadcast-messages-to-command-blocks.patch index c9e7cd98d..7ce886777 100644 --- a/patches/server/0908-Don-t-broadcast-messages-to-command-blocks.patch +++ b/patches/server/0907-Don-t-broadcast-messages-to-command-blocks.patch @@ -20,7 +20,7 @@ index c0195f73cd2c8721e882c681eaead65471710081..861b348f73867af3199f1cc0dab1ddd4 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 051899f6f6bb656a836045ee36e6a2afe83f34f6..32eb6efa94bc5ea3b516cbbd7e53f1460c23154d 100644 +index 61b9d44e4edc4cb6ffbd8bf99e8e098bcc9957b3..3c9ba17cd0f016a21f56c6b6f8861c512734637a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1758,7 +1758,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0909-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0908-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0909-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0908-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0910-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0909-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0910-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0909-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0911-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0910-Don-t-print-component-in-resource-pack-rejection-mes.patch similarity index 90% rename from patches/server/0911-Don-t-print-component-in-resource-pack-rejection-mes.patch rename to patches/server/0910-Don-t-print-component-in-resource-pack-rejection-mes.patch index 925d8eda8..e39a50872 100644 --- a/patches/server/0911-Don-t-print-component-in-resource-pack-rejection-mes.patch +++ b/patches/server/0910-Don-t-print-component-in-resource-pack-rejection-mes.patch @@ -5,10 +5,10 @@ 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 603e404e75d39279fa5c4222ec5373271dd1ae64..b3e165a7731c272e4ad0adf1c5250d230f8d649c 100644 +index a7fe72d745625951172a8fdf9a4689b5bf540445..ac08f538087465b383f6127ae3d908fec29d765f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2048,7 +2048,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2049,7 +2049,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic public void handleResourcePackResponse(ServerboundResourcePackPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); if (packet.getAction() == ServerboundResourcePackPacket.Action.DECLINED && this.server.isResourcePackRequired()) { diff --git a/patches/server/0912-Add-Player-getFishHook.patch b/patches/server/0911-Add-Player-getFishHook.patch similarity index 86% rename from patches/server/0912-Add-Player-getFishHook.patch rename to patches/server/0911-Add-Player-getFishHook.patch index 89347ce70..bf5ccb598 100644 --- a/patches/server/0912-Add-Player-getFishHook.patch +++ b/patches/server/0911-Add-Player-getFishHook.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#getFishHook diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 6149e74262ca6c4c00686a89c273c59bfaac3e05..c0a7b7bb9757de55424188629087d2ec82479e3c 100644 +index 44dab523264c594aa9c619e3ee2e0d7f93982ddc..e779dcc4982ff51e4d450265fd61bc26e8e74d3a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -@@ -150,6 +150,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { +@@ -153,6 +153,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { return new Location(worldServer.getWorld(), bed.getX(), bed.getY(), bed.getZ()); } // Paper end diff --git a/patches/server/0913-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0912-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0913-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0912-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0914-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0913-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 96% rename from patches/server/0914-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0913-Add-various-missing-EntityDropItemEvent-calls.patch index b326403bd..7a01a147b 100644 --- a/patches/server/0914-Add-various-missing-EntityDropItemEvent-calls.patch +++ b/patches/server/0913-Add-various-missing-EntityDropItemEvent-calls.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 33ec6c1e942a7f852e4726683918ed06cde2e16a..700e2299200b536255dd38c2f84e9ab13ab31811 100644 +index 45b740753ac8dd20deb8618d5ac85c48737d34f4..4df5001ecfe5a3519ac3fbde06cfea2a233d2530 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2506,6 +2506,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2520,6 +2520,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { stack.setCount(0); // Paper - destroy this item - if this ever leaks due to game bugs, ensure it doesn't dupe entityitem.setDefaultPickUpDelay(); diff --git a/patches/server/0915-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0914-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 90% rename from patches/server/0915-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/server/0914-Add-some-minimal-debug-information-to-chat-packet-er.patch index 27a8f5fb1..2cbecbfbe 100644 --- a/patches/server/0915-Add-some-minimal-debug-information-to-chat-packet-er.patch +++ b/patches/server/0914-Add-some-minimal-debug-information-to-chat-packet-er.patch @@ -6,10 +6,10 @@ 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 b3e165a7731c272e4ad0adf1c5250d230f8d649c..b91e901792ea967e6612bfe74d73ad9bcfce4ed2 100644 +index ac08f538087465b383f6127ae3d908fec29d765f..2d924260b76fd77413d125a009773e4d3620a51f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2297,7 +2297,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2298,7 +2298,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic private boolean tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) { if (!this.updateChatOrder(timestamp)) { @@ -18,7 +18,7 @@ index b3e165a7731c272e4ad0adf1c5250d230f8d649c..b91e901792ea967e6612bfe74d73ad9b this.server.scheduleOnMain(() -> { // Paper - push to main this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event cause }); // Paper - push to main -@@ -2565,7 +2565,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2569,7 +2569,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } if (playerchatmessage.hasExpiredServer(Instant.now())) { diff --git a/patches/server/0916-Fix-Bee-flower-NPE.patch b/patches/server/0915-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0916-Fix-Bee-flower-NPE.patch rename to patches/server/0915-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0917-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0916-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 87% rename from patches/server/0917-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0916-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch index f982df386..90422ebe0 100644 --- a/patches/server/0917-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch +++ b/patches/server/0916-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch @@ -5,10 +5,10 @@ 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 b91e901792ea967e6612bfe74d73ad9bcfce4ed2..13c253b1d7f6d4713135baba2bc2ad9cd84224f8 100644 +index 2d924260b76fd77413d125a009773e4d3620a51f..421d7e28370085dffa415d71d4e28d3c4d38ac87 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2585,7 +2585,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2589,7 +2589,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } // Spigot end // this.chatSpamTickCount += 20; diff --git a/patches/server/0918-Add-SpawnReason-to-Tadpoles-spawned-by-Frogspawn.patch b/patches/server/0917-Add-SpawnReason-to-Tadpoles-spawned-by-Frogspawn.patch similarity index 100% rename from patches/server/0918-Add-SpawnReason-to-Tadpoles-spawned-by-Frogspawn.patch rename to patches/server/0917-Add-SpawnReason-to-Tadpoles-spawned-by-Frogspawn.patch diff --git a/patches/server/0919-More-Teleport-API.patch b/patches/server/0918-More-Teleport-API.patch similarity index 97% rename from patches/server/0919-More-Teleport-API.patch rename to patches/server/0918-More-Teleport-API.patch index e133efa14..b645bde09 100644 --- a/patches/server/0919-More-Teleport-API.patch +++ b/patches/server/0918-More-Teleport-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] More Teleport API diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 13c253b1d7f6d4713135baba2bc2ad9cd84224f8..0e365529695321ab2b164c75d4c67bdd2f51492d 100644 +index 421d7e28370085dffa415d71d4e28d3c4d38ac87..92617a19fb328320e17b58956cf0276d5a08325b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1729,11 +1729,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -29,10 +29,10 @@ index 13c253b1d7f6d4713135baba2bc2ad9cd84224f8..0e365529695321ab2b164c75d4c67bdd d0 = to.getX(); d1 = to.getY(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 0bae967bb9830784d98c2a1cccca512660c6324a..cc7b76a66d87ffa30c4bf6e3c1123df86d73b571 100644 +index c4ffccddce33cf461d9b04ccbb90026544f16b7d..99b99fae67e53a688b3519d8a8d0cc5f3468e7e8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -540,15 +540,33 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -542,15 +542,33 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @Override public boolean teleport(Location location, TeleportCause cause) { diff --git a/patches/server/0920-Add-EntityPortalReadyEvent.patch b/patches/server/0919-Add-EntityPortalReadyEvent.patch similarity index 88% rename from patches/server/0920-Add-EntityPortalReadyEvent.patch rename to patches/server/0919-Add-EntityPortalReadyEvent.patch index 9fdc15459..b3b68153b 100644 --- a/patches/server/0920-Add-EntityPortalReadyEvent.patch +++ b/patches/server/0919-Add-EntityPortalReadyEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add EntityPortalReadyEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 700e2299200b536255dd38c2f84e9ab13ab31811..f925a8d550ecbf2044a37bfe58b30d6578c5f6af 100644 +index 4df5001ecfe5a3519ac3fbde06cfea2a233d2530..0b3765ff8a25215bc42298b591eeffe022107079 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2853,6 +2853,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2867,6 +2867,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit this.level.getProfiler().push("portal"); this.portalTime = i; @@ -22,7 +22,7 @@ index 700e2299200b536255dd38c2f84e9ab13ab31811..f925a8d550ecbf2044a37bfe58b30d65 this.setPortalCooldown(); // CraftBukkit start if (this instanceof ServerPlayer) { -@@ -2860,6 +2867,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2874,6 +2881,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } else { this.changeDimension(worldserver1); } diff --git a/patches/server/0921-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0920-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0921-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0920-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0922-Send-block-entities-after-destroy-prediction.patch b/patches/server/0921-Send-block-entities-after-destroy-prediction.patch similarity index 98% rename from patches/server/0922-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0921-Send-block-entities-after-destroy-prediction.patch index 9796172b9..0d7cf4345 100644 --- a/patches/server/0922-Send-block-entities-after-destroy-prediction.patch +++ b/patches/server/0921-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 0e365529695321ab2b164c75d4c67bdd2f51492d..6296683d900fa30b784e4e345856bdc3b175fb5e 100644 +index 92617a19fb328320e17b58956cf0276d5a08325b..e88c82aac6d9947c7205f865c18146e7a5756b40 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/0923-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0922-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 98% rename from patches/server/0923-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0922-Warn-on-plugins-accessing-faraway-chunks.patch index e66ae073c..003620357 100644 --- a/patches/server/0923-Warn-on-plugins-accessing-faraway-chunks.patch +++ b/patches/server/0922-Warn-on-plugins-accessing-faraway-chunks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Warn on plugins accessing faraway chunks diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 9467ccaa1d73e1913495a46919aee530e749977d..5a2a1d394852d39ea576624586f7fa736dec807c 100644 +index 46c45f249e71ca94044f1260a23cd7331098fb2c..ceb1f18ec16ddcda792ef0393b5f4649fbef3017 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -418,7 +418,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0924-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0923-Custom-Chat-Completion-Suggestions-API.patch similarity index 94% rename from patches/server/0924-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0923-Custom-Chat-Completion-Suggestions-API.patch index 560a26bd5..325982465 100644 --- a/patches/server/0924-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/server/0923-Custom-Chat-Completion-Suggestions-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e6411d8293c36f41b790cf17ecc507507f04d604..743b6e51817ffa1b7e602b1ac82eb1017841b691 100644 +index a8e63a417ab4971ce35569dbb0b792635e8366ae..41258fcfa0505500665c2f185b9ef6d050213355 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -654,6 +654,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0925-Add-missing-BlockFadeEvents.patch b/patches/server/0924-Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0925-Add-missing-BlockFadeEvents.patch rename to patches/server/0924-Add-missing-BlockFadeEvents.patch diff --git a/patches/server/0926-Collision-API.patch b/patches/server/0925-Collision-API.patch similarity index 94% rename from patches/server/0926-Collision-API.patch rename to patches/server/0925-Collision-API.patch index 510fa23e1..e1980a48f 100644 --- a/patches/server/0926-Collision-API.patch +++ b/patches/server/0925-Collision-API.patch @@ -22,10 +22,10 @@ index 6445c2e4c97860e1c98f5263188d309cf55936f0..62bca85da6c5d9877e21fecb70237050 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index b80cc0938b2b3928f4450f1314a9fbd7ea9c116b..6549ade8e19807c523e5a1dc68b66585aad438b1 100644 +index 99b99fae67e53a688b3519d8a8d0cc5f3468e7e8..d4ea7d19ae16a8ccafcfe5300bb380b28fd42b75 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1340,4 +1340,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1357,4 +1357,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed. } // Paper end diff --git a/patches/server/0927-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0926-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 92% rename from patches/server/0927-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0926-Fix-suggest-command-message-for-brigadier-syntax-exc.patch index 2d62b243e..3a5bf3be5 100644 --- a/patches/server/0927-Fix-suggest-command-message-for-brigadier-syntax-exc.patch +++ b/patches/server/0926-Fix-suggest-command-message-for-brigadier-syntax-exc.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix suggest command message for brigadier syntax exceptions This is a bug accidentally introduced in upstream CB diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index 584d2539d715fef26a2d01f014c7c3f4f8ce8fd9..135b341e5b975fc542f66ef9c52e29f4c6dd4a53 100644 +index 67ab16743b36dbf8b4336e33988d8e78433f566d..7c96f7fc5997761426a0c62cad0cab5cc668f282 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java @@ -314,7 +314,7 @@ public class Commands { diff --git a/patches/server/0928-Fix-command-preprocess-cancelling-and-command-changi.patch b/patches/server/0927-Fix-command-preprocess-cancelling-and-command-changi.patch similarity index 92% rename from patches/server/0928-Fix-command-preprocess-cancelling-and-command-changi.patch rename to patches/server/0927-Fix-command-preprocess-cancelling-and-command-changi.patch index dcb37bcd3..501d00e40 100644 --- a/patches/server/0928-Fix-command-preprocess-cancelling-and-command-changi.patch +++ b/patches/server/0927-Fix-command-preprocess-cancelling-and-command-changi.patch @@ -5,10 +5,10 @@ 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 6296683d900fa30b784e4e345856bdc3b175fb5e..c478693c3829937f64b9bed5d69fcfd2d7759a00 100644 +index e88c82aac6d9947c7205f865c18146e7a5756b40..1ff25ce408aba3620455f74e1535b5862b3bbdf9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2258,13 +2258,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2259,13 +2259,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic PlayerCommandPreprocessEvent event = new PlayerCommandPreprocessEvent(this.getCraftPlayer(), command, new LazyPlayerSet(this.server)); this.cserver.getPluginManager().callEvent(event); diff --git a/patches/server/0929-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0928-Remove-invalid-signature-login-stacktrace.patch similarity index 100% rename from patches/server/0929-Remove-invalid-signature-login-stacktrace.patch rename to patches/server/0928-Remove-invalid-signature-login-stacktrace.patch diff --git a/patches/server/0930-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0929-Add-async-catcher-to-PlayerConnection-internalTelepo.patch similarity index 91% rename from patches/server/0930-Add-async-catcher-to-PlayerConnection-internalTelepo.patch rename to patches/server/0929-Add-async-catcher-to-PlayerConnection-internalTelepo.patch index 37115a72a..05e9d349b 100644 --- a/patches/server/0930-Add-async-catcher-to-PlayerConnection-internalTelepo.patch +++ b/patches/server/0929-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 c478693c3829937f64b9bed5d69fcfd2d7759a00..325def3149693f64b2b21e0e655b5b3e888fd9a0 100644 +index 1ff25ce408aba3620455f74e1535b5862b3bbdf9..9eb921fec32afa360f3a402e978411fcf3ec618c 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/0931-Block-Ticking-API.patch b/patches/server/0930-Block-Ticking-API.patch similarity index 100% rename from patches/server/0931-Block-Ticking-API.patch rename to patches/server/0930-Block-Ticking-API.patch diff --git a/patches/server/0932-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0931-Add-Velocity-IP-Forwarding-Support.patch similarity index 99% rename from patches/server/0932-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0931-Add-Velocity-IP-Forwarding-Support.patch index 376b2d6d2..7ccbe4bb1 100644 --- a/patches/server/0932-Add-Velocity-IP-Forwarding-Support.patch +++ b/patches/server/0931-Add-Velocity-IP-Forwarding-Support.patch @@ -197,7 +197,7 @@ index 2f0b2d0f3a3dc02076cee9ab5e6dd6ab931143e3..bf488013e45b9ab97568e587f4dad899 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 32eb6efa94bc5ea3b516cbbd7e53f1460c23154d..964ec590ef5302576ecb3ba2b8ea95dbc2acf103 100644 +index 3c9ba17cd0f016a21f56c6b6f8861c512734637a..b443aba38258f501f8f00be6b055f07b709277c4 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/0933-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0932-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0933-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/server/0932-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0934-Add-NamespacedKey-biome-methods.patch b/patches/server/0933-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0934-Add-NamespacedKey-biome-methods.patch rename to patches/server/0933-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0935-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0934-Fix-plugin-loggers-on-server-shutdown.patch similarity index 96% rename from patches/server/0935-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0934-Fix-plugin-loggers-on-server-shutdown.patch index 96bd73a9d..e2c9ffe62 100644 --- a/patches/server/0935-Fix-plugin-loggers-on-server-shutdown.patch +++ b/patches/server/0934-Fix-plugin-loggers-on-server-shutdown.patch @@ -49,7 +49,7 @@ index dd9ab51e904be2f2f2a2981d4f0f6638a6895e8d..d2161a3c3b9a2b2d463ac778656c9516 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 5b48047242e20c216b110502935763ea433c55cd..56a784e943cb5d8b15b41e3e66545ebf166c221c 100644 +index 0aef4fc4a89e627bc80504d7402f1ca2cdc95a74..f30621be24c6c3a4f173436fce1ad1c13507c84f 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -20,6 +20,12 @@ public class Main { diff --git a/patches/server/0936-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0935-Workaround-for-client-lag-spikes-MC-162253.patch similarity index 100% rename from patches/server/0936-Workaround-for-client-lag-spikes-MC-162253.patch rename to patches/server/0935-Workaround-for-client-lag-spikes-MC-162253.patch diff --git a/work/Bukkit b/work/Bukkit index 2683d7660..9ae3f10f8 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 2683d766020628844637e800d4ec12fd19cc674a +Subproject commit 9ae3f10f8fa50a825af823131c468c36da3be880 diff --git a/work/CraftBukkit b/work/CraftBukkit index 5901d580a..5cc9c022a 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 5901d580a4902919b10fc23a07d40eda50497634 +Subproject commit 5cc9c022a0bd297f348d3c7e24e06227dca40c23 diff --git a/work/Spigot b/work/Spigot index e53686f7e..4c157bb49 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit e53686f7e0406156c8fa91a6e7748fbfed19c3a4 +Subproject commit 4c157bb49aa5705967b066e9c2dec5520f720b22