diff --git a/patches/server/0934-Fix-chunk-snapshot-biome-getter.patch b/patches/server/0934-Fix-chunk-snapshot-biome-getter.patch deleted file mode 100644 index dad6f12e28..0000000000 --- a/patches/server/0934-Fix-chunk-snapshot-biome-getter.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> -Date: Sat, 10 Dec 2022 13:01:52 +0100 -Subject: [PATCH] Fix chunk snapshot biome getter - -Fixes SPIGOT-7188: https://hub.spigotmc.org/jira/browse/SPIGOT-7188 - -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java -index 05512cc19eb213b6be5c869e133376ee42827806..c6416b3db0166374065d537e379d05da0f093b21 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java -@@ -149,7 +149,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot { - Preconditions.checkState(this.biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true"); - this.validateChunkCoordinates(x, y, z); - -- PalettedContainerRO> biome = this.biome[this.getSectionIndex(y >> 2)]; -+ PalettedContainerRO> biome = this.biome[this.getSectionIndex(y)]; // Paper - return CraftBlock.biomeBaseToBiome(biomeRegistry, biome.get(x >> 2, (y & 0xF) >> 2, z >> 2)); - } - -@@ -163,7 +163,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot { - Preconditions.checkState(this.biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true"); - this.validateChunkCoordinates(x, y, z); - -- PalettedContainerRO> biome = this.biome[this.getSectionIndex(y >> 2)]; -+ PalettedContainerRO> biome = this.biome[this.getSectionIndex(y)]; // Paper - return biome.get(x >> 2, (y & 0xF) >> 2, z >> 2).value().getTemperature(new BlockPos((this.x << 4) | x, y, (this.z << 4) | z)); - } - diff --git a/patches/server/0935-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0934-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0935-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0934-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0936-Fix-MapLike-Codec-missing-key-selector.patch b/patches/server/0935-Fix-MapLike-Codec-missing-key-selector.patch similarity index 100% rename from patches/server/0936-Fix-MapLike-Codec-missing-key-selector.patch rename to patches/server/0935-Fix-MapLike-Codec-missing-key-selector.patch diff --git a/patches/server/0937-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0936-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0937-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0936-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0938-Improve-logging-and-errors.patch b/patches/server/0937-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0938-Improve-logging-and-errors.patch rename to patches/server/0937-Improve-logging-and-errors.patch diff --git a/patches/server/0939-Add-BlockLockCheckEvent.patch b/patches/server/0938-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0939-Add-BlockLockCheckEvent.patch rename to patches/server/0938-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0940-Add-Sneaking-API-for-Entities.patch b/patches/server/0939-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0940-Add-Sneaking-API-for-Entities.patch rename to patches/server/0939-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0941-Improve-PortalEvents.patch b/patches/server/0940-Improve-PortalEvents.patch similarity index 93% rename from patches/server/0941-Improve-PortalEvents.patch rename to patches/server/0940-Improve-PortalEvents.patch index 99481d5068..46a25cee0c 100644 --- a/patches/server/0941-Improve-PortalEvents.patch +++ b/patches/server/0940-Improve-PortalEvents.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 071b241de8f6e00f57e8564bb3feb757ee1f05eb..56e7e423ef3f1016ea095ef98dc9c06e7763ac3b 100644 +index 8a7af77e8ac456cc89da7e954a8090bf794475c8..448b3d68b440cfeeb4bf8c5c7aabfdc9bdb97fc0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3561,7 +3561,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0942-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0941-Add-config-option-for-spider-worldborder-climbing.patch similarity index 96% rename from patches/server/0942-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0941-Add-config-option-for-spider-worldborder-climbing.patch index 5e3c6106be..6c2a6ed80b 100644 --- a/patches/server/0942-Add-config-option-for-spider-worldborder-climbing.patch +++ b/patches/server/0941-Add-config-option-for-spider-worldborder-climbing.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for spider worldborder climbing diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 56e7e423ef3f1016ea095ef98dc9c06e7763ac3b..1a302abc9864b727288de748a8e1627f771c17f1 100644 +index 448b3d68b440cfeeb4bf8c5c7aabfdc9bdb97fc0..4d5c68aaea1fe44517862075b60e1989170618ab 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -398,6 +398,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0943-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0942-Add-missing-SpigotConfig-logCommands-check.patch similarity index 92% rename from patches/server/0943-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0942-Add-missing-SpigotConfig-logCommands-check.patch index 9bd22b1ee7..4379b7b7b7 100644 --- a/patches/server/0943-Add-missing-SpigotConfig-logCommands-check.patch +++ b/patches/server/0942-Add-missing-SpigotConfig-logCommands-check.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5ddb75e6f60e4a4960018055991ea087ec473beb..3bec358de0348ba64ddbd83b63814fdc7b375b55 100644 +index 04386413177d0fb1338fccabf8af5746a18ef784..afcdd85d2b10bbd76c589c419feefd87f3ea1825 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2248,7 +2248,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0944-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0943-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0944-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0943-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0945-Flying-Fall-Damage.patch b/patches/server/0944-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0945-Flying-Fall-Damage.patch rename to patches/server/0944-Flying-Fall-Damage.patch diff --git a/patches/server/0946-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0945-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 100% rename from patches/server/0946-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/server/0945-Add-exploded-block-state-to-BlockExplodeEvent.patch diff --git a/patches/server/0947-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0946-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 91% rename from patches/server/0947-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0946-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch index 68846e1524..b6ed2a081f 100644 --- a/patches/server/0947-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch +++ b/patches/server/0946-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1a302abc9864b727288de748a8e1627f771c17f1..9a1e8589e6b371869b2199650172d61ae186c907 100644 +index 4d5c68aaea1fe44517862075b60e1989170618ab..4705d7066207250c03a5f98eef61554c901f2e35 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1104,7 +1104,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0948-config-for-disabling-entity-tag-tags.patch b/patches/server/0947-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0948-config-for-disabling-entity-tag-tags.patch rename to patches/server/0947-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0949-Use-single-player-info-update-packet-on-join.patch b/patches/server/0948-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0949-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0948-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0950-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0949-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 95% rename from patches/server/0950-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0949-Correctly-shrink-items-during-EntityResurrectEvent.patch index 963120c142..46a3999218 100644 --- a/patches/server/0950-Correctly-shrink-items-during-EntityResurrectEvent.patch +++ b/patches/server/0949-Correctly-shrink-items-during-EntityResurrectEvent.patch @@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem of undying was found and the event was called uncancelled. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index ee859b78121fe80bfd7858c49d41d8770b204801..9358a2112952f0a90b058a7078b3577b5a56f76b 100644 +index 1f41b48964f168532e9f07a4e708e2afb3791c3e..e9d3e34520b706627205e0d5b17b25e09f198e7e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1543,7 +1543,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0951-Win-Screen-API.patch b/patches/server/0950-Win-Screen-API.patch similarity index 93% rename from patches/server/0951-Win-Screen-API.patch rename to patches/server/0950-Win-Screen-API.patch index c49378d8ad..5927de4938 100644 --- a/patches/server/0951-Win-Screen-API.patch +++ b/patches/server/0950-Win-Screen-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API public net.minecraft.server.level.ServerPlayer seenCredits diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ec7a028f36cb4d116c1ff63d34d3d69dfe063f14..eca5e6b93dd84307bf9dbadf32414d6f506e69dc 100644 +index cdb1e5d82ff1e18e3f27c816df57bd9eeebbe80b..0ae1fce0c1a2e3bfbbab756a088fc76545e263fa 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1208,6 +1208,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0952-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0951-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0952-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0951-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0953-Fix-force-opening-enchantment-tables.patch b/patches/server/0952-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0953-Fix-force-opening-enchantment-tables.patch rename to patches/server/0952-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0954-Add-Entity-Body-Yaw-API.patch b/patches/server/0953-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0954-Add-Entity-Body-Yaw-API.patch rename to patches/server/0953-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0955-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0954-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0955-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0954-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0956-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0955-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0956-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0955-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0957-Add-EntityFertilizeEggEvent.patch b/patches/server/0956-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0957-Add-EntityFertilizeEggEvent.patch rename to patches/server/0956-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0958-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0957-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0958-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0957-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0959-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0958-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0959-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0958-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0960-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0959-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0960-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0959-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0961-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0960-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0961-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0960-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0962-Fix-text-display-error-on-spawn.patch b/patches/server/0961-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0962-Fix-text-display-error-on-spawn.patch rename to patches/server/0961-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0963-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0962-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0963-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0962-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0964-Add-Shearable-API.patch b/patches/server/0963-Add-Shearable-API.patch similarity index 100% rename from patches/server/0964-Add-Shearable-API.patch rename to patches/server/0963-Add-Shearable-API.patch diff --git a/patches/server/0965-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0964-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0965-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0964-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0966-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0965-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch similarity index 95% rename from patches/server/0966-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch rename to patches/server/0965-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch index eb0ad92ef4..7d6b194d1b 100644 --- a/patches/server/0966-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch +++ b/patches/server/0965-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch @@ -18,7 +18,7 @@ index 6986b2a5df34bfe078c902594f6409ad0ea847ef..ed12a23448dc9ada423ebd79a131eab2 this.updateState(slot); } diff --git a/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java -index 9cb6c0d80a988c23dd7af4263882ac128d08d6e8..08a6f2924b36d36fadb35d8d2443bb717ff4567e 100644 +index 77ece220a2e204c3e66e660c639abda957bf21b9..62acd6686626c84c9fc3964af62097101e8e582f 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java @@ -183,6 +183,12 @@ public class JukeboxBlockEntity extends BlockEntity implements Clearable, Contai diff --git a/patches/server/0967-Optimize-Hoppers.patch b/patches/server/0966-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0967-Optimize-Hoppers.patch rename to patches/server/0966-Optimize-Hoppers.patch diff --git a/patches/server/0968-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0967-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0968-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0967-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0969-Properly-cancel-bed-block-placement.patch b/patches/server/0968-Properly-cancel-bed-block-placement.patch similarity index 100% rename from patches/server/0969-Properly-cancel-bed-block-placement.patch rename to patches/server/0968-Properly-cancel-bed-block-placement.patch diff --git a/patches/server/0970-Fix-api-checking-banned-ips.patch b/patches/server/0969-Fix-api-checking-banned-ips.patch similarity index 100% rename from patches/server/0970-Fix-api-checking-banned-ips.patch rename to patches/server/0969-Fix-api-checking-banned-ips.patch diff --git a/patches/server/0971-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0970-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0971-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0970-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0972-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0971-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0972-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0971-Treat-sequence-violations-like-they-should-be.patch diff --git a/work/Bukkit b/work/Bukkit index 2c64d8c4a8..9153f77e75 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 2c64d8c4a880c6aec8ee8ce3abdd0238b0e0d8a3 +Subproject commit 9153f77e75057c0d0be267de6e0dca89e487625f diff --git a/work/CraftBukkit b/work/CraftBukkit index f92c945173..e142fb9fd3 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit f92c945173a83c754203f372cb0111780c24b540 +Subproject commit e142fb9fd3784080c43e025c32d8306881fee4ca