From 0925b4af6fb161318656fda05cf2737c7806e1c5 Mon Sep 17 00:00:00 2001 From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Date: Fri, 22 Sep 2023 18:11:35 +0200 Subject: [PATCH] some work --- ...ItemEvent-and-EntityCompostItemEvent.patch | 0 .../server/Add-Entity-Body-Yaw-API.patch | 0 .../server/Add-EntityFertilizeEggEvent.patch | 0 .../Add-Mob-Experience-reward-API.patch | 0 .../server/Add-Shearable-API.patch | 0 .../Add-Sign-getInteractableSideFor.patch | 0 .../Add-event-for-player-editing-sign.patch | 9 ++++--- ...-to-remove-all-active-potion-effects.patch | 0 .../Add-option-to-disable-block-updates.patch | 0 .../server/Add-transient-modifier-API.patch | 0 .../Array-backed-synched-entity-data.patch | 0 ...-Lazy-Initialization-for-Enum-Fields.patch | 0 ...-redstone-on-top-of-trap-doors-early.patch | 0 ...ll-BlockGrowEvent-for-missing-blocks.patch | 12 ++++----- .../Call-missing-BlockDispenseEvent.patch | 0 ...ectly-handle-ArmorStand-invisibility.patch | 0 ...nk-items-during-EntityResurrectEvent.patch | 0 ...anhasbukkit-default-if-alias-block-e.patch | 0 ...d-chunks-for-supporting-block-checks.patch | 0 .../server/Expand-PlayerItemMendEvent.patch | 0 ...sion-moving-velocity-to-VehicleBlock.patch | 0 .../Fix-DamageCause-for-Falling-Blocks.patch | 0 ...ity-drop-not-updating-the-client-inv.patch | 0 ...event-sleeping-villagers-moving-towa.patch | 0 .../Fix-SpawnEggMeta-get-setSpawnedType.patch | 0 .../Fix-a-couple-of-upstream-bed-issues.patch | 0 ...vancement-triggers-for-entity-damage.patch | 0 ...hives-generating-from-using-bonemeal.patch | 0 .../server/Fix-block-place-logic.patch | 0 ...inventories-returning-null-Locations.patch | 0 ...okshelf-and-jukebox-setItem-with-air.patch | 2 +- ...access-to-lookups-field-in-RegistryO.patch | 0 ...ng-to-bad-recipes-in-furnace-like-ti.patch | 8 +++--- ...Fix-demo-flag-not-enabling-demo-mode.patch | 10 +++++--- ...Fix-force-opening-enchantment-tables.patch | 0 ...crafting-result-amount-for-fireworks.patch | 0 .../Fix-sniffer-removeExploredLocation.patch | 0 ...und-playing-for-BlockItem-ItemStacks.patch | 0 .../Fix-text-display-error-on-spawn.patch | 19 ++++++++++++++ ...definitions-of-trim-material-pattern.patch | 0 ...e-command-function-perm-level-checks.patch | 0 .../More-accurate-isInOpenWater-impl.patch | 0 ...ck-item-frames-if-players-can-see-it.patch | 0 ...recalcBlockCounts-for-empty-sections.patch | 0 .../server/Optimize-Hoppers.patch | 0 .../Optimize-player-lookups-for-beacons.patch | 0 ...nts-being-fired-from-unloaded-chunks.patch | 0 ...expired-keys-from-impacting-new-join.patch | 6 ++--- .../server/Properly-Cancel-Usable-Items.patch | 2 +- ...esh-ProjectileSource-for-projectiles.patch | 0 ...tItemStack-setAmount-null-assignment.patch | 0 ...ayerChunkLoaderData-in-order-to-prep.patch | 0 ...uence-violations-like-they-should-be.patch | 2 +- ...when-a-captured-block-state-is-outda.patch | 0 .../Use-array-for-gamerule-storage.patch | 2 +- ...le-player-info-update-packet-on-join.patch | 2 +- .../server/Win-Screen-API.patch | 0 ...config-for-disabling-entity-tag-tags.patch | 0 ...apLike-spam-for-missing-key-selector.patch | 0 .../fix-item-meta-for-tadpole-buckets.patch | 0 ...duplicate-animate-packet-for-records.patch | 0 ...eehive-without-any-players-nearby-th.patch | 25 ------------------- .../Fix-text-display-error-on-spawn.patch | 19 -------------- ...Folia-scheduler-and-owned-region-API.patch | 0 64 files changed, 48 insertions(+), 70 deletions(-) rename patches/{unapplied => }/server/Add-CompostItemEvent-and-EntityCompostItemEvent.patch (100%) rename patches/{unapplied => }/server/Add-Entity-Body-Yaw-API.patch (100%) rename patches/{unapplied => }/server/Add-EntityFertilizeEggEvent.patch (100%) rename patches/{unapplied => }/server/Add-Mob-Experience-reward-API.patch (100%) rename patches/{unapplied => }/server/Add-Shearable-API.patch (100%) rename patches/{unapplied => }/server/Add-Sign-getInteractableSideFor.patch (100%) rename patches/{unapplied => }/server/Add-event-for-player-editing-sign.patch (98%) rename patches/{unapplied => }/server/Add-method-to-remove-all-active-potion-effects.patch (100%) rename patches/{unapplied => }/server/Add-option-to-disable-block-updates.patch (100%) rename patches/{unapplied => }/server/Add-transient-modifier-API.patch (100%) rename patches/{unapplied => }/server/Array-backed-synched-entity-data.patch (100%) rename patches/{unapplied => }/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch (100%) rename patches/{unapplied => }/server/Break-redstone-on-top-of-trap-doors-early.patch (100%) rename patches/{unapplied => }/server/Call-BlockGrowEvent-for-missing-blocks.patch (81%) rename patches/{unapplied => }/server/Call-missing-BlockDispenseEvent.patch (100%) rename patches/{unapplied => }/server/Correctly-handle-ArmorStand-invisibility.patch (100%) rename patches/{unapplied => }/server/Correctly-shrink-items-during-EntityResurrectEvent.patch (100%) rename patches/{unapplied => }/server/Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch (100%) rename patches/{unapplied => }/server/Don-t-load-chunks-for-supporting-block-checks.patch (100%) rename patches/{unapplied => }/server/Expand-PlayerItemMendEvent.patch (100%) rename patches/{unapplied => }/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch (100%) rename patches/{unapplied => }/server/Fix-DamageCause-for-Falling-Blocks.patch (100%) rename patches/{unapplied => }/server/Fix-HumanEntity-drop-not-updating-the-client-inv.patch (100%) rename patches/{unapplied => }/server/Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch (100%) rename patches/{unapplied => }/server/Fix-SpawnEggMeta-get-setSpawnedType.patch (100%) rename patches/{unapplied => }/server/Fix-a-couple-of-upstream-bed-issues.patch (100%) rename patches/{unapplied => }/server/Fix-advancement-triggers-for-entity-damage.patch (100%) rename patches/{unapplied => }/server/Fix-beehives-generating-from-using-bonemeal.patch (100%) rename patches/{unapplied => }/server/Fix-block-place-logic.patch (100%) rename patches/{unapplied => }/server/Fix-certain-inventories-returning-null-Locations.patch (100%) rename patches/{unapplied => }/server/Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch (98%) rename patches/{unapplied => }/server/Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch (100%) rename patches/{unapplied => }/server/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch (72%) rename patches/{unapplied => }/server/Fix-demo-flag-not-enabling-demo-mode.patch (75%) rename patches/{unapplied => }/server/Fix-force-opening-enchantment-tables.patch (100%) rename patches/{unapplied => }/server/Fix-incorrect-crafting-result-amount-for-fireworks.patch (100%) rename patches/{unapplied => }/server/Fix-sniffer-removeExploredLocation.patch (100%) rename patches/{unapplied => }/server/Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch (100%) create mode 100644 patches/server/Fix-text-display-error-on-spawn.patch rename patches/{unapplied => }/server/Ignore-inline-definitions-of-trim-material-pattern.patch (100%) rename patches/{unapplied => }/server/Improve-command-function-perm-level-checks.patch (100%) rename patches/{unapplied => }/server/More-accurate-isInOpenWater-impl.patch (100%) rename patches/{unapplied => }/server/Only-tick-item-frames-if-players-can-see-it.patch (100%) rename patches/{unapplied => }/server/Optimise-recalcBlockCounts-for-empty-sections.patch (100%) rename patches/{unapplied => }/server/Optimize-Hoppers.patch (100%) rename patches/{unapplied => }/server/Optimize-player-lookups-for-beacons.patch (100%) rename patches/{unapplied => }/server/Prevent-GameEvents-being-fired-from-unloaded-chunks.patch (100%) rename patches/{unapplied => }/server/Prevent-causing-expired-keys-from-impacting-new-join.patch (91%) rename patches/{unapplied => }/server/Properly-Cancel-Usable-Items.patch (97%) rename patches/{unapplied => }/server/Refresh-ProjectileSource-for-projectiles.patch (100%) rename patches/{unapplied => }/server/Remove-CraftItemStack-setAmount-null-assignment.patch (100%) rename patches/{unapplied => }/server/Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch (100%) rename patches/{unapplied => }/server/Treat-sequence-violations-like-they-should-be.patch (91%) rename patches/{unapplied => }/server/Update-the-flag-when-a-captured-block-state-is-outda.patch (100%) rename patches/{unapplied => }/server/Use-array-for-gamerule-storage.patch (95%) rename patches/{unapplied => }/server/Use-single-player-info-update-packet-on-join.patch (97%) rename patches/{unapplied => }/server/Win-Screen-API.patch (100%) rename patches/{unapplied => }/server/config-for-disabling-entity-tag-tags.patch (100%) rename patches/{unapplied => }/server/fix-MapLike-spam-for-missing-key-selector.patch (100%) rename patches/{unapplied => }/server/fix-item-meta-for-tadpole-buckets.patch (100%) rename patches/{unapplied => }/server/remove-duplicate-animate-packet-for-records.patch (100%) delete mode 100644 patches/unapplied/server/Fix-destroying-beehive-without-any-players-nearby-th.patch delete mode 100644 patches/unapplied/server/Fix-text-display-error-on-spawn.patch rename patches/unapplied/{server => skipped}/Folia-scheduler-and-owned-region-API.patch (100%) diff --git a/patches/unapplied/server/Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/unapplied/server/Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/unapplied/server/Add-Entity-Body-Yaw-API.patch b/patches/server/Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/unapplied/server/Add-Entity-Body-Yaw-API.patch rename to patches/server/Add-Entity-Body-Yaw-API.patch diff --git a/patches/unapplied/server/Add-EntityFertilizeEggEvent.patch b/patches/server/Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/unapplied/server/Add-EntityFertilizeEggEvent.patch rename to patches/server/Add-EntityFertilizeEggEvent.patch diff --git a/patches/unapplied/server/Add-Mob-Experience-reward-API.patch b/patches/server/Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/unapplied/server/Add-Mob-Experience-reward-API.patch rename to patches/server/Add-Mob-Experience-reward-API.patch diff --git a/patches/unapplied/server/Add-Shearable-API.patch b/patches/server/Add-Shearable-API.patch similarity index 100% rename from patches/unapplied/server/Add-Shearable-API.patch rename to patches/server/Add-Shearable-API.patch diff --git a/patches/unapplied/server/Add-Sign-getInteractableSideFor.patch b/patches/server/Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/unapplied/server/Add-Sign-getInteractableSideFor.patch rename to patches/server/Add-Sign-getInteractableSideFor.patch diff --git a/patches/unapplied/server/Add-event-for-player-editing-sign.patch b/patches/server/Add-event-for-player-editing-sign.patch similarity index 98% rename from patches/unapplied/server/Add-event-for-player-editing-sign.patch rename to patches/server/Add-event-for-player-editing-sign.patch index 10842ca8a8..5c2fe297f4 100644 --- a/patches/unapplied/server/Add-event-for-player-editing-sign.patch +++ b/patches/server/Add-event-for-player-editing-sign.patch @@ -27,7 +27,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } else if (!this.otherPlayerIsEditingSign(player, tileentitysign) && player.mayBuild() && this.hasEditableText(player, tileentitysign, flag1)) { - this.openTextEdit(player, tileentitysign, flag1, org.bukkit.event.player.PlayerSignOpenEvent.Cause.INTERACT); // CraftBukkit + this.openTextEdit(player, tileentitysign, flag1, io.papermc.paper.event.player.PlayerOpenSignEvent.Cause.INTERACT); // Paper - return InteractionResult.SUCCESS; + return this.getInteractionResult(flag); } else { return InteractionResult.PASS; @@ -0,0 +0,0 @@ public abstract class SignBlock extends BaseEntityBlock implements SimpleWaterlo @@ -38,12 +38,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public void openTextEdit(Player player, SignBlockEntity blockEntity, boolean front) { - // Craftbukkit start - this.openTextEdit(player, blockEntity, front, org.bukkit.event.player.PlayerSignOpenEvent.Cause.UNKNOWN); -+ // Paper start - PlayerOpenSignEvent -+ this.openTextEdit(player, blockEntity, front, io.papermc.paper.event.player.PlayerOpenSignEvent.Cause.UNKNOWN); - } +- } - - public void openTextEdit(Player entityhuman, SignBlockEntity tileentitysign, boolean flag, org.bukkit.event.player.PlayerSignOpenEvent.Cause cause) { - if (!org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerSignOpenEvent(entityhuman, tileentitysign, flag, cause)) { ++ // Paper start - PlayerOpenSignEvent ++ this.openTextEdit(player, blockEntity, front, io.papermc.paper.event.player.PlayerOpenSignEvent.Cause.UNKNOWN); ++ } + public void openTextEdit(Player entityhuman, SignBlockEntity tileentitysign, boolean flag, io.papermc.paper.event.player.PlayerOpenSignEvent.Cause cause) { + org.bukkit.entity.Player bukkitPlayer = (org.bukkit.entity.Player) entityhuman.getBukkitEntity(); + org.bukkit.block.Block bukkitBlock = org.bukkit.craftbukkit.block.CraftBlock.at(tileentitysign.getLevel(), tileentitysign.getBlockPos()); diff --git a/patches/unapplied/server/Add-method-to-remove-all-active-potion-effects.patch b/patches/server/Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/unapplied/server/Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/unapplied/server/Add-option-to-disable-block-updates.patch b/patches/server/Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/unapplied/server/Add-option-to-disable-block-updates.patch rename to patches/server/Add-option-to-disable-block-updates.patch diff --git a/patches/unapplied/server/Add-transient-modifier-API.patch b/patches/server/Add-transient-modifier-API.patch similarity index 100% rename from patches/unapplied/server/Add-transient-modifier-API.patch rename to patches/server/Add-transient-modifier-API.patch diff --git a/patches/unapplied/server/Array-backed-synched-entity-data.patch b/patches/server/Array-backed-synched-entity-data.patch similarity index 100% rename from patches/unapplied/server/Array-backed-synched-entity-data.patch rename to patches/server/Array-backed-synched-entity-data.patch diff --git a/patches/unapplied/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/unapplied/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/unapplied/server/Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/unapplied/server/Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/unapplied/server/Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/Call-BlockGrowEvent-for-missing-blocks.patch similarity index 81% rename from patches/unapplied/server/Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/Call-BlockGrowEvent-for-missing-blocks.patch index 12c758f41d..ade8a18ddf 100644 --- a/patches/unapplied/server/Call-BlockGrowEvent-for-missing-blocks.patch +++ b/patches/server/Call-BlockGrowEvent-for-missing-blocks.patch @@ -10,14 +10,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java +++ b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java @@ -0,0 +0,0 @@ public class PitcherCropBlock extends DoublePlantBlock implements BonemealableBl - private void grow(ServerLevel world, BlockState state, BlockPos pos, int amount) { int i = Math.min(state.getValue(AGE) + amount, 4); if (this.canGrow(world, pos, state, i)) { -- world.setBlock(pos, state.setValue(AGE, Integer.valueOf(i)), 2); -+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, pos, state.setValue(AGE, Integer.valueOf(i)), 2)) return; // Paper - if (i >= 3) { - BlockPos blockPos = pos.above(); - world.setBlock(blockPos, copyWaterloggedFrom(world, pos, this.defaultBlockState().setValue(AGE, Integer.valueOf(i)).setValue(HALF, DoubleBlockHalf.UPPER)), 3); + BlockState blockState = state.setValue(AGE, Integer.valueOf(i)); +- world.setBlock(pos, blockState, 2); ++ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, pos, blockState, 2)) return; // Paper + if (isDouble(i)) { + world.setBlock(pos.above(), blockState.setValue(HALF, DoubleBlockHalf.UPPER), 3); + } diff --git a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java diff --git a/patches/unapplied/server/Call-missing-BlockDispenseEvent.patch b/patches/server/Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/unapplied/server/Call-missing-BlockDispenseEvent.patch rename to patches/server/Call-missing-BlockDispenseEvent.patch diff --git a/patches/unapplied/server/Correctly-handle-ArmorStand-invisibility.patch b/patches/server/Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/unapplied/server/Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/unapplied/server/Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/unapplied/server/Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/unapplied/server/Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/unapplied/server/Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/unapplied/server/Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/Don-t-load-chunks-for-supporting-block-checks.patch similarity index 100% rename from patches/unapplied/server/Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/server/Don-t-load-chunks-for-supporting-block-checks.patch diff --git a/patches/unapplied/server/Expand-PlayerItemMendEvent.patch b/patches/server/Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/unapplied/server/Expand-PlayerItemMendEvent.patch rename to patches/server/Expand-PlayerItemMendEvent.patch diff --git a/patches/unapplied/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/unapplied/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/unapplied/server/Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/unapplied/server/Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/unapplied/server/Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/unapplied/server/Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/unapplied/server/Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/unapplied/server/Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/unapplied/server/Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/unapplied/server/Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/unapplied/server/Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/unapplied/server/Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/unapplied/server/Fix-advancement-triggers-for-entity-damage.patch b/patches/server/Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/unapplied/server/Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/unapplied/server/Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/unapplied/server/Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/unapplied/server/Fix-block-place-logic.patch b/patches/server/Fix-block-place-logic.patch similarity index 100% rename from patches/unapplied/server/Fix-block-place-logic.patch rename to patches/server/Fix-block-place-logic.patch diff --git a/patches/unapplied/server/Fix-certain-inventories-returning-null-Locations.patch b/patches/server/Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/unapplied/server/Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/unapplied/server/Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch similarity index 98% rename from patches/unapplied/server/Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch rename to patches/server/Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch index 3f36dd35f8..0bfad93a05 100644 --- a/patches/unapplied/server/Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch +++ b/patches/server/Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch @@ -16,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + if (stack.isEmpty() || stack.is(ItemTags.BOOKSHELF_BOOKS)) { // Paper this.items.set(slot, stack); if (level != null) this.updateState(slot); // CraftBukkit - SPIGOT-7381: check for null world - } + } else if (stack.isEmpty()) { 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java diff --git a/patches/unapplied/server/Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/unapplied/server/Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/unapplied/server/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 72% rename from patches/unapplied/server/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch index fca011867b..b9174b49ba 100644 --- a/patches/unapplied/server/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch +++ b/patches/server/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch @@ -12,8 +12,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit Entry entry = (Entry) objectiterator.next(); - worldserver.getRecipeManager().byKey((ResourceLocation) entry.getKey()).ifPresent((irecipe) -> { -+ if (!(irecipe instanceof AbstractCookingRecipe)) return; // Paper - don't process non-cooking recipes - list.add(irecipe); - AbstractFurnaceBlockEntity.createExperience(worldserver, vec3d, entry.getIntValue(), ((AbstractCookingRecipe) irecipe).getExperience(), blockposition, entityplayer, itemstack, amount); // CraftBukkit + worldserver.getRecipeManager().byKey((ResourceLocation) entry.getKey()).ifPresent((recipeholder) -> { ++ if (!(recipeholder.value() instanceof AbstractCookingRecipe)) return; // Paper - don't process non-cooking recipes + list.add(recipeholder); + AbstractFurnaceBlockEntity.createExperience(worldserver, vec3d, entry.getIntValue(), ((AbstractCookingRecipe) recipeholder.value()).getExperience(), blockposition, entityplayer, itemstack, amount); // CraftBukkit }); diff --git a/patches/unapplied/server/Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/Fix-demo-flag-not-enabling-demo-mode.patch similarity index 75% rename from patches/unapplied/server/Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/Fix-demo-flag-not-enabling-demo-mode.patch index 11747f4877..91ae016ea7 100644 --- a/patches/unapplied/server/Fix-demo-flag-not-enabling-demo-mode.patch +++ b/patches/server/Fix-demo-flag-not-enabling-demo-mode.patch @@ -10,11 +10,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -0,0 +0,0 @@ public class Main { + /* - dedicatedserver1.setSingleplayerProfile(optionset.has(optionspec8) ? new GameProfile((UUID) null, (String) optionset.valueOf(optionspec8)) : null); - dedicatedserver1.setPort((Integer) optionset.valueOf(optionspec11)); + dedicatedserver1.setPort((Integer) optionset.valueOf(optionspec10)); - dedicatedserver1.setDemo(optionset.has(optionspec2)); -+ */dedicatedserver1.setDemo(optionset.has("demo"));/* // Paper - Restore setting the demo mode - dedicatedserver1.setId((String) optionset.valueOf(optionspec12)); ++ */ ++ dedicatedserver1.setDemo(optionset.has("demo")); // Paper - Restore setting the demo mode ++ /* + dedicatedserver1.setId((String) optionset.valueOf(optionspec11)); */ boolean flag1 = !optionset.has("nogui") && !optionset.nonOptionArguments().contains("nogui"); diff --git a/patches/unapplied/server/Fix-force-opening-enchantment-tables.patch b/patches/server/Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/unapplied/server/Fix-force-opening-enchantment-tables.patch rename to patches/server/Fix-force-opening-enchantment-tables.patch diff --git a/patches/unapplied/server/Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/unapplied/server/Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/server/Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/unapplied/server/Fix-sniffer-removeExploredLocation.patch b/patches/server/Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/unapplied/server/Fix-sniffer-removeExploredLocation.patch rename to patches/server/Fix-sniffer-removeExploredLocation.patch diff --git a/patches/unapplied/server/Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/unapplied/server/Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/Fix-text-display-error-on-spawn.patch b/patches/server/Fix-text-display-error-on-spawn.patch new file mode 100644 index 0000000000..5a6d5ded24 --- /dev/null +++ b/patches/server/Fix-text-display-error-on-spawn.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nassim Jahnke +Date: Thu, 16 Mar 2023 16:27:50 +0100 +Subject: [PATCH] Fix text display error on spawn + + +diff --git a/src/main/java/net/minecraft/world/entity/Display.java b/src/main/java/net/minecraft/world/entity/Display.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/world/entity/Display.java ++++ b/src/main/java/net/minecraft/world/entity/Display.java +@@ -0,0 +0,0 @@ public abstract class Display extends Entity { + byte b = loadFlag((byte)0, nbt, "shadow", (byte)1); + b = loadFlag(b, nbt, "see_through", (byte)2); + b = loadFlag(b, nbt, "default_background", (byte)4); +- Optional optional = Display.TextDisplay.Align.CODEC.decode(NbtOps.INSTANCE, nbt.get("alignment")).resultOrPartial(Util.prefix("Display entity", Display.LOGGER::error)).map(Pair::getFirst); ++ Optional optional = Display.TextDisplay.Align.CODEC.decode(NbtOps.INSTANCE, nbt.get("alignment")).result().map(Pair::getFirst); // Paper - hide error message + if (optional.isPresent()) { + byte var10000; + switch ((Display.TextDisplay.Align)optional.get()) { diff --git a/patches/unapplied/server/Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/Ignore-inline-definitions-of-trim-material-pattern.patch similarity index 100% rename from patches/unapplied/server/Ignore-inline-definitions-of-trim-material-pattern.patch rename to patches/server/Ignore-inline-definitions-of-trim-material-pattern.patch diff --git a/patches/unapplied/server/Improve-command-function-perm-level-checks.patch b/patches/server/Improve-command-function-perm-level-checks.patch similarity index 100% rename from patches/unapplied/server/Improve-command-function-perm-level-checks.patch rename to patches/server/Improve-command-function-perm-level-checks.patch diff --git a/patches/unapplied/server/More-accurate-isInOpenWater-impl.patch b/patches/server/More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/unapplied/server/More-accurate-isInOpenWater-impl.patch rename to patches/server/More-accurate-isInOpenWater-impl.patch diff --git a/patches/unapplied/server/Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/unapplied/server/Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/unapplied/server/Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/unapplied/server/Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/unapplied/server/Optimize-Hoppers.patch b/patches/server/Optimize-Hoppers.patch similarity index 100% rename from patches/unapplied/server/Optimize-Hoppers.patch rename to patches/server/Optimize-Hoppers.patch diff --git a/patches/unapplied/server/Optimize-player-lookups-for-beacons.patch b/patches/server/Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/unapplied/server/Optimize-player-lookups-for-beacons.patch rename to patches/server/Optimize-player-lookups-for-beacons.patch diff --git a/patches/unapplied/server/Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/unapplied/server/Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/unapplied/server/Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 91% rename from patches/unapplied/server/Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/Prevent-causing-expired-keys-from-impacting-new-join.patch index 33b91aa1f4..dd287273fc 100644 --- a/patches/unapplied/server/Prevent-causing-expired-keys-from-impacting-new-join.patch +++ b/patches/server/Prevent-causing-expired-keys-from-impacting-new-join.patch @@ -27,7 +27,7 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl private final AtomicReference lastChatTimeStamp; @Nullable private RemoteChatSession chatSession; @@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 private SignedMessageChain.Decoder signedMessageDecoder; private final LastSeenMessagesValidator lastSeenMessages; private final MessageSignatureCache messageSignatureCache; -@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause } @@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } public void resetPosition() { -@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl private void resetPlayerChatState(RemoteChatSession session) { this.chatSession = session; diff --git a/patches/unapplied/server/Properly-Cancel-Usable-Items.patch b/patches/server/Properly-Cancel-Usable-Items.patch similarity index 97% rename from patches/unapplied/server/Properly-Cancel-Usable-Items.patch rename to patches/server/Properly-Cancel-Usable-Items.patch index 669c75a828..88e7c13209 100644 --- a/patches/unapplied/server/Properly-Cancel-Usable-Items.patch +++ b/patches/server/Properly-Cancel-Usable-Items.patch @@ -37,7 +37,7 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } if (cancelled) { diff --git a/patches/unapplied/server/Refresh-ProjectileSource-for-projectiles.patch b/patches/server/Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/unapplied/server/Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/unapplied/server/Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/unapplied/server/Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/unapplied/server/Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch similarity index 100% rename from patches/unapplied/server/Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch rename to patches/server/Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch diff --git a/patches/unapplied/server/Treat-sequence-violations-like-they-should-be.patch b/patches/server/Treat-sequence-violations-like-they-should-be.patch similarity index 91% rename from patches/unapplied/server/Treat-sequence-violations-like-they-should-be.patch rename to patches/server/Treat-sequence-violations-like-they-should-be.patch index 3d8f78c977..439989280e 100644 --- a/patches/unapplied/server/Treat-sequence-violations-like-they-should-be.patch +++ b/patches/server/Treat-sequence-violations-like-they-should-be.patch @@ -8,7 +8,7 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl public void ackBlockChangesUpTo(int sequence) { if (sequence < 0) { diff --git a/patches/unapplied/server/Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/unapplied/server/Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/unapplied/server/Use-array-for-gamerule-storage.patch b/patches/server/Use-array-for-gamerule-storage.patch similarity index 95% rename from patches/unapplied/server/Use-array-for-gamerule-storage.patch rename to patches/server/Use-array-for-gamerule-storage.patch index b54b30a28b..34436c32da 100644 --- a/patches/unapplied/server/Use-array-for-gamerule-storage.patch +++ b/patches/server/Use-array-for-gamerule-storage.patch @@ -9,8 +9,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/world/level/GameRules.java +++ b/src/main/java/net/minecraft/world/level/GameRules.java @@ -0,0 +0,0 @@ public class GameRules { - public static final GameRules.Key RULE_GLOBAL_SOUND_EVENTS = GameRules.register("globalSoundEvents", GameRules.Category.MISC, GameRules.BooleanValue.create(true)); public static final GameRules.Key RULE_DO_VINES_SPREAD = GameRules.register("doVinesSpread", GameRules.Category.UPDATES, GameRules.BooleanValue.create(true)); + public static final GameRules.Key RULE_ENDER_PEARLS_VANISH_ON_DEATH = GameRules.register("enderPearlsVanishOnDeath", GameRules.Category.PLAYER, GameRules.BooleanValue.create(true)); private final Map, GameRules.Value> rules; + private final GameRules.Value[] gameruleArray; // Paper diff --git a/patches/unapplied/server/Use-single-player-info-update-packet-on-join.patch b/patches/server/Use-single-player-info-update-packet-on-join.patch similarity index 97% rename from patches/unapplied/server/Use-single-player-info-update-packet-on-join.patch rename to patches/server/Use-single-player-info-update-packet-on-join.patch index 6150695961..511cea71c4 100644 --- a/patches/unapplied/server/Use-single-player-info-update-packet-on-join.patch +++ b/patches/server/Use-single-player-info-update-packet-on-join.patch @@ -8,7 +8,7 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl this.signedMessageDecoder = session.createMessageDecoder(this.player.getUUID()); this.chatMessageChain.append((executor) -> { this.player.setChatSession(session); diff --git a/patches/unapplied/server/Win-Screen-API.patch b/patches/server/Win-Screen-API.patch similarity index 100% rename from patches/unapplied/server/Win-Screen-API.patch rename to patches/server/Win-Screen-API.patch diff --git a/patches/unapplied/server/config-for-disabling-entity-tag-tags.patch b/patches/server/config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/unapplied/server/config-for-disabling-entity-tag-tags.patch rename to patches/server/config-for-disabling-entity-tag-tags.patch diff --git a/patches/unapplied/server/fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/unapplied/server/fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/unapplied/server/fix-item-meta-for-tadpole-buckets.patch b/patches/server/fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/unapplied/server/fix-item-meta-for-tadpole-buckets.patch rename to patches/server/fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/unapplied/server/remove-duplicate-animate-packet-for-records.patch b/patches/server/remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/unapplied/server/remove-duplicate-animate-packet-for-records.patch rename to patches/server/remove-duplicate-animate-packet-for-records.patch diff --git a/patches/unapplied/server/Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/unapplied/server/Fix-destroying-beehive-without-any-players-nearby-th.patch deleted file mode 100644 index dee3277662..0000000000 --- a/patches/unapplied/server/Fix-destroying-beehive-without-any-players-nearby-th.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Spottedleaf -Date: Mon, 3 Apr 2023 21:14:19 -0700 -Subject: [PATCH] Fix destroying beehive without any players nearby throwing an - exception - -If the player moves out of range by the time the block is destroyed, -then the exception would throw and remove the player from the world - -diff --git a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java -+++ b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java -@@ -0,0 +0,0 @@ public class BeehiveBlock extends BaseEntityBlock { - - if (!list.isEmpty()) { - List list1 = world.getEntitiesOfClass(Player.class, (new AABB(pos)).inflate(8.0D, 6.0D, 8.0D)); -+ // Paper start - if there are no players nearby, then nextInt() will throw -+ if (list1.isEmpty()) { -+ return; -+ } -+ // Paper end - if there are no players nearby, then nextInt() will throw - int i = list1.size(); - Iterator iterator = list.iterator(); - diff --git a/patches/unapplied/server/Fix-text-display-error-on-spawn.patch b/patches/unapplied/server/Fix-text-display-error-on-spawn.patch deleted file mode 100644 index 17dacd56d5..0000000000 --- a/patches/unapplied/server/Fix-text-display-error-on-spawn.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke -Date: Thu, 16 Mar 2023 16:27:50 +0100 -Subject: [PATCH] Fix text display error on spawn - - -diff --git a/src/main/java/net/minecraft/world/entity/Display.java b/src/main/java/net/minecraft/world/entity/Display.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/entity/Display.java -+++ b/src/main/java/net/minecraft/world/entity/Display.java -@@ -0,0 +0,0 @@ public abstract class Display extends Entity { - Logger logger = Display.LOGGER; - - Objects.requireNonNull(logger); -- Optional optional = dataresult.resultOrPartial(Util.prefix("Display entity", logger::error)).map(Pair::getFirst); -+ Optional optional = dataresult.result().map(Pair::getFirst); // Paper - hide error message - - if (optional.isPresent()) { - byte b1; diff --git a/patches/unapplied/server/Folia-scheduler-and-owned-region-API.patch b/patches/unapplied/skipped/Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/unapplied/server/Folia-scheduler-and-owned-region-API.patch rename to patches/unapplied/skipped/Folia-scheduler-and-owned-region-API.patch