From 2c2dadf75bf9b57b5f291c26efe2095a6637d6f8 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Tue, 3 Dec 2024 20:34:55 +0100 Subject: [PATCH] More more more more work --- .../API-for-an-entity-s-scoreboard-name.patch | 0 .../API-for-updating-recipes-on-clients.patch | 0 ...ntrol-player-s-insomnia-and-phantoms.patch | 0 ...CanPlaceOn-and-CanDestroy-NBT-values.patch | 0 ...he-collision-shape-of-a-block-before.patch | 0 .../Add-BlockBreakProgressUpdateEvent.patch | 0 .../Add-BlockFace-to-BlockDamageEvent.patch | 0 .../server/Add-BlockLockCheckEvent.patch | 0 .../server/Add-CartographyItemEvent.patch | 0 ...ItemEvent-and-EntityCompostItemEvent.patch | 0 .../server/Add-Entity-Body-Yaw-API.patch | 0 .../server/Add-EntityFertilizeEggEvent.patch | 0 .../server/Add-EntityPortalReadyEvent.patch | 0 .../server/Add-EntityToggleSitEvent.patch | 0 .../server/Add-FluidState-API.patch | 0 .../server/Add-ItemType-getItemRarity.patch | 0 .../server/Add-Lifecycle-Event-system.patch | 0 .../server/Add-Listing-API-for-Player.patch | 0 .../Add-Mob-Experience-reward-API.patch | 0 .../server/Add-Moving-Piston-API.patch | 0 .../Add-NamespacedKey-biome-methods.patch | 0 .../Add-Player-Warden-Warning-API.patch | 0 .../server/Add-Player-getFishHook.patch | 0 .../Add-PlayerInventorySlotChangeEvent.patch | 0 patches/server/Add-PlayerPickItemEvent.patch | 68 +++++++++++++++++++ .../server/Add-PlayerShieldDisableEvent.patch | 0 ...erTradeEvent-and-PlayerPurchaseEvent.patch | 0 .../Add-PrePlayerAttackEntityEvent.patch | 0 .../server/Add-Shearable-API.patch | 0 .../server/Add-ShulkerDuplicateEvent.patch | 0 .../Add-Sneaking-API-for-Entities.patch | 0 .../server/Add-Structure-check-API.patch | 0 .../Add-UUID-attribute-modifier-API.patch | 0 .../Add-Velocity-IP-Forwarding-Support.patch | 0 .../server/Add-WardenAngerChangeEvent.patch | 0 .../Add-and-fix-missing-BlockFadeEvents.patch | 0 ...Add-api-for-spawn-egg-texture-colors.patch | 0 ...g-for-mobs-immune-to-default-effects.patch | 0 ...tion-for-spider-worldborder-climbing.patch | 0 .../server/Add-drops-to-shear-events.patch | 0 .../server/Add-entity-knockback-API.patch | 0 .../Add-even-more-Enchantment-API.patch | 0 .../Add-event-for-player-editing-sign.patch | 0 .../server/Add-experience-points-API.patch | 0 .../server/Add-fire-tick-delay-option.patch | 0 ...kSnapshot-includeLightData-parameter.patch | 0 .../server/Add-getDrops-to-BlockState.patch | 0 ...sh-event-for-all-player-interactions.patch | 0 ...-to-remove-all-active-potion-effects.patch | 0 ...sing-InventoryHolders-to-inventories.patch | 0 ...ssing-SpigotConfig-logCommands-check.patch | 0 .../Add-missing-fishing-event-state.patch | 0 ...rtant-BlockStateListPopulator-method.patch | 0 ...ssing-logs-for-log-ips-config-option.patch | 0 ...ing-message-for-initial-server-start.patch | 0 ...-strict-advancement-dimension-checks.patch | 0 .../Add-option-to-disable-block-updates.patch | 0 .../Add-paper-dumplisteners-command.patch | 0 .../server/Add-player-idle-duration-API.patch | 0 .../server/Add-plugin-info-at-startup.patch | 0 ...predicate-for-blocks-when-raytracing.patch | 0 .../Add-registry-entry-and-builders.patch | 0 .../Add-skipping-world-symlink-scan.patch | 0 ...ot-sanity-checks-in-container-clicks.patch | 0 ...dd-source-block-to-BlockPhysicsEvent.patch | 0 ...-titleOverride-to-InventoryOpenEvent.patch | 0 .../server/Add-transient-modifier-API.patch | 0 ...us-missing-EntityDropItemEvent-calls.patch | 0 .../server/Add-whitelist-events.patch | 0 ...d-API-to-get-player-ha-proxy-address.patch | 0 ...-serialization-deserialization-for-P.patch | 0 .../server/Adopt-MaterialRerouting.patch | 0 ...plugin-to-use-Paper-PluginLoader-API.patch | 0 .../Allow-Saving-of-Oversized-Chunks.patch | 0 ...stack-for-Player-sendEquipmentChange.patch | 0 ...proper-checking-of-empty-item-stacks.patch | 0 .../server/Allow-trident-custom-damage.patch | 0 .../{unapplied => }/server/Anti-Xray.patch | 0 ...-Lazy-Initialization-for-Enum-Fields.patch | 0 .../server/Bandaid-fix-for-Effect.patch | 0 .../server/Block-Ticking-API.patch | 0 ...-redstone-on-top-of-trap-doors-early.patch | 0 .../server/Brigadier-based-command-API.patch | 0 ...tem-packets-with-collector-as-source.patch | 0 .../server/Cache-map-ids-on-item-frames.patch | 0 ...ll-BlockGrowEvent-for-missing-blocks.patch | 0 .../Call-BlockRedstoneEvents-properly.patch | 0 .../Call-missing-BlockDispenseEvent.patch | 0 ...heck-distance-in-entity-interactions.patch | 0 ...type-in-SculkSensorBlock-canActivate.patch | 0 .../server/Collision-API.patch | 0 ...nfigurable-Region-Compression-Format.patch | 0 .../server/Configurable-Sand-Duping.patch | 0 .../Configurable-chat-thread-limit.patch | 0 ...amage-tick-when-blocking-with-shield.patch | 0 ...ntity-tracking-range-by-Y-coordinate.patch | 0 .../Configurable-max-block-fluid-ticks.patch | 0 ...ion-for-horizontal-only-item-merging.patch | 0 .../Configure-sniffer-egg-hatch-time.patch | 0 ...ectly-handle-ArmorStand-invisibility.patch | 0 ...-interactions-with-items-on-cooldown.patch | 0 ...nk-items-during-EntityResurrectEvent.patch | 0 ...stom-Chat-Completion-Suggestions-API.patch | 0 .../server/Deep-clone-nbt-tags-in-PDC.patch | 0 ...cate-InvAction-HOTBAR_MOVE_AND_READD.patch | 0 .../server/Deprecate-ItemStack-setType.patch | 0 ...place-methods-with-old-StructureType.patch | 0 .../server/Detect-headless-JREs.patch | 0 ...nd-water-fluid-explosion-resistance-.patch | 0 ...t-selector-resolving-in-books-by-def.patch | 0 .../Disable-memory-reserve-allocating.patch | 0 ...l-proximity-check-before-entity-look.patch | 0 ...-entities-in-chunks-that-are-positio.patch | 0 ...-chunk-for-dynamic-game-event-listen.patch | 0 ...broadcast-messages-to-command-blocks.patch | 0 ...k-if-we-can-see-non-visible-entities.patch | 0 ...anhasbukkit-default-if-alias-block-e.patch | 0 ...n-t-fire-sync-events-during-worldgen.patch | 0 ...d-chunks-for-supporting-block-checks.patch | 0 ...te-namespaced-commands-if-send-names.patch | 0 ...-level-random-in-entity-constructors.patch | 0 .../Dont-resend-blocks-on-interactions.patch | 0 .../Dont-resent-entity-on-art-update.patch | 0 .../Elder-Guardian-appearance-API.patch | 0 .../server/Entity-Activation-Range-2.0.patch | 0 .../server/EntityPickupItemEvent-fixes.patch | 0 .../server/Expand-LingeringPotion-API.patch | 0 .../server/Expand-PlayerItemMendEvent.patch | 0 .../server/Expand-Pose-API.patch | 0 .../server/Expanded-Hopper-API.patch | 0 ...enceOrb-should-call-EntitySpawnEvent.patch | 0 .../Expose-LootTable-of-DecoratedPot.patch | 0 .../Expose-hand-in-BlockCanBuildEvent.patch | 0 .../Expose-hasColor-to-leather-armor.patch | 0 ...sion-moving-velocity-to-VehicleBlock.patch | 0 ...ntityChangeBlockEvent-in-more-places.patch | 0 ...eByEntityEvent-for-unowned-wither-sk.patch | 0 ...-entity-death-event-for-ender-dragon.patch | 0 .../server/Fix-BanList-API.patch | 0 .../server/Fix-Bee-flower-NPE.patch | 0 ...shPotion-and-LingeringPotion-spawnin.patch | 0 ...m-getAttributeModifier-duplication-c.patch | 0 .../server/Fix-DamageSource-API.patch | 0 ...nt-and-EntitySelectorParser-permissi.patch | 0 ...tEvent-cancellation-cant-fully-preve.patch | 0 ...ity-drop-not-updating-the-client-inv.patch | 0 .../server/Fix-ItemFlags.patch | 0 ...event-sleeping-villagers-moving-towa.patch | 4 +- .../Fix-NPE-for-Jukebox-setRecord.patch | 0 ...n-AdvancementProgress-getDateAwarded.patch | 0 ...-NPE-in-SculkBloomEvent-world-access.patch | 0 ...-Allay-stopDancing-while-not-dancing.patch | 0 .../server/Fix-NPE-on-Boat-getStatus.patch | 0 ...-on-null-loc-for-EntityTeleportEvent.patch | 0 .../Fix-PickupStatus-getting-reset.patch | 0 .../Fix-SpawnEggMeta-get-setSpawnedType.patch | 0 .../Fix-UnsafeValues-loadAdvancement.patch | 0 .../server/Fix-a-bunch-of-vanilla-bugs.patch | 10 +-- .../Fix-a-couple-of-upstream-bed-issues.patch | 0 ...vancement-triggers-for-entity-damage.patch | 0 ...async-entity-add-due-to-fungus-trees.patch | 0 .../server/Fix-bees-aging-inside-hives.patch | 0 .../server/Fix-block-place-logic.patch | 0 ...ing-BlockPlaceEvent-calling-onRemove.patch | 2 +- ...permission-levels-for-command-blocks.patch | 0 ...ng-to-bad-recipes-in-furnace-like-ti.patch | 0 ...invalid-block-entity-during-world-ge.patch | 0 .../Fix-custom-piglin-loved-items.patch | 0 ...x-custom-statistic-criteria-creation.patch | 0 .../Fix-damage-modifier-inconsistencies.patch | 0 ...Fix-demo-flag-not-enabling-demo-mode.patch | 0 ...y-type-tags-suggestions-in-selectors.patch | 0 .../Fix-equipment-slot-and-group-API.patch | 0 ...Fix-force-opening-enchantment-tables.patch | 0 ...act-event-not-being-called-sometimes.patch | 2 +- ...inventories-returning-null-Locations.patch | 0 .../server/Fix-issues-with-Recipe-API.patch | 4 +- ...g-event-call-for-entity-teleport-API.patch | 0 ...ix-missing-map-initialize-event-call.patch | 0 ...ix-plugin-loggers-on-server-shutdown.patch | 0 ...ix-possible-NPE-on-painting-creation.patch | 0 ...ckOverflowError-and-NPE-for-some-dis.patch | 0 ...x-premature-player-kicks-on-shutdown.patch | 0 ...on-on-UpgradeData.BlockFixers-class-.patch | 0 ...removing-recipes-from-RecipeIterator.patch | 0 ...ation-when-spawning-display-entities.patch | 0 ...onnect-packet-in-phases-where-it-doe.patch | 0 ...several-issues-with-EntityBreedEvent.patch | 0 .../Fix-shield-disable-inconsistency.patch | 0 ...Fix-silent-equipment-change-for-mobs.patch | 0 .../server/Fix-slot-desync.patch | 18 ++--- .../Fix-sniffer-removeExploredLocation.patch | 0 .../server/Fix-spigot-s-Forced-Stats.patch | 0 ...und-playing-for-BlockItem-ItemStacks.patch | 0 ...ingEffect-powers-lightning-rods-and-.patch | 0 ...and-message-for-brigadier-syntax-exc.patch | 0 ...sidebar-objectives-not-being-cleared.patch | 0 .../Fix-text-display-error-on-spawn.patch | 0 .../server/Fixup-NamespacedKey-handling.patch | 0 .../Flat-bedrock-generator-settings.patch | 0 .../server/Flying-Fall-Damage.patch | 4 +- ...Folia-scheduler-and-owned-region-API.patch | 0 .../{unapplied => }/server/Friction-API.patch | 0 .../server/General-ItemMeta-fixes.patch | 6 +- ...e-Large-Packets-disconnecting-client.patch | 0 ...e-Oversized-block-entities-in-chunks.patch | 0 .../server/Ignore-impossible-spawn-tick.patch | 0 .../Implement-OfflinePlayer-isConnected.patch | 0 .../Implement-PlayerFailMoveEvent.patch | 0 ...item-frames-performance-and-bug-fixe.patch | 0 .../server/Improve-PortalEvents.patch | 0 .../server/Improve-Registry.patch | 0 ...-for-some-hot-BlockBehavior-and-Flui.patch | 0 .../server/Improve-logging-and-errors.patch | 0 .../server/Improve-tag-parser-handling.patch | 0 .../server/Item-Mutation-Fixes.patch | 0 .../server/ItemStack-Tooltip-API.patch | 0 .../server/ItemStack-damage-API.patch | 0 ...ly-create-LootContext-for-criterions.patch | 0 .../server/Leashable-API.patch | 4 +- .../server/Limit-pet-look-distance.patch | 0 ...st-throw-both-Spread-and-Grow-Events.patch | 0 ...w-accessible-directly-from-ItemStack.patch | 0 ...ction-leniency-distance-configurable.patch | 10 +-- .../server/Missing-eating-regain-reason.patch | 0 .../server/Missing-effect-cause.patch | 0 ...-of-WorldCreator-keepSpawnLoaded-ret.patch | 0 .../server/More-Chest-Block-API.patch | 0 .../server/More-DragonBattle-API.patch | 0 .../server/More-Raid-API.patch | 0 .../server/More-Sign-Block-API.patch | 0 .../server/More-Teleport-API.patch | 0 .../More-accurate-isInOpenWater-impl.patch | 0 ...la-friendly-methods-to-update-trades.patch | 0 .../server/Nameable-Banner-API.patch | 0 ...tityDamageEvents-before-actuallyHurt.patch | 0 .../Only-capture-actual-tree-growth.patch | 0 ...ase-allay-memory-on-non-item-targets.patch | 0 ...Timer-for-Wandering-Traders-spawned-.patch | 0 ...ck-item-frames-if-players-can-see-it.patch | 0 .../Optimize-Bit-Operations-by-inlining.patch | 0 ...ptimize-Collision-to-not-load-chunks.patch | 0 ...oalSelector-Goal.Flag-Set-operations.patch | 0 .../server/Optimize-Hoppers.patch | 0 ...-Manager-and-add-advanced-packet-sup.patch | 0 ...der-Remove-Streams-Optimized-collect.patch | 0 .../server/Optimize-VarInts.patch | 0 .../server/Optimize-Voxel-Shape-Merging.patch | 0 ...ldBounds-and-getBlockState-for-inlin.patch | 0 ...e-nearest-structure-border-iteration.patch | 0 .../Optimize-player-lookups-for-beacons.patch | 0 .../Per-world-ticks-per-spawn-settings.patch | 0 .../Player-Entity-Tracking-Events.patch | 0 ...nts-being-fired-from-unloaded-chunks.patch | 0 ...ent-NPE-if-hooked-entity-was-cleared.patch | 0 ...expired-keys-from-impacting-new-join.patch | 0 ...mpty-items-from-being-added-to-world.patch | 0 ...entity-loading-causing-async-lookups.patch | 0 ...oversized-item-data-in-equipment-and.patch | 8 +-- ...ata-component-type-on-encoding-error.patch | 0 ...raft-commands-in-function-parsing-an.patch | 0 ...y-handle-BlockBreakEvent-isDropItems.patch | 0 ...e-experience-dropping-on-block-break.patch | 0 ...the-experimental-smithing-inventory-.patch | 0 .../server/Properly-resend-entities.patch | 20 +++--- ...he-changed-item-from-dispense-events.patch | 0 ...and-End-Portal-Frames-from-being-des.patch | 0 .../Proxy-ItemStack-to-CraftItemStack.patch | 0 ...llocation-of-Vec3D-by-entity-tracker.patch | 0 ...esh-ProjectileSource-for-projectiles.patch | 0 .../server/Registry-Modification-API.patch | 15 ++-- ...tItemStack-setAmount-null-assignment.patch | 0 ...ata-neighbour-ticks-outside-of-range.patch | 0 .../server/Remove-streams-from-hot-code.patch | 0 ...ry-onTrackingStart-during-navigation.patch | 0 ...eData-on-more-entities-when-spawning.patch | 0 ...estore-vanilla-entity-drops-behavior.patch | 0 ...a-handling-of-LivingEntity-actuallyH.patch | 0 .../Sanitize-sent-BlockEntity-NBT.patch | 0 .../server/SculkCatalyst-bloom-API.patch | 0 ...ck-entities-after-destroy-prediction.patch | 16 ++--- ...Skip-POI-finding-if-stuck-in-vehicle.patch | 0 ...ook-changes-from-crashing-the-server.patch | 0 .../Support-old-UUID-format-for-NBT.patch | 0 .../server/Suspicious-Effect-Entry-API.patch | 0 .../server/Sync-offhand-slot-in-menus.patch | 0 ...n-on-world-create-while-being-ticked.patch | 0 ...uence-violations-like-they-should-be.patch | 0 ...ta-when-attaching-firework-to-entity.patch | 0 ...ocity-compression-and-cipher-natives.patch | 2 +- .../Use-array-for-gamerule-storage.patch | 0 .../Use-correct-seed-on-api-world-load.patch | 0 ...urce-for-mushroom-block-spread-event.patch | 0 ...le-player-info-update-packet-on-join.patch | 0 ...date-ResourceLocation-in-NBT-reading.patch | 10 +-- ...-on-plugins-accessing-faraway-chunks.patch | 0 .../server/Win-Screen-API.patch | 0 .../server/add-more-scoreboard-API.patch | 0 .../server/add-number-format-api.patch | 0 ...global-player-list-where-appropriate.patch | 0 ...heck-if-itemstack-is-stackable-first.patch | 0 ...config-for-disabling-entity-tag-tags.patch | 9 ++- .../disable-forced-empty-world-ticks.patch | 0 ...re-reset-EnderDragon-boss-event-name.patch | 0 .../server/fix-Instruments.patch | 0 .../fix-Jigsaw-block-kicking-user.patch | 0 ...apLike-spam-for-missing-key-selector.patch | 0 ...y-vehicle-collision-event-not-called.patch | 0 .../server/fix-horse-inventories.patch | 0 .../fix-item-meta-for-tadpole-buckets.patch | 0 .../server/improve-BanList-types.patch | 0 ...ve-checking-handled-tags-in-itemmeta.patch | 0 .../optimize-dirt-and-snow-spreading.patch | 9 ++- ...rmEvent-for-mud-converting-into-clay.patch | 0 .../server/Add-PlayerPickItemEvent.patch | 48 ------------- 315 files changed, 143 insertions(+), 126 deletions(-) rename patches/{unapplied => }/server/API-for-an-entity-s-scoreboard-name.patch (100%) rename patches/{unapplied => }/server/API-for-updating-recipes-on-clients.patch (100%) rename patches/{unapplied => }/server/Ability-to-control-player-s-insomnia-and-phantoms.patch (100%) rename patches/{unapplied => }/server/Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch (100%) rename patches/{unapplied => }/server/Add-API-to-get-the-collision-shape-of-a-block-before.patch (100%) rename patches/{unapplied => }/server/Add-BlockBreakProgressUpdateEvent.patch (100%) rename patches/{unapplied => }/server/Add-BlockFace-to-BlockDamageEvent.patch (100%) rename patches/{unapplied => }/server/Add-BlockLockCheckEvent.patch (100%) rename patches/{unapplied => }/server/Add-CartographyItemEvent.patch (100%) 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-EntityPortalReadyEvent.patch (100%) rename patches/{unapplied => }/server/Add-EntityToggleSitEvent.patch (100%) rename patches/{unapplied => }/server/Add-FluidState-API.patch (100%) rename patches/{unapplied => }/server/Add-ItemType-getItemRarity.patch (100%) rename patches/{unapplied => }/server/Add-Lifecycle-Event-system.patch (100%) rename patches/{unapplied => }/server/Add-Listing-API-for-Player.patch (100%) rename patches/{unapplied => }/server/Add-Mob-Experience-reward-API.patch (100%) rename patches/{unapplied => }/server/Add-Moving-Piston-API.patch (100%) rename patches/{unapplied => }/server/Add-NamespacedKey-biome-methods.patch (100%) rename patches/{unapplied => }/server/Add-Player-Warden-Warning-API.patch (100%) rename patches/{unapplied => }/server/Add-Player-getFishHook.patch (100%) rename patches/{unapplied => }/server/Add-PlayerInventorySlotChangeEvent.patch (100%) create mode 100644 patches/server/Add-PlayerPickItemEvent.patch rename patches/{unapplied => }/server/Add-PlayerShieldDisableEvent.patch (100%) rename patches/{unapplied => }/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch (100%) rename patches/{unapplied => }/server/Add-PrePlayerAttackEntityEvent.patch (100%) rename patches/{unapplied => }/server/Add-Shearable-API.patch (100%) rename patches/{unapplied => }/server/Add-ShulkerDuplicateEvent.patch (100%) rename patches/{unapplied => }/server/Add-Sneaking-API-for-Entities.patch (100%) rename patches/{unapplied => }/server/Add-Structure-check-API.patch (100%) rename patches/{unapplied => }/server/Add-UUID-attribute-modifier-API.patch (100%) rename patches/{unapplied => }/server/Add-Velocity-IP-Forwarding-Support.patch (100%) rename patches/{unapplied => }/server/Add-WardenAngerChangeEvent.patch (100%) rename patches/{unapplied => }/server/Add-and-fix-missing-BlockFadeEvents.patch (100%) rename patches/{unapplied => }/server/Add-api-for-spawn-egg-texture-colors.patch (100%) rename patches/{unapplied => }/server/Add-config-for-mobs-immune-to-default-effects.patch (100%) rename patches/{unapplied => }/server/Add-config-option-for-spider-worldborder-climbing.patch (100%) rename patches/{unapplied => }/server/Add-drops-to-shear-events.patch (100%) rename patches/{unapplied => }/server/Add-entity-knockback-API.patch (100%) rename patches/{unapplied => }/server/Add-even-more-Enchantment-API.patch (100%) rename patches/{unapplied => }/server/Add-event-for-player-editing-sign.patch (100%) rename patches/{unapplied => }/server/Add-experience-points-API.patch (100%) rename patches/{unapplied => }/server/Add-fire-tick-delay-option.patch (100%) rename patches/{unapplied => }/server/Add-getChunkSnapshot-includeLightData-parameter.patch (100%) rename patches/{unapplied => }/server/Add-getDrops-to-BlockState.patch (100%) rename patches/{unapplied => }/server/Add-hand-to-fish-event-for-all-player-interactions.patch (100%) rename patches/{unapplied => }/server/Add-method-to-remove-all-active-potion-effects.patch (100%) rename patches/{unapplied => }/server/Add-missing-InventoryHolders-to-inventories.patch (100%) rename patches/{unapplied => }/server/Add-missing-SpigotConfig-logCommands-check.patch (100%) rename patches/{unapplied => }/server/Add-missing-fishing-event-state.patch (100%) rename patches/{unapplied => }/server/Add-missing-important-BlockStateListPopulator-method.patch (100%) rename patches/{unapplied => }/server/Add-missing-logs-for-log-ips-config-option.patch (100%) rename patches/{unapplied => }/server/Add-onboarding-message-for-initial-server-start.patch (100%) rename patches/{unapplied => }/server/Add-option-for-strict-advancement-dimension-checks.patch (100%) rename patches/{unapplied => }/server/Add-option-to-disable-block-updates.patch (100%) rename patches/{unapplied => }/server/Add-paper-dumplisteners-command.patch (100%) rename patches/{unapplied => }/server/Add-player-idle-duration-API.patch (100%) rename patches/{unapplied => }/server/Add-plugin-info-at-startup.patch (100%) rename patches/{unapplied => }/server/Add-predicate-for-blocks-when-raytracing.patch (100%) rename patches/{unapplied => }/server/Add-registry-entry-and-builders.patch (100%) rename patches/{unapplied => }/server/Add-skipping-world-symlink-scan.patch (100%) rename patches/{unapplied => }/server/Add-slot-sanity-checks-in-container-clicks.patch (100%) rename patches/{unapplied => }/server/Add-source-block-to-BlockPhysicsEvent.patch (100%) rename patches/{unapplied => }/server/Add-titleOverride-to-InventoryOpenEvent.patch (100%) rename patches/{unapplied => }/server/Add-transient-modifier-API.patch (100%) rename patches/{unapplied => }/server/Add-various-missing-EntityDropItemEvent-calls.patch (100%) rename patches/{unapplied => }/server/Add-whitelist-events.patch (100%) rename patches/{unapplied => }/server/Added-API-to-get-player-ha-proxy-address.patch (100%) rename patches/{unapplied => }/server/Added-byte-array-serialization-deserialization-for-P.patch (100%) rename patches/{unapplied => }/server/Adopt-MaterialRerouting.patch (100%) rename patches/{unapplied => }/server/Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch (100%) rename patches/{unapplied => }/server/Allow-Saving-of-Oversized-Chunks.patch (100%) rename patches/{unapplied => }/server/Allow-null-itemstack-for-Player-sendEquipmentChange.patch (100%) rename patches/{unapplied => }/server/Allow-proper-checking-of-empty-item-stacks.patch (100%) rename patches/{unapplied => }/server/Allow-trident-custom-damage.patch (100%) rename patches/{unapplied => }/server/Anti-Xray.patch (100%) rename patches/{unapplied => }/server/Avoid-Lazy-Initialization-for-Enum-Fields.patch (100%) rename patches/{unapplied => }/server/Bandaid-fix-for-Effect.patch (100%) rename patches/{unapplied => }/server/Block-Ticking-API.patch (100%) rename patches/{unapplied => }/server/Break-redstone-on-top-of-trap-doors-early.patch (100%) rename patches/{unapplied => }/server/Brigadier-based-command-API.patch (100%) rename patches/{unapplied => }/server/Broadcast-take-item-packets-with-collector-as-source.patch (100%) rename patches/{unapplied => }/server/Cache-map-ids-on-item-frames.patch (100%) rename patches/{unapplied => }/server/Call-BlockGrowEvent-for-missing-blocks.patch (100%) rename patches/{unapplied => }/server/Call-BlockRedstoneEvents-properly.patch (100%) rename patches/{unapplied => }/server/Call-missing-BlockDispenseEvent.patch (100%) rename patches/{unapplied => }/server/Check-distance-in-entity-interactions.patch (100%) rename patches/{unapplied => }/server/Check-for-block-type-in-SculkSensorBlock-canActivate.patch (100%) rename patches/{unapplied => }/server/Collision-API.patch (100%) rename patches/{unapplied => }/server/Configurable-Region-Compression-Format.patch (100%) rename patches/{unapplied => }/server/Configurable-Sand-Duping.patch (100%) rename patches/{unapplied => }/server/Configurable-chat-thread-limit.patch (100%) rename patches/{unapplied => }/server/Configurable-damage-tick-when-blocking-with-shield.patch (100%) rename patches/{unapplied => }/server/Configurable-entity-tracking-range-by-Y-coordinate.patch (100%) rename patches/{unapplied => }/server/Configurable-max-block-fluid-ticks.patch (100%) rename patches/{unapplied => }/server/Configuration-for-horizontal-only-item-merging.patch (100%) rename patches/{unapplied => }/server/Configure-sniffer-egg-hatch-time.patch (100%) rename patches/{unapplied => }/server/Correctly-handle-ArmorStand-invisibility.patch (100%) rename patches/{unapplied => }/server/Correctly-handle-interactions-with-items-on-cooldown.patch (100%) rename patches/{unapplied => }/server/Correctly-shrink-items-during-EntityResurrectEvent.patch (100%) rename patches/{unapplied => }/server/Custom-Chat-Completion-Suggestions-API.patch (100%) rename patches/{unapplied => }/server/Deep-clone-nbt-tags-in-PDC.patch (100%) rename patches/{unapplied => }/server/Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch (100%) rename patches/{unapplied => }/server/Deprecate-ItemStack-setType.patch (100%) rename patches/{unapplied => }/server/Deprecate-and-replace-methods-with-old-StructureType.patch (100%) rename patches/{unapplied => }/server/Detect-headless-JREs.patch (100%) rename patches/{unapplied => }/server/Determine-lava-and-water-fluid-explosion-resistance-.patch (100%) rename patches/{unapplied => }/server/Disable-component-selector-resolving-in-books-by-def.patch (100%) rename patches/{unapplied => }/server/Disable-memory-reserve-allocating.patch (100%) rename patches/{unapplied => }/server/Do-crystal-portal-proximity-check-before-entity-look.patch (100%) rename patches/{unapplied => }/server/Do-not-read-tile-entities-in-chunks-that-are-positio.patch (100%) rename patches/{unapplied => }/server/Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch (100%) rename patches/{unapplied => }/server/Don-t-broadcast-messages-to-command-blocks.patch (100%) rename patches/{unapplied => }/server/Don-t-check-if-we-can-see-non-visible-entities.patch (100%) rename patches/{unapplied => }/server/Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch (100%) rename patches/{unapplied => }/server/Don-t-fire-sync-events-during-worldgen.patch (100%) rename patches/{unapplied => }/server/Don-t-load-chunks-for-supporting-block-checks.patch (100%) rename patches/{unapplied => }/server/Don-t-tab-complete-namespaced-commands-if-send-names.patch (100%) rename patches/{unapplied => }/server/Don-t-use-level-random-in-entity-constructors.patch (100%) rename patches/{unapplied => }/server/Dont-resend-blocks-on-interactions.patch (100%) rename patches/{unapplied => }/server/Dont-resent-entity-on-art-update.patch (100%) rename patches/{unapplied => }/server/Elder-Guardian-appearance-API.patch (100%) rename patches/{unapplied => }/server/Entity-Activation-Range-2.0.patch (100%) rename patches/{unapplied => }/server/EntityPickupItemEvent-fixes.patch (100%) rename patches/{unapplied => }/server/Expand-LingeringPotion-API.patch (100%) rename patches/{unapplied => }/server/Expand-PlayerItemMendEvent.patch (100%) rename patches/{unapplied => }/server/Expand-Pose-API.patch (100%) rename patches/{unapplied => }/server/Expanded-Hopper-API.patch (100%) rename patches/{unapplied => }/server/ExperienceOrb-should-call-EntitySpawnEvent.patch (100%) rename patches/{unapplied => }/server/Expose-LootTable-of-DecoratedPot.patch (100%) rename patches/{unapplied => }/server/Expose-hand-in-BlockCanBuildEvent.patch (100%) rename patches/{unapplied => }/server/Expose-hasColor-to-leather-armor.patch (100%) rename patches/{unapplied => }/server/Expose-pre-collision-moving-velocity-to-VehicleBlock.patch (100%) rename patches/{unapplied => }/server/Fire-EntityChangeBlockEvent-in-more-places.patch (100%) rename patches/{unapplied => }/server/Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch (100%) rename patches/{unapplied => }/server/Fire-entity-death-event-for-ender-dragon.patch (100%) rename patches/{unapplied => }/server/Fix-BanList-API.patch (100%) rename patches/{unapplied => }/server/Fix-Bee-flower-NPE.patch (100%) rename patches/{unapplied => }/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch (100%) rename patches/{unapplied => }/server/Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch (100%) rename patches/{unapplied => }/server/Fix-DamageSource-API.patch (100%) rename patches/{unapplied => }/server/Fix-EntityArgument-and-EntitySelectorParser-permissi.patch (100%) rename patches/{unapplied => }/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch (100%) rename patches/{unapplied => }/server/Fix-HumanEntity-drop-not-updating-the-client-inv.patch (100%) rename patches/{unapplied => }/server/Fix-ItemFlags.patch (100%) rename patches/{unapplied => }/server/Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch (88%) rename patches/{unapplied => }/server/Fix-NPE-for-Jukebox-setRecord.patch (100%) rename patches/{unapplied => }/server/Fix-NPE-in-AdvancementProgress-getDateAwarded.patch (100%) rename patches/{unapplied => }/server/Fix-NPE-in-SculkBloomEvent-world-access.patch (100%) rename patches/{unapplied => }/server/Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch (100%) rename patches/{unapplied => }/server/Fix-NPE-on-Boat-getStatus.patch (100%) rename patches/{unapplied => }/server/Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch (100%) rename patches/{unapplied => }/server/Fix-PickupStatus-getting-reset.patch (100%) rename patches/{unapplied => }/server/Fix-SpawnEggMeta-get-setSpawnedType.patch (100%) rename patches/{unapplied => }/server/Fix-UnsafeValues-loadAdvancement.patch (100%) rename patches/{unapplied => }/server/Fix-a-bunch-of-vanilla-bugs.patch (98%) 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-async-entity-add-due-to-fungus-trees.patch (100%) rename patches/{unapplied => }/server/Fix-bees-aging-inside-hives.patch (100%) rename patches/{unapplied => }/server/Fix-block-place-logic.patch (100%) rename patches/{unapplied => }/server/Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch (95%) rename patches/{unapplied => }/server/Fix-cmd-permission-levels-for-command-blocks.patch (100%) rename patches/{unapplied => }/server/Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch (100%) rename patches/{unapplied => }/server/Fix-creation-of-invalid-block-entity-during-world-ge.patch (100%) rename patches/{unapplied => }/server/Fix-custom-piglin-loved-items.patch (100%) rename patches/{unapplied => }/server/Fix-custom-statistic-criteria-creation.patch (100%) rename patches/{unapplied => }/server/Fix-damage-modifier-inconsistencies.patch (100%) rename patches/{unapplied => }/server/Fix-demo-flag-not-enabling-demo-mode.patch (100%) rename patches/{unapplied => }/server/Fix-entity-type-tags-suggestions-in-selectors.patch (100%) rename patches/{unapplied => }/server/Fix-equipment-slot-and-group-API.patch (100%) rename patches/{unapplied => }/server/Fix-force-opening-enchantment-tables.patch (100%) rename patches/{unapplied => }/server/Fix-inventories-returning-null-Locations.patch (100%) rename patches/{unapplied => }/server/Fix-issues-with-Recipe-API.patch (98%) rename patches/{unapplied => }/server/Fix-missing-event-call-for-entity-teleport-API.patch (100%) rename patches/{unapplied => }/server/Fix-missing-map-initialize-event-call.patch (100%) rename patches/{unapplied => }/server/Fix-plugin-loggers-on-server-shutdown.patch (100%) rename patches/{unapplied => }/server/Fix-possible-NPE-on-painting-creation.patch (100%) rename patches/{unapplied => }/server/Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch (100%) rename patches/{unapplied => }/server/Fix-premature-player-kicks-on-shutdown.patch (100%) rename patches/{unapplied => }/server/Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch (100%) rename patches/{unapplied => }/server/Fix-removing-recipes-from-RecipeIterator.patch (100%) rename patches/{unapplied => }/server/Fix-rotation-when-spawning-display-entities.patch (100%) rename patches/{unapplied => }/server/Fix-sending-disconnect-packet-in-phases-where-it-doe.patch (100%) rename patches/{unapplied => }/server/Fix-several-issues-with-EntityBreedEvent.patch (100%) rename patches/{unapplied => }/server/Fix-shield-disable-inconsistency.patch (100%) rename patches/{unapplied => }/server/Fix-silent-equipment-change-for-mobs.patch (100%) rename patches/{unapplied => }/server/Fix-slot-desync.patch (91%) rename patches/{unapplied => }/server/Fix-sniffer-removeExploredLocation.patch (100%) rename patches/{unapplied => }/server/Fix-spigot-s-Forced-Stats.patch (100%) rename patches/{unapplied => }/server/Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch (100%) rename patches/{unapplied => }/server/Fix-strikeLightningEffect-powers-lightning-rods-and-.patch (100%) rename patches/{unapplied => }/server/Fix-suggest-command-message-for-brigadier-syntax-exc.patch (100%) rename patches/{unapplied => }/server/Fix-team-sidebar-objectives-not-being-cleared.patch (100%) rename patches/{unapplied => }/server/Fix-text-display-error-on-spawn.patch (100%) rename patches/{unapplied => }/server/Fixup-NamespacedKey-handling.patch (100%) rename patches/{unapplied => }/server/Flat-bedrock-generator-settings.patch (100%) rename patches/{unapplied => }/server/Flying-Fall-Damage.patch (96%) rename patches/{unapplied => }/server/Folia-scheduler-and-owned-region-API.patch (100%) rename patches/{unapplied => }/server/Friction-API.patch (100%) rename patches/{unapplied => }/server/General-ItemMeta-fixes.patch (99%) rename patches/{unapplied => }/server/Handle-Large-Packets-disconnecting-client.patch (100%) rename patches/{unapplied => }/server/Handle-Oversized-block-entities-in-chunks.patch (100%) rename patches/{unapplied => }/server/Ignore-impossible-spawn-tick.patch (100%) rename patches/{unapplied => }/server/Implement-OfflinePlayer-isConnected.patch (100%) rename patches/{unapplied => }/server/Implement-PlayerFailMoveEvent.patch (100%) rename patches/{unapplied => }/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch (100%) rename patches/{unapplied => }/server/Improve-PortalEvents.patch (100%) rename patches/{unapplied => }/server/Improve-Registry.patch (100%) rename patches/{unapplied => }/server/Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch (100%) rename patches/{unapplied => }/server/Improve-logging-and-errors.patch (100%) rename patches/{unapplied => }/server/Improve-tag-parser-handling.patch (100%) rename patches/{unapplied => }/server/Item-Mutation-Fixes.patch (100%) rename patches/{unapplied => }/server/ItemStack-Tooltip-API.patch (100%) rename patches/{unapplied => }/server/ItemStack-damage-API.patch (100%) rename patches/{unapplied => }/server/Lazily-create-LootContext-for-criterions.patch (100%) rename patches/{unapplied => }/server/Leashable-API.patch (98%) rename patches/{unapplied => }/server/Limit-pet-look-distance.patch (100%) rename patches/{unapplied => }/server/Make-Amethyst-throw-both-Spread-and-Grow-Events.patch (100%) rename patches/{unapplied => }/server/Make-a-PDC-view-accessible-directly-from-ItemStack.patch (100%) rename patches/{unapplied => }/server/Make-interaction-leniency-distance-configurable.patch (71%) rename patches/{unapplied => }/server/Missing-eating-regain-reason.patch (100%) rename patches/{unapplied => }/server/Missing-effect-cause.patch (100%) rename patches/{unapplied => }/server/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch (100%) rename patches/{unapplied => }/server/More-Chest-Block-API.patch (100%) rename patches/{unapplied => }/server/More-DragonBattle-API.patch (100%) rename patches/{unapplied => }/server/More-Raid-API.patch (100%) rename patches/{unapplied => }/server/More-Sign-Block-API.patch (100%) rename patches/{unapplied => }/server/More-Teleport-API.patch (100%) rename patches/{unapplied => }/server/More-accurate-isInOpenWater-impl.patch (100%) rename patches/{unapplied => }/server/More-vanilla-friendly-methods-to-update-trades.patch (100%) rename patches/{unapplied => }/server/Nameable-Banner-API.patch (100%) rename patches/{unapplied => }/server/Only-call-EntityDamageEvents-before-actuallyHurt.patch (100%) rename patches/{unapplied => }/server/Only-capture-actual-tree-growth.patch (100%) rename patches/{unapplied => }/server/Only-erase-allay-memory-on-non-item-targets.patch (100%) rename patches/{unapplied => }/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch (100%) rename patches/{unapplied => }/server/Only-tick-item-frames-if-players-can-see-it.patch (100%) rename patches/{unapplied => }/server/Optimize-Bit-Operations-by-inlining.patch (100%) rename patches/{unapplied => }/server/Optimize-Collision-to-not-load-chunks.patch (100%) rename patches/{unapplied => }/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch (100%) rename patches/{unapplied => }/server/Optimize-Hoppers.patch (100%) rename patches/{unapplied => }/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch (100%) rename patches/{unapplied => }/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch (100%) rename patches/{unapplied => }/server/Optimize-VarInts.patch (100%) rename patches/{unapplied => }/server/Optimize-Voxel-Shape-Merging.patch (100%) rename patches/{unapplied => }/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch (100%) rename patches/{unapplied => }/server/Optimize-nearest-structure-border-iteration.patch (100%) rename patches/{unapplied => }/server/Optimize-player-lookups-for-beacons.patch (100%) rename patches/{unapplied => }/server/Per-world-ticks-per-spawn-settings.patch (100%) rename patches/{unapplied => }/server/Player-Entity-Tracking-Events.patch (100%) rename patches/{unapplied => }/server/Prevent-GameEvents-being-fired-from-unloaded-chunks.patch (100%) rename patches/{unapplied => }/server/Prevent-NPE-if-hooked-entity-was-cleared.patch (100%) rename patches/{unapplied => }/server/Prevent-causing-expired-keys-from-impacting-new-join.patch (100%) rename patches/{unapplied => }/server/Prevent-empty-items-from-being-added-to-world.patch (100%) rename patches/{unapplied => }/server/Prevent-entity-loading-causing-async-lookups.patch (100%) rename patches/{unapplied => }/server/Prevent-sending-oversized-item-data-in-equipment-and.patch (96%) rename patches/{unapplied => }/server/Print-data-component-type-on-encoding-error.patch (100%) rename patches/{unapplied => }/server/Prioritize-Minecraft-commands-in-function-parsing-an.patch (100%) rename patches/{unapplied => }/server/Properly-handle-BlockBreakEvent-isDropItems.patch (100%) rename patches/{unapplied => }/server/Properly-handle-experience-dropping-on-block-break.patch (100%) rename patches/{unapplied => }/server/Properly-remove-the-experimental-smithing-inventory-.patch (100%) rename patches/{unapplied => }/server/Properly-resend-entities.patch (95%) rename patches/{unapplied => }/server/Properly-track-the-changed-item-from-dispense-events.patch (100%) rename patches/{unapplied => }/server/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch (100%) rename patches/{unapplied => }/server/Proxy-ItemStack-to-CraftItemStack.patch (100%) rename patches/{unapplied => }/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch (100%) rename patches/{unapplied => }/server/Refresh-ProjectileSource-for-projectiles.patch (100%) rename patches/{unapplied => }/server/Registry-Modification-API.patch (99%) rename patches/{unapplied => }/server/Remove-CraftItemStack-setAmount-null-assignment.patch (100%) rename patches/{unapplied => }/server/Remove-UpgradeData-neighbour-ticks-outside-of-range.patch (100%) rename patches/{unapplied => }/server/Remove-streams-from-hot-code.patch (100%) rename patches/{unapplied => }/server/Remove-unnecessary-onTrackingStart-during-navigation.patch (100%) rename patches/{unapplied => }/server/Respect-randomizeData-on-more-entities-when-spawning.patch (100%) rename patches/{unapplied => }/server/Restore-vanilla-entity-drops-behavior.patch (100%) rename patches/{unapplied => }/server/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch (100%) rename patches/{unapplied => }/server/Sanitize-sent-BlockEntity-NBT.patch (100%) rename patches/{unapplied => }/server/SculkCatalyst-bloom-API.patch (100%) rename patches/{unapplied => }/server/Send-block-entities-after-destroy-prediction.patch (90%) rename patches/{unapplied => }/server/Skip-POI-finding-if-stuck-in-vehicle.patch (100%) rename patches/{unapplied => }/server/Stop-large-look-changes-from-crashing-the-server.patch (100%) rename patches/{unapplied => }/server/Support-old-UUID-format-for-NBT.patch (100%) rename patches/{unapplied => }/server/Suspicious-Effect-Entry-API.patch (100%) rename patches/{unapplied => }/server/Sync-offhand-slot-in-menus.patch (100%) rename patches/{unapplied => }/server/Throw-exception-on-world-create-while-being-ticked.patch (100%) rename patches/{unapplied => }/server/Treat-sequence-violations-like-they-should-be.patch (100%) rename patches/{unapplied => }/server/Update-entity-data-when-attaching-firework-to-entity.patch (100%) rename patches/{unapplied => }/server/Use-Velocity-compression-and-cipher-natives.patch (99%) rename patches/{unapplied => }/server/Use-array-for-gamerule-storage.patch (100%) rename patches/{unapplied => }/server/Use-correct-seed-on-api-world-load.patch (100%) rename patches/{unapplied => }/server/Use-correct-source-for-mushroom-block-spread-event.patch (100%) rename patches/{unapplied => }/server/Use-single-player-info-update-packet-on-join.patch (100%) rename patches/{unapplied => }/server/Validate-ResourceLocation-in-NBT-reading.patch (97%) rename patches/{unapplied => }/server/Warn-on-plugins-accessing-faraway-chunks.patch (100%) rename patches/{unapplied => }/server/Win-Screen-API.patch (100%) rename patches/{unapplied => }/server/add-more-scoreboard-API.patch (100%) rename patches/{unapplied => }/server/add-number-format-api.patch (100%) rename patches/{unapplied => }/server/check-global-player-list-where-appropriate.patch (100%) rename patches/{unapplied => }/server/check-if-itemstack-is-stackable-first.patch (100%) rename patches/{unapplied => }/server/config-for-disabling-entity-tag-tags.patch (82%) rename patches/{unapplied => }/server/disable-forced-empty-world-ticks.patch (100%) rename patches/{unapplied => }/server/ensure-reset-EnderDragon-boss-event-name.patch (100%) rename patches/{unapplied => }/server/fix-Instruments.patch (100%) rename patches/{unapplied => }/server/fix-Jigsaw-block-kicking-user.patch (100%) rename patches/{unapplied => }/server/fix-MapLike-spam-for-missing-key-selector.patch (100%) rename patches/{unapplied => }/server/fix-entity-vehicle-collision-event-not-called.patch (100%) rename patches/{unapplied => }/server/fix-horse-inventories.patch (100%) rename patches/{unapplied => }/server/fix-item-meta-for-tadpole-buckets.patch (100%) rename patches/{unapplied => }/server/improve-BanList-types.patch (100%) rename patches/{unapplied => }/server/improve-checking-handled-tags-in-itemmeta.patch (100%) rename patches/{unapplied => }/server/optimize-dirt-and-snow-spreading.patch (90%) rename patches/{unapplied => }/server/use-BlockFormEvent-for-mud-converting-into-clay.patch (100%) delete mode 100644 patches/unapplied/server/Add-PlayerPickItemEvent.patch diff --git a/patches/unapplied/server/API-for-an-entity-s-scoreboard-name.patch b/patches/server/API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/unapplied/server/API-for-an-entity-s-scoreboard-name.patch rename to patches/server/API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/unapplied/server/API-for-updating-recipes-on-clients.patch b/patches/server/API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/unapplied/server/API-for-updating-recipes-on-clients.patch rename to patches/server/API-for-updating-recipes-on-clients.patch diff --git a/patches/unapplied/server/Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/unapplied/server/Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/unapplied/server/Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/server/Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch similarity index 100% rename from patches/unapplied/server/Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch rename to patches/server/Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch diff --git a/patches/unapplied/server/Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/unapplied/server/Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/server/Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/unapplied/server/Add-BlockBreakProgressUpdateEvent.patch b/patches/server/Add-BlockBreakProgressUpdateEvent.patch similarity index 100% rename from patches/unapplied/server/Add-BlockBreakProgressUpdateEvent.patch rename to patches/server/Add-BlockBreakProgressUpdateEvent.patch diff --git a/patches/unapplied/server/Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/Add-BlockFace-to-BlockDamageEvent.patch similarity index 100% rename from patches/unapplied/server/Add-BlockFace-to-BlockDamageEvent.patch rename to patches/server/Add-BlockFace-to-BlockDamageEvent.patch diff --git a/patches/unapplied/server/Add-BlockLockCheckEvent.patch b/patches/server/Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/unapplied/server/Add-BlockLockCheckEvent.patch rename to patches/server/Add-BlockLockCheckEvent.patch diff --git a/patches/unapplied/server/Add-CartographyItemEvent.patch b/patches/server/Add-CartographyItemEvent.patch similarity index 100% rename from patches/unapplied/server/Add-CartographyItemEvent.patch rename to patches/server/Add-CartographyItemEvent.patch 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-EntityPortalReadyEvent.patch b/patches/server/Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/unapplied/server/Add-EntityPortalReadyEvent.patch rename to patches/server/Add-EntityPortalReadyEvent.patch diff --git a/patches/unapplied/server/Add-EntityToggleSitEvent.patch b/patches/server/Add-EntityToggleSitEvent.patch similarity index 100% rename from patches/unapplied/server/Add-EntityToggleSitEvent.patch rename to patches/server/Add-EntityToggleSitEvent.patch diff --git a/patches/unapplied/server/Add-FluidState-API.patch b/patches/server/Add-FluidState-API.patch similarity index 100% rename from patches/unapplied/server/Add-FluidState-API.patch rename to patches/server/Add-FluidState-API.patch diff --git a/patches/unapplied/server/Add-ItemType-getItemRarity.patch b/patches/server/Add-ItemType-getItemRarity.patch similarity index 100% rename from patches/unapplied/server/Add-ItemType-getItemRarity.patch rename to patches/server/Add-ItemType-getItemRarity.patch diff --git a/patches/unapplied/server/Add-Lifecycle-Event-system.patch b/patches/server/Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/unapplied/server/Add-Lifecycle-Event-system.patch rename to patches/server/Add-Lifecycle-Event-system.patch diff --git a/patches/unapplied/server/Add-Listing-API-for-Player.patch b/patches/server/Add-Listing-API-for-Player.patch similarity index 100% rename from patches/unapplied/server/Add-Listing-API-for-Player.patch rename to patches/server/Add-Listing-API-for-Player.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-Moving-Piston-API.patch b/patches/server/Add-Moving-Piston-API.patch similarity index 100% rename from patches/unapplied/server/Add-Moving-Piston-API.patch rename to patches/server/Add-Moving-Piston-API.patch diff --git a/patches/unapplied/server/Add-NamespacedKey-biome-methods.patch b/patches/server/Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/unapplied/server/Add-NamespacedKey-biome-methods.patch rename to patches/server/Add-NamespacedKey-biome-methods.patch diff --git a/patches/unapplied/server/Add-Player-Warden-Warning-API.patch b/patches/server/Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/unapplied/server/Add-Player-Warden-Warning-API.patch rename to patches/server/Add-Player-Warden-Warning-API.patch diff --git a/patches/unapplied/server/Add-Player-getFishHook.patch b/patches/server/Add-Player-getFishHook.patch similarity index 100% rename from patches/unapplied/server/Add-Player-getFishHook.patch rename to patches/server/Add-Player-getFishHook.patch diff --git a/patches/unapplied/server/Add-PlayerInventorySlotChangeEvent.patch b/patches/server/Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/unapplied/server/Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/Add-PlayerPickItemEvent.patch b/patches/server/Add-PlayerPickItemEvent.patch new file mode 100644 index 0000000000..c13e60ced6 --- /dev/null +++ b/patches/server/Add-PlayerPickItemEvent.patch @@ -0,0 +1,68 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: RodneyMKay <36546810+RodneyMKay@users.noreply.github.com> +Date: Wed, 8 Sep 2021 21:34:01 +0200 +Subject: [PATCH] Add PlayerPickItemEvent + + +diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +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 extends ServerCommonPacketListenerImpl + if (stack.isItemEnabled(this.player.level().enabledFeatures())) { + Inventory playerinventory = this.player.getInventory(); + int i = playerinventory.findSlotMatchingItem(stack); ++ // Paper start - Add PlayerPickItemEvent ++ final int sourceSlot = i; ++ final int targetSlot = Inventory.isHotbarSlot(sourceSlot) ? sourceSlot : playerinventory.getSuitableHotbarSlot(); ++ final Player bukkitPlayer = this.player.getBukkitEntity(); ++ final io.papermc.paper.event.player.PlayerPickItemEvent event = new io.papermc.paper.event.player.PlayerPickItemEvent(bukkitPlayer, targetSlot, sourceSlot); ++ if (!event.callEvent()) { ++ return; ++ } ++ // Paper end - Add PlayerPickItemEvent + + if (i != -1) { + if (Inventory.isHotbarSlot(i)) { +- playerinventory.selected = i; ++ playerinventory.selected = event.getTargetSlot(); // Paper - Add target slot + } else { +- playerinventory.pickSlot(i); ++ playerinventory.pickSlot(i, event.getTargetSlot()); // Paper - Add target slot + } + } else if (this.player.hasInfiniteMaterials()) { +- playerinventory.addAndPickItem(stack); ++ playerinventory.addAndPickItem(stack, event.getTargetSlot()); // Paper - Add target slot + } + + this.player.connection.send(new ClientboundSetHeldSlotPacket(playerinventory.selected)); +diff --git a/src/main/java/net/minecraft/world/entity/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/world/entity/player/Inventory.java ++++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java +@@ -0,0 +0,0 @@ public class Inventory implements Container, Nameable { + return -1; + } + +- public void addAndPickItem(ItemStack stack) { +- this.selected = this.getSuitableHotbarSlot(); ++ // Paper start - Add PlayerPickItemEvent ++ public void addAndPickItem(ItemStack stack, final int targetSlot) { ++ this.selected = targetSlot; ++ // Paper end - Add PlayerPickItemEvent + if (!((ItemStack) this.items.get(this.selected)).isEmpty()) { + int i = this.getFreeSlot(); + +@@ -0,0 +0,0 @@ public class Inventory implements Container, Nameable { + this.items.set(this.selected, stack); + } + +- public void pickSlot(int slot) { +- this.selected = this.getSuitableHotbarSlot(); ++ // Paper start - Add PlayerPickItemEvent ++ public void pickSlot(int slot, final int targetSlot) { ++ this.selected = targetSlot; ++ // Paper end - Add PlayerPickItemEvent + ItemStack itemstack = (ItemStack) this.items.get(this.selected); + + this.items.set(this.selected, (ItemStack) this.items.get(slot)); diff --git a/patches/unapplied/server/Add-PlayerShieldDisableEvent.patch b/patches/server/Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/unapplied/server/Add-PlayerShieldDisableEvent.patch rename to patches/server/Add-PlayerShieldDisableEvent.patch diff --git a/patches/unapplied/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/unapplied/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/unapplied/server/Add-PrePlayerAttackEntityEvent.patch b/patches/server/Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/unapplied/server/Add-PrePlayerAttackEntityEvent.patch rename to patches/server/Add-PrePlayerAttackEntityEvent.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-ShulkerDuplicateEvent.patch b/patches/server/Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/unapplied/server/Add-ShulkerDuplicateEvent.patch rename to patches/server/Add-ShulkerDuplicateEvent.patch diff --git a/patches/unapplied/server/Add-Sneaking-API-for-Entities.patch b/patches/server/Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/unapplied/server/Add-Sneaking-API-for-Entities.patch rename to patches/server/Add-Sneaking-API-for-Entities.patch diff --git a/patches/unapplied/server/Add-Structure-check-API.patch b/patches/server/Add-Structure-check-API.patch similarity index 100% rename from patches/unapplied/server/Add-Structure-check-API.patch rename to patches/server/Add-Structure-check-API.patch diff --git a/patches/unapplied/server/Add-UUID-attribute-modifier-API.patch b/patches/server/Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/unapplied/server/Add-UUID-attribute-modifier-API.patch rename to patches/server/Add-UUID-attribute-modifier-API.patch diff --git a/patches/unapplied/server/Add-Velocity-IP-Forwarding-Support.patch b/patches/server/Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/unapplied/server/Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/unapplied/server/Add-WardenAngerChangeEvent.patch b/patches/server/Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/unapplied/server/Add-WardenAngerChangeEvent.patch rename to patches/server/Add-WardenAngerChangeEvent.patch diff --git a/patches/unapplied/server/Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/Add-and-fix-missing-BlockFadeEvents.patch similarity index 100% rename from patches/unapplied/server/Add-and-fix-missing-BlockFadeEvents.patch rename to patches/server/Add-and-fix-missing-BlockFadeEvents.patch diff --git a/patches/unapplied/server/Add-api-for-spawn-egg-texture-colors.patch b/patches/server/Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/unapplied/server/Add-api-for-spawn-egg-texture-colors.patch rename to patches/server/Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/unapplied/server/Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/unapplied/server/Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/unapplied/server/Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/unapplied/server/Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/unapplied/server/Add-drops-to-shear-events.patch b/patches/server/Add-drops-to-shear-events.patch similarity index 100% rename from patches/unapplied/server/Add-drops-to-shear-events.patch rename to patches/server/Add-drops-to-shear-events.patch diff --git a/patches/unapplied/server/Add-entity-knockback-API.patch b/patches/server/Add-entity-knockback-API.patch similarity index 100% rename from patches/unapplied/server/Add-entity-knockback-API.patch rename to patches/server/Add-entity-knockback-API.patch diff --git a/patches/unapplied/server/Add-even-more-Enchantment-API.patch b/patches/server/Add-even-more-Enchantment-API.patch similarity index 100% rename from patches/unapplied/server/Add-even-more-Enchantment-API.patch rename to patches/server/Add-even-more-Enchantment-API.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 100% rename from patches/unapplied/server/Add-event-for-player-editing-sign.patch rename to patches/server/Add-event-for-player-editing-sign.patch diff --git a/patches/unapplied/server/Add-experience-points-API.patch b/patches/server/Add-experience-points-API.patch similarity index 100% rename from patches/unapplied/server/Add-experience-points-API.patch rename to patches/server/Add-experience-points-API.patch diff --git a/patches/unapplied/server/Add-fire-tick-delay-option.patch b/patches/server/Add-fire-tick-delay-option.patch similarity index 100% rename from patches/unapplied/server/Add-fire-tick-delay-option.patch rename to patches/server/Add-fire-tick-delay-option.patch diff --git a/patches/unapplied/server/Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/unapplied/server/Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/server/Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/unapplied/server/Add-getDrops-to-BlockState.patch b/patches/server/Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/unapplied/server/Add-getDrops-to-BlockState.patch rename to patches/server/Add-getDrops-to-BlockState.patch diff --git a/patches/unapplied/server/Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/unapplied/server/Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/server/Add-hand-to-fish-event-for-all-player-interactions.patch 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-missing-InventoryHolders-to-inventories.patch b/patches/server/Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/unapplied/server/Add-missing-InventoryHolders-to-inventories.patch rename to patches/server/Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/unapplied/server/Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/unapplied/server/Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/unapplied/server/Add-missing-fishing-event-state.patch b/patches/server/Add-missing-fishing-event-state.patch similarity index 100% rename from patches/unapplied/server/Add-missing-fishing-event-state.patch rename to patches/server/Add-missing-fishing-event-state.patch diff --git a/patches/unapplied/server/Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/unapplied/server/Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/unapplied/server/Add-missing-logs-for-log-ips-config-option.patch b/patches/server/Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/unapplied/server/Add-missing-logs-for-log-ips-config-option.patch rename to patches/server/Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/unapplied/server/Add-onboarding-message-for-initial-server-start.patch b/patches/server/Add-onboarding-message-for-initial-server-start.patch similarity index 100% rename from patches/unapplied/server/Add-onboarding-message-for-initial-server-start.patch rename to patches/server/Add-onboarding-message-for-initial-server-start.patch diff --git a/patches/unapplied/server/Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/unapplied/server/Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/Add-option-for-strict-advancement-dimension-checks.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-paper-dumplisteners-command.patch b/patches/server/Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/unapplied/server/Add-paper-dumplisteners-command.patch rename to patches/server/Add-paper-dumplisteners-command.patch diff --git a/patches/unapplied/server/Add-player-idle-duration-API.patch b/patches/server/Add-player-idle-duration-API.patch similarity index 100% rename from patches/unapplied/server/Add-player-idle-duration-API.patch rename to patches/server/Add-player-idle-duration-API.patch diff --git a/patches/unapplied/server/Add-plugin-info-at-startup.patch b/patches/server/Add-plugin-info-at-startup.patch similarity index 100% rename from patches/unapplied/server/Add-plugin-info-at-startup.patch rename to patches/server/Add-plugin-info-at-startup.patch diff --git a/patches/unapplied/server/Add-predicate-for-blocks-when-raytracing.patch b/patches/server/Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/unapplied/server/Add-predicate-for-blocks-when-raytracing.patch rename to patches/server/Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/unapplied/server/Add-registry-entry-and-builders.patch b/patches/server/Add-registry-entry-and-builders.patch similarity index 100% rename from patches/unapplied/server/Add-registry-entry-and-builders.patch rename to patches/server/Add-registry-entry-and-builders.patch diff --git a/patches/unapplied/server/Add-skipping-world-symlink-scan.patch b/patches/server/Add-skipping-world-symlink-scan.patch similarity index 100% rename from patches/unapplied/server/Add-skipping-world-symlink-scan.patch rename to patches/server/Add-skipping-world-symlink-scan.patch diff --git a/patches/unapplied/server/Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/Add-slot-sanity-checks-in-container-clicks.patch similarity index 100% rename from patches/unapplied/server/Add-slot-sanity-checks-in-container-clicks.patch rename to patches/server/Add-slot-sanity-checks-in-container-clicks.patch diff --git a/patches/unapplied/server/Add-source-block-to-BlockPhysicsEvent.patch b/patches/server/Add-source-block-to-BlockPhysicsEvent.patch similarity index 100% rename from patches/unapplied/server/Add-source-block-to-BlockPhysicsEvent.patch rename to patches/server/Add-source-block-to-BlockPhysicsEvent.patch diff --git a/patches/unapplied/server/Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/unapplied/server/Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/server/Add-titleOverride-to-InventoryOpenEvent.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/Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/unapplied/server/Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/unapplied/server/Add-whitelist-events.patch b/patches/server/Add-whitelist-events.patch similarity index 100% rename from patches/unapplied/server/Add-whitelist-events.patch rename to patches/server/Add-whitelist-events.patch diff --git a/patches/unapplied/server/Added-API-to-get-player-ha-proxy-address.patch b/patches/server/Added-API-to-get-player-ha-proxy-address.patch similarity index 100% rename from patches/unapplied/server/Added-API-to-get-player-ha-proxy-address.patch rename to patches/server/Added-API-to-get-player-ha-proxy-address.patch diff --git a/patches/unapplied/server/Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/unapplied/server/Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/unapplied/server/Adopt-MaterialRerouting.patch b/patches/server/Adopt-MaterialRerouting.patch similarity index 100% rename from patches/unapplied/server/Adopt-MaterialRerouting.patch rename to patches/server/Adopt-MaterialRerouting.patch diff --git a/patches/unapplied/server/Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch similarity index 100% rename from patches/unapplied/server/Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch rename to patches/server/Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch diff --git a/patches/unapplied/server/Allow-Saving-of-Oversized-Chunks.patch b/patches/server/Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/unapplied/server/Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/unapplied/server/Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 100% rename from patches/unapplied/server/Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/server/Allow-null-itemstack-for-Player-sendEquipmentChange.patch diff --git a/patches/unapplied/server/Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/unapplied/server/Allow-proper-checking-of-empty-item-stacks.patch rename to patches/server/Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/unapplied/server/Allow-trident-custom-damage.patch b/patches/server/Allow-trident-custom-damage.patch similarity index 100% rename from patches/unapplied/server/Allow-trident-custom-damage.patch rename to patches/server/Allow-trident-custom-damage.patch diff --git a/patches/unapplied/server/Anti-Xray.patch b/patches/server/Anti-Xray.patch similarity index 100% rename from patches/unapplied/server/Anti-Xray.patch rename to patches/server/Anti-Xray.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/Bandaid-fix-for-Effect.patch b/patches/server/Bandaid-fix-for-Effect.patch similarity index 100% rename from patches/unapplied/server/Bandaid-fix-for-Effect.patch rename to patches/server/Bandaid-fix-for-Effect.patch diff --git a/patches/unapplied/server/Block-Ticking-API.patch b/patches/server/Block-Ticking-API.patch similarity index 100% rename from patches/unapplied/server/Block-Ticking-API.patch rename to patches/server/Block-Ticking-API.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/Brigadier-based-command-API.patch b/patches/server/Brigadier-based-command-API.patch similarity index 100% rename from patches/unapplied/server/Brigadier-based-command-API.patch rename to patches/server/Brigadier-based-command-API.patch diff --git a/patches/unapplied/server/Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/Broadcast-take-item-packets-with-collector-as-source.patch similarity index 100% rename from patches/unapplied/server/Broadcast-take-item-packets-with-collector-as-source.patch rename to patches/server/Broadcast-take-item-packets-with-collector-as-source.patch diff --git a/patches/unapplied/server/Cache-map-ids-on-item-frames.patch b/patches/server/Cache-map-ids-on-item-frames.patch similarity index 100% rename from patches/unapplied/server/Cache-map-ids-on-item-frames.patch rename to patches/server/Cache-map-ids-on-item-frames.patch diff --git a/patches/unapplied/server/Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/unapplied/server/Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/unapplied/server/Call-BlockRedstoneEvents-properly.patch b/patches/server/Call-BlockRedstoneEvents-properly.patch similarity index 100% rename from patches/unapplied/server/Call-BlockRedstoneEvents-properly.patch rename to patches/server/Call-BlockRedstoneEvents-properly.patch 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/Check-distance-in-entity-interactions.patch b/patches/server/Check-distance-in-entity-interactions.patch similarity index 100% rename from patches/unapplied/server/Check-distance-in-entity-interactions.patch rename to patches/server/Check-distance-in-entity-interactions.patch diff --git a/patches/unapplied/server/Check-for-block-type-in-SculkSensorBlock-canActivate.patch b/patches/server/Check-for-block-type-in-SculkSensorBlock-canActivate.patch similarity index 100% rename from patches/unapplied/server/Check-for-block-type-in-SculkSensorBlock-canActivate.patch rename to patches/server/Check-for-block-type-in-SculkSensorBlock-canActivate.patch diff --git a/patches/unapplied/server/Collision-API.patch b/patches/server/Collision-API.patch similarity index 100% rename from patches/unapplied/server/Collision-API.patch rename to patches/server/Collision-API.patch diff --git a/patches/unapplied/server/Configurable-Region-Compression-Format.patch b/patches/server/Configurable-Region-Compression-Format.patch similarity index 100% rename from patches/unapplied/server/Configurable-Region-Compression-Format.patch rename to patches/server/Configurable-Region-Compression-Format.patch diff --git a/patches/unapplied/server/Configurable-Sand-Duping.patch b/patches/server/Configurable-Sand-Duping.patch similarity index 100% rename from patches/unapplied/server/Configurable-Sand-Duping.patch rename to patches/server/Configurable-Sand-Duping.patch diff --git a/patches/unapplied/server/Configurable-chat-thread-limit.patch b/patches/server/Configurable-chat-thread-limit.patch similarity index 100% rename from patches/unapplied/server/Configurable-chat-thread-limit.patch rename to patches/server/Configurable-chat-thread-limit.patch diff --git a/patches/unapplied/server/Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/Configurable-damage-tick-when-blocking-with-shield.patch similarity index 100% rename from patches/unapplied/server/Configurable-damage-tick-when-blocking-with-shield.patch rename to patches/server/Configurable-damage-tick-when-blocking-with-shield.patch diff --git a/patches/unapplied/server/Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 100% rename from patches/unapplied/server/Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/server/Configurable-entity-tracking-range-by-Y-coordinate.patch diff --git a/patches/unapplied/server/Configurable-max-block-fluid-ticks.patch b/patches/server/Configurable-max-block-fluid-ticks.patch similarity index 100% rename from patches/unapplied/server/Configurable-max-block-fluid-ticks.patch rename to patches/server/Configurable-max-block-fluid-ticks.patch diff --git a/patches/unapplied/server/Configuration-for-horizontal-only-item-merging.patch b/patches/server/Configuration-for-horizontal-only-item-merging.patch similarity index 100% rename from patches/unapplied/server/Configuration-for-horizontal-only-item-merging.patch rename to patches/server/Configuration-for-horizontal-only-item-merging.patch diff --git a/patches/unapplied/server/Configure-sniffer-egg-hatch-time.patch b/patches/server/Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/unapplied/server/Configure-sniffer-egg-hatch-time.patch rename to patches/server/Configure-sniffer-egg-hatch-time.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-handle-interactions-with-items-on-cooldown.patch b/patches/server/Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/unapplied/server/Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/Correctly-handle-interactions-with-items-on-cooldown.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/Custom-Chat-Completion-Suggestions-API.patch b/patches/server/Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/unapplied/server/Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/unapplied/server/Deep-clone-nbt-tags-in-PDC.patch b/patches/server/Deep-clone-nbt-tags-in-PDC.patch similarity index 100% rename from patches/unapplied/server/Deep-clone-nbt-tags-in-PDC.patch rename to patches/server/Deep-clone-nbt-tags-in-PDC.patch diff --git a/patches/unapplied/server/Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch similarity index 100% rename from patches/unapplied/server/Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch rename to patches/server/Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch diff --git a/patches/unapplied/server/Deprecate-ItemStack-setType.patch b/patches/server/Deprecate-ItemStack-setType.patch similarity index 100% rename from patches/unapplied/server/Deprecate-ItemStack-setType.patch rename to patches/server/Deprecate-ItemStack-setType.patch diff --git a/patches/unapplied/server/Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/unapplied/server/Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/server/Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/unapplied/server/Detect-headless-JREs.patch b/patches/server/Detect-headless-JREs.patch similarity index 100% rename from patches/unapplied/server/Detect-headless-JREs.patch rename to patches/server/Detect-headless-JREs.patch diff --git a/patches/unapplied/server/Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/unapplied/server/Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/server/Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/unapplied/server/Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/unapplied/server/Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/unapplied/server/Disable-memory-reserve-allocating.patch b/patches/server/Disable-memory-reserve-allocating.patch similarity index 100% rename from patches/unapplied/server/Disable-memory-reserve-allocating.patch rename to patches/server/Disable-memory-reserve-allocating.patch diff --git a/patches/unapplied/server/Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 100% rename from patches/unapplied/server/Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/server/Do-crystal-portal-proximity-check-before-entity-look.patch diff --git a/patches/unapplied/server/Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 100% rename from patches/unapplied/server/Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/server/Do-not-read-tile-entities-in-chunks-that-are-positio.patch diff --git a/patches/unapplied/server/Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/unapplied/server/Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/unapplied/server/Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/unapplied/server/Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/unapplied/server/Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/Don-t-check-if-we-can-see-non-visible-entities.patch similarity index 100% rename from patches/unapplied/server/Don-t-check-if-we-can-see-non-visible-entities.patch rename to patches/server/Don-t-check-if-we-can-see-non-visible-entities.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-fire-sync-events-during-worldgen.patch b/patches/server/Don-t-fire-sync-events-during-worldgen.patch similarity index 100% rename from patches/unapplied/server/Don-t-fire-sync-events-during-worldgen.patch rename to patches/server/Don-t-fire-sync-events-during-worldgen.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/Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 100% rename from patches/unapplied/server/Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/server/Don-t-tab-complete-namespaced-commands-if-send-names.patch diff --git a/patches/unapplied/server/Don-t-use-level-random-in-entity-constructors.patch b/patches/server/Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/unapplied/server/Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/unapplied/server/Dont-resend-blocks-on-interactions.patch b/patches/server/Dont-resend-blocks-on-interactions.patch similarity index 100% rename from patches/unapplied/server/Dont-resend-blocks-on-interactions.patch rename to patches/server/Dont-resend-blocks-on-interactions.patch diff --git a/patches/unapplied/server/Dont-resent-entity-on-art-update.patch b/patches/server/Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/unapplied/server/Dont-resent-entity-on-art-update.patch rename to patches/server/Dont-resent-entity-on-art-update.patch diff --git a/patches/unapplied/server/Elder-Guardian-appearance-API.patch b/patches/server/Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/unapplied/server/Elder-Guardian-appearance-API.patch rename to patches/server/Elder-Guardian-appearance-API.patch diff --git a/patches/unapplied/server/Entity-Activation-Range-2.0.patch b/patches/server/Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/unapplied/server/Entity-Activation-Range-2.0.patch rename to patches/server/Entity-Activation-Range-2.0.patch diff --git a/patches/unapplied/server/EntityPickupItemEvent-fixes.patch b/patches/server/EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/unapplied/server/EntityPickupItemEvent-fixes.patch rename to patches/server/EntityPickupItemEvent-fixes.patch diff --git a/patches/unapplied/server/Expand-LingeringPotion-API.patch b/patches/server/Expand-LingeringPotion-API.patch similarity index 100% rename from patches/unapplied/server/Expand-LingeringPotion-API.patch rename to patches/server/Expand-LingeringPotion-API.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/Expand-Pose-API.patch b/patches/server/Expand-Pose-API.patch similarity index 100% rename from patches/unapplied/server/Expand-Pose-API.patch rename to patches/server/Expand-Pose-API.patch diff --git a/patches/unapplied/server/Expanded-Hopper-API.patch b/patches/server/Expanded-Hopper-API.patch similarity index 100% rename from patches/unapplied/server/Expanded-Hopper-API.patch rename to patches/server/Expanded-Hopper-API.patch diff --git a/patches/unapplied/server/ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 100% rename from patches/unapplied/server/ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/server/ExperienceOrb-should-call-EntitySpawnEvent.patch diff --git a/patches/unapplied/server/Expose-LootTable-of-DecoratedPot.patch b/patches/server/Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/unapplied/server/Expose-LootTable-of-DecoratedPot.patch rename to patches/server/Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/unapplied/server/Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/Expose-hand-in-BlockCanBuildEvent.patch similarity index 100% rename from patches/unapplied/server/Expose-hand-in-BlockCanBuildEvent.patch rename to patches/server/Expose-hand-in-BlockCanBuildEvent.patch diff --git a/patches/unapplied/server/Expose-hasColor-to-leather-armor.patch b/patches/server/Expose-hasColor-to-leather-armor.patch similarity index 100% rename from patches/unapplied/server/Expose-hasColor-to-leather-armor.patch rename to patches/server/Expose-hasColor-to-leather-armor.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/Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/unapplied/server/Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/unapplied/server/Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch similarity index 100% rename from patches/unapplied/server/Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch rename to patches/server/Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch diff --git a/patches/unapplied/server/Fire-entity-death-event-for-ender-dragon.patch b/patches/server/Fire-entity-death-event-for-ender-dragon.patch similarity index 100% rename from patches/unapplied/server/Fire-entity-death-event-for-ender-dragon.patch rename to patches/server/Fire-entity-death-event-for-ender-dragon.patch diff --git a/patches/unapplied/server/Fix-BanList-API.patch b/patches/server/Fix-BanList-API.patch similarity index 100% rename from patches/unapplied/server/Fix-BanList-API.patch rename to patches/server/Fix-BanList-API.patch diff --git a/patches/unapplied/server/Fix-Bee-flower-NPE.patch b/patches/server/Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/unapplied/server/Fix-Bee-flower-NPE.patch rename to patches/server/Fix-Bee-flower-NPE.patch diff --git a/patches/unapplied/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/unapplied/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/unapplied/server/Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch similarity index 100% rename from patches/unapplied/server/Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch rename to patches/server/Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch diff --git a/patches/unapplied/server/Fix-DamageSource-API.patch b/patches/server/Fix-DamageSource-API.patch similarity index 100% rename from patches/unapplied/server/Fix-DamageSource-API.patch rename to patches/server/Fix-DamageSource-API.patch diff --git a/patches/unapplied/server/Fix-EntityArgument-and-EntitySelectorParser-permissi.patch b/patches/server/Fix-EntityArgument-and-EntitySelectorParser-permissi.patch similarity index 100% rename from patches/unapplied/server/Fix-EntityArgument-and-EntitySelectorParser-permissi.patch rename to patches/server/Fix-EntityArgument-and-EntitySelectorParser-permissi.patch diff --git a/patches/unapplied/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/unapplied/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/Fix-EntityCombustEvent-cancellation-cant-fully-preve.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-ItemFlags.patch b/patches/server/Fix-ItemFlags.patch similarity index 100% rename from patches/unapplied/server/Fix-ItemFlags.patch rename to patches/server/Fix-ItemFlags.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 88% 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 index c13b6c7f5a..6532bf9243 100644 --- 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 @@ -20,5 +20,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - Pair.of(5, GoToWantedItem.create(speed, false, 4)), + Pair.of(5, GoToWantedItem.create(villager -> !villager.isSleeping(), speed, false, 4)), // Paper - Fix MC-157464 Pair.of( - 6, AcquirePoi.create(profession.acquirableJobSite(), MemoryModuleType.JOB_SITE, MemoryModuleType.POTENTIAL_JOB_SITE, true, Optional.empty()) - ), + 6, + AcquirePoi.create( diff --git a/patches/unapplied/server/Fix-NPE-for-Jukebox-setRecord.patch b/patches/server/Fix-NPE-for-Jukebox-setRecord.patch similarity index 100% rename from patches/unapplied/server/Fix-NPE-for-Jukebox-setRecord.patch rename to patches/server/Fix-NPE-for-Jukebox-setRecord.patch diff --git a/patches/unapplied/server/Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/Fix-NPE-in-AdvancementProgress-getDateAwarded.patch similarity index 100% rename from patches/unapplied/server/Fix-NPE-in-AdvancementProgress-getDateAwarded.patch rename to patches/server/Fix-NPE-in-AdvancementProgress-getDateAwarded.patch diff --git a/patches/unapplied/server/Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/unapplied/server/Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/server/Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/unapplied/server/Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/unapplied/server/Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/unapplied/server/Fix-NPE-on-Boat-getStatus.patch b/patches/server/Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/unapplied/server/Fix-NPE-on-Boat-getStatus.patch rename to patches/server/Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/unapplied/server/Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch similarity index 100% rename from patches/unapplied/server/Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch rename to patches/server/Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch diff --git a/patches/unapplied/server/Fix-PickupStatus-getting-reset.patch b/patches/server/Fix-PickupStatus-getting-reset.patch similarity index 100% rename from patches/unapplied/server/Fix-PickupStatus-getting-reset.patch rename to patches/server/Fix-PickupStatus-getting-reset.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-UnsafeValues-loadAdvancement.patch b/patches/server/Fix-UnsafeValues-loadAdvancement.patch similarity index 100% rename from patches/unapplied/server/Fix-UnsafeValues-loadAdvancement.patch rename to patches/server/Fix-UnsafeValues-loadAdvancement.patch diff --git a/patches/unapplied/server/Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/Fix-a-bunch-of-vanilla-bugs.patch similarity index 98% rename from patches/unapplied/server/Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/Fix-a-bunch-of-vanilla-bugs.patch index 10cb5bb7bc..eac5af64a9 100644 --- a/patches/unapplied/server/Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/Fix-a-bunch-of-vanilla-bugs.patch @@ -119,13 +119,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- 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 extends ServerCommonPacketListenerImpl - this.player.swing(enumhand, true); + this.player.swing(enumhand, true); + } } - } -- } +- } + } else { this.player.containerMenu.sendAllDataToRemote(); } // Paper - Fix inventory desync; MC-99075 - } else { - MutableComponent ichatmutablecomponent1 = Component.translatable("build.tooHigh", i).withStyle(ChatFormatting.RED); + } else { + MutableComponent ichatmutablecomponent1 = Component.translatable("build.tooHigh", i).withStyle(ChatFormatting.RED); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 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-async-entity-add-due-to-fungus-trees.patch b/patches/server/Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/unapplied/server/Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/unapplied/server/Fix-bees-aging-inside-hives.patch b/patches/server/Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/unapplied/server/Fix-bees-aging-inside-hives.patch rename to patches/server/Fix-bees-aging-inside-hives.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-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/server/Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch similarity index 95% rename from patches/unapplied/server/Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch rename to patches/server/Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch index 565c1ebf4f..1a09fd30ab 100644 --- a/patches/unapplied/server/Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch +++ b/patches/server/Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch @@ -9,7 +9,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -0,0 +0,0 @@ public final class ItemStack implements DataComponentHolder { - world.capturedTileEntities.clear(); // Paper - Allow chests to be placed with NBT data; clear out block entities as chests and such will pop loot + world.capturedTileEntities.clear(); // Paper - Allow chests to be placed with NBT data; clear out block entities as chests and such will pop loot // revert back all captured blocks world.preventPoiUpdated = true; // CraftBukkit - SPIGOT-5710 + world.isBlockPlaceCancelled = true; // Paper - prevent calling cleanup logic when undoing a block place upon a cancelled BlockPlaceEvent diff --git a/patches/unapplied/server/Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/Fix-cmd-permission-levels-for-command-blocks.patch similarity index 100% rename from patches/unapplied/server/Fix-cmd-permission-levels-for-command-blocks.patch rename to patches/server/Fix-cmd-permission-levels-for-command-blocks.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 100% 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 diff --git a/patches/unapplied/server/Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/Fix-creation-of-invalid-block-entity-during-world-ge.patch similarity index 100% rename from patches/unapplied/server/Fix-creation-of-invalid-block-entity-during-world-ge.patch rename to patches/server/Fix-creation-of-invalid-block-entity-during-world-ge.patch diff --git a/patches/unapplied/server/Fix-custom-piglin-loved-items.patch b/patches/server/Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/unapplied/server/Fix-custom-piglin-loved-items.patch rename to patches/server/Fix-custom-piglin-loved-items.patch diff --git a/patches/unapplied/server/Fix-custom-statistic-criteria-creation.patch b/patches/server/Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/unapplied/server/Fix-custom-statistic-criteria-creation.patch rename to patches/server/Fix-custom-statistic-criteria-creation.patch diff --git a/patches/unapplied/server/Fix-damage-modifier-inconsistencies.patch b/patches/server/Fix-damage-modifier-inconsistencies.patch similarity index 100% rename from patches/unapplied/server/Fix-damage-modifier-inconsistencies.patch rename to patches/server/Fix-damage-modifier-inconsistencies.patch 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 100% 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 diff --git a/patches/unapplied/server/Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/unapplied/server/Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/unapplied/server/Fix-equipment-slot-and-group-API.patch b/patches/server/Fix-equipment-slot-and-group-API.patch similarity index 100% rename from patches/unapplied/server/Fix-equipment-slot-and-group-API.patch rename to patches/server/Fix-equipment-slot-and-group-API.patch 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/server/Fix-interact-event-not-being-called-sometimes.patch b/patches/server/Fix-interact-event-not-being-called-sometimes.patch index d2d8bebfd1..b2dba0114d 100644 --- a/patches/server/Fix-interact-event-not-being-called-sometimes.patch +++ b/patches/server/Fix-interact-event-not-being-called-sometimes.patch @@ -19,7 +19,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 InteractionResult.Success enuminteractionresult_d = (InteractionResult.Success) enuminteractionresult; - if (enuminteractionresult_d.swingSource() == InteractionResult.SwingSource.SERVER) { -+ if (enuminteractionresult_d.swingSource() == InteractionResult.SwingSource.SERVER && !this.player.gameMode.interactResult) { ++ if (enuminteractionresult_d.swingSource() == InteractionResult.SwingSource.SERVER && !this.player.gameMode.interactResult) { // Paper - Call interact event this.player.swing(enumhand, true); } } diff --git a/patches/unapplied/server/Fix-inventories-returning-null-Locations.patch b/patches/server/Fix-inventories-returning-null-Locations.patch similarity index 100% rename from patches/unapplied/server/Fix-inventories-returning-null-Locations.patch rename to patches/server/Fix-inventories-returning-null-Locations.patch diff --git a/patches/unapplied/server/Fix-issues-with-Recipe-API.patch b/patches/server/Fix-issues-with-Recipe-API.patch similarity index 98% rename from patches/unapplied/server/Fix-issues-with-Recipe-API.patch rename to patches/server/Fix-issues-with-Recipe-API.patch index 05c84a17d2..7c9e12f934 100644 --- a/patches/unapplied/server/Fix-issues-with-Recipe-API.patch +++ b/patches/server/Fix-issues-with-Recipe-API.patch @@ -53,9 +53,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } public static RecipeChoice toBukkit(Ingredient list) { - List> items = list.items(); - - if (items.isEmpty()) { + if (list.isEmpty()) { - return null; + return RecipeChoice.empty(); // Paper - null breaks API contracts } diff --git a/patches/unapplied/server/Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/Fix-missing-event-call-for-entity-teleport-API.patch similarity index 100% rename from patches/unapplied/server/Fix-missing-event-call-for-entity-teleport-API.patch rename to patches/server/Fix-missing-event-call-for-entity-teleport-API.patch diff --git a/patches/unapplied/server/Fix-missing-map-initialize-event-call.patch b/patches/server/Fix-missing-map-initialize-event-call.patch similarity index 100% rename from patches/unapplied/server/Fix-missing-map-initialize-event-call.patch rename to patches/server/Fix-missing-map-initialize-event-call.patch diff --git a/patches/unapplied/server/Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/unapplied/server/Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/unapplied/server/Fix-possible-NPE-on-painting-creation.patch b/patches/server/Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/unapplied/server/Fix-possible-NPE-on-painting-creation.patch rename to patches/server/Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/unapplied/server/Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch b/patches/server/Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch similarity index 100% rename from patches/unapplied/server/Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch rename to patches/server/Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch diff --git a/patches/unapplied/server/Fix-premature-player-kicks-on-shutdown.patch b/patches/server/Fix-premature-player-kicks-on-shutdown.patch similarity index 100% rename from patches/unapplied/server/Fix-premature-player-kicks-on-shutdown.patch rename to patches/server/Fix-premature-player-kicks-on-shutdown.patch diff --git a/patches/unapplied/server/Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch similarity index 100% rename from patches/unapplied/server/Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch rename to patches/server/Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch diff --git a/patches/unapplied/server/Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/unapplied/server/Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/unapplied/server/Fix-rotation-when-spawning-display-entities.patch b/patches/server/Fix-rotation-when-spawning-display-entities.patch similarity index 100% rename from patches/unapplied/server/Fix-rotation-when-spawning-display-entities.patch rename to patches/server/Fix-rotation-when-spawning-display-entities.patch diff --git a/patches/unapplied/server/Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/server/Fix-sending-disconnect-packet-in-phases-where-it-doe.patch similarity index 100% rename from patches/unapplied/server/Fix-sending-disconnect-packet-in-phases-where-it-doe.patch rename to patches/server/Fix-sending-disconnect-packet-in-phases-where-it-doe.patch diff --git a/patches/unapplied/server/Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/Fix-several-issues-with-EntityBreedEvent.patch similarity index 100% rename from patches/unapplied/server/Fix-several-issues-with-EntityBreedEvent.patch rename to patches/server/Fix-several-issues-with-EntityBreedEvent.patch diff --git a/patches/unapplied/server/Fix-shield-disable-inconsistency.patch b/patches/server/Fix-shield-disable-inconsistency.patch similarity index 100% rename from patches/unapplied/server/Fix-shield-disable-inconsistency.patch rename to patches/server/Fix-shield-disable-inconsistency.patch diff --git a/patches/unapplied/server/Fix-silent-equipment-change-for-mobs.patch b/patches/server/Fix-silent-equipment-change-for-mobs.patch similarity index 100% rename from patches/unapplied/server/Fix-silent-equipment-change-for-mobs.patch rename to patches/server/Fix-silent-equipment-change-for-mobs.patch diff --git a/patches/unapplied/server/Fix-slot-desync.patch b/patches/server/Fix-slot-desync.patch similarity index 91% rename from patches/unapplied/server/Fix-slot-desync.patch rename to patches/server/Fix-slot-desync.patch index 658398ef26..f231abe19f 100644 --- a/patches/unapplied/server/Fix-slot-desync.patch +++ b/patches/server/Fix-slot-desync.patch @@ -26,19 +26,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- 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 extends ServerCommonPacketListenerImpl - // Refresh the current entity metadata - entity.refreshEntityData(ServerGamePacketListenerImpl.this.player); - // SPIGOT-7136 - Allays -- if (entity instanceof Allay) { + // Refresh the current entity metadata + entity.refreshEntityData(ServerGamePacketListenerImpl.this.player); + // SPIGOT-7136 - Allays +- if (entity instanceof Allay) { + if (entity instanceof Allay || entity instanceof net.minecraft.world.entity.animal.horse.AbstractHorse) { // Paper - Fix horse armor desync - ServerGamePacketListenerImpl.this.send(new ClientboundSetEquipmentPacket(entity.getId(), Arrays.stream(net.minecraft.world.entity.EquipmentSlot.values()).map((slot) -> Pair.of(slot, ((LivingEntity) entity).getItemBySlot(slot).copy())).collect(Collectors.toList()))); -- ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); - } + ServerGamePacketListenerImpl.this.send(new ClientboundSetEquipmentPacket(entity.getId(), Arrays.stream(net.minecraft.world.entity.EquipmentSlot.values()).map((slot) -> Pair.of(slot, ((LivingEntity) entity).getItemBySlot(slot).copy())).collect(Collectors.toList()))); +- ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); + } + + ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); // Paper - fix slot desync - always refresh player inventory - } + } - if (event.isCancelled()) { + if (event.isCancelled()) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java 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-s-Forced-Stats.patch b/patches/server/Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/unapplied/server/Fix-spigot-s-Forced-Stats.patch rename to patches/server/Fix-spigot-s-Forced-Stats.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/unapplied/server/Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/Fix-strikeLightningEffect-powers-lightning-rods-and-.patch similarity index 100% rename from patches/unapplied/server/Fix-strikeLightningEffect-powers-lightning-rods-and-.patch rename to patches/server/Fix-strikeLightningEffect-powers-lightning-rods-and-.patch diff --git a/patches/unapplied/server/Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/unapplied/server/Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/unapplied/server/Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/Fix-team-sidebar-objectives-not-being-cleared.patch similarity index 100% rename from patches/unapplied/server/Fix-team-sidebar-objectives-not-being-cleared.patch rename to patches/server/Fix-team-sidebar-objectives-not-being-cleared.patch diff --git a/patches/unapplied/server/Fix-text-display-error-on-spawn.patch b/patches/server/Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/unapplied/server/Fix-text-display-error-on-spawn.patch rename to patches/server/Fix-text-display-error-on-spawn.patch diff --git a/patches/unapplied/server/Fixup-NamespacedKey-handling.patch b/patches/server/Fixup-NamespacedKey-handling.patch similarity index 100% rename from patches/unapplied/server/Fixup-NamespacedKey-handling.patch rename to patches/server/Fixup-NamespacedKey-handling.patch diff --git a/patches/unapplied/server/Flat-bedrock-generator-settings.patch b/patches/server/Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/unapplied/server/Flat-bedrock-generator-settings.patch rename to patches/server/Flat-bedrock-generator-settings.patch diff --git a/patches/unapplied/server/Flying-Fall-Damage.patch b/patches/server/Flying-Fall-Damage.patch similarity index 96% rename from patches/unapplied/server/Flying-Fall-Damage.patch rename to patches/server/Flying-Fall-Damage.patch index 4fc1d8e311..5df2ab0afc 100644 --- a/patches/unapplied/server/Flying-Fall-Damage.patch +++ b/patches/server/Flying-Fall-Damage.patch @@ -47,5 +47,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end - flying fall damage + @Override - public int getNoDamageTicks() { - if (this.getHandle().spawnInvulnerableTime > 0) { + public void setFlySpeed(float value) { + this.validateSpeed(value); diff --git a/patches/unapplied/server/Folia-scheduler-and-owned-region-API.patch b/patches/server/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/server/Folia-scheduler-and-owned-region-API.patch diff --git a/patches/unapplied/server/Friction-API.patch b/patches/server/Friction-API.patch similarity index 100% rename from patches/unapplied/server/Friction-API.patch rename to patches/server/Friction-API.patch diff --git a/patches/unapplied/server/General-ItemMeta-fixes.patch b/patches/server/General-ItemMeta-fixes.patch similarity index 99% rename from patches/unapplied/server/General-ItemMeta-fixes.patch rename to patches/server/General-ItemMeta-fixes.patch index 4cff660718..2d713e35ae 100644 --- a/patches/unapplied/server/General-ItemMeta-fixes.patch +++ b/patches/server/General-ItemMeta-fixes.patch @@ -2030,8 +2030,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/inventory/SerializableMeta.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/SerializableMeta.java @@ -0,0 +0,0 @@ public final class SerializableMeta implements ConfigurationSerializable { - } - throw new IllegalArgumentException(field + "(" + object + ") is not a valid " + clazz); + + return result; } + + // Paper start - General ItemMeta Fixes @@ -2062,7 +2062,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - Preconditions.checkArgument(tag instanceof CraftEntityTag, "tag must be an entity tag"); + Preconditions.checkArgument(tag == null || tag instanceof CraftEntityTag, "tag must be an entity tag"); // Paper - this.handle = new Equippable(this.handle.slot(), this.handle.equipSound(), this.handle.model(), this.handle.cameraOverlay(), + this.handle = new Equippable(this.handle.slot(), this.handle.equipSound(), this.handle.assetId(), this.handle.cameraOverlay(), (tag != null) ? Optional.of(((CraftEntityTag) tag).getHandle()) : Optional.empty(), diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftToolComponent.java b/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftToolComponent.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 diff --git a/patches/unapplied/server/Handle-Large-Packets-disconnecting-client.patch b/patches/server/Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/unapplied/server/Handle-Large-Packets-disconnecting-client.patch rename to patches/server/Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/unapplied/server/Handle-Oversized-block-entities-in-chunks.patch b/patches/server/Handle-Oversized-block-entities-in-chunks.patch similarity index 100% rename from patches/unapplied/server/Handle-Oversized-block-entities-in-chunks.patch rename to patches/server/Handle-Oversized-block-entities-in-chunks.patch diff --git a/patches/unapplied/server/Ignore-impossible-spawn-tick.patch b/patches/server/Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/unapplied/server/Ignore-impossible-spawn-tick.patch rename to patches/server/Ignore-impossible-spawn-tick.patch diff --git a/patches/unapplied/server/Implement-OfflinePlayer-isConnected.patch b/patches/server/Implement-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/unapplied/server/Implement-OfflinePlayer-isConnected.patch rename to patches/server/Implement-OfflinePlayer-isConnected.patch diff --git a/patches/unapplied/server/Implement-PlayerFailMoveEvent.patch b/patches/server/Implement-PlayerFailMoveEvent.patch similarity index 100% rename from patches/unapplied/server/Implement-PlayerFailMoveEvent.patch rename to patches/server/Implement-PlayerFailMoveEvent.patch diff --git a/patches/unapplied/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 100% rename from patches/unapplied/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/server/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/patches/unapplied/server/Improve-PortalEvents.patch b/patches/server/Improve-PortalEvents.patch similarity index 100% rename from patches/unapplied/server/Improve-PortalEvents.patch rename to patches/server/Improve-PortalEvents.patch diff --git a/patches/unapplied/server/Improve-Registry.patch b/patches/server/Improve-Registry.patch similarity index 100% rename from patches/unapplied/server/Improve-Registry.patch rename to patches/server/Improve-Registry.patch diff --git a/patches/unapplied/server/Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/unapplied/server/Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/unapplied/server/Improve-logging-and-errors.patch b/patches/server/Improve-logging-and-errors.patch similarity index 100% rename from patches/unapplied/server/Improve-logging-and-errors.patch rename to patches/server/Improve-logging-and-errors.patch diff --git a/patches/unapplied/server/Improve-tag-parser-handling.patch b/patches/server/Improve-tag-parser-handling.patch similarity index 100% rename from patches/unapplied/server/Improve-tag-parser-handling.patch rename to patches/server/Improve-tag-parser-handling.patch diff --git a/patches/unapplied/server/Item-Mutation-Fixes.patch b/patches/server/Item-Mutation-Fixes.patch similarity index 100% rename from patches/unapplied/server/Item-Mutation-Fixes.patch rename to patches/server/Item-Mutation-Fixes.patch diff --git a/patches/unapplied/server/ItemStack-Tooltip-API.patch b/patches/server/ItemStack-Tooltip-API.patch similarity index 100% rename from patches/unapplied/server/ItemStack-Tooltip-API.patch rename to patches/server/ItemStack-Tooltip-API.patch diff --git a/patches/unapplied/server/ItemStack-damage-API.patch b/patches/server/ItemStack-damage-API.patch similarity index 100% rename from patches/unapplied/server/ItemStack-damage-API.patch rename to patches/server/ItemStack-damage-API.patch diff --git a/patches/unapplied/server/Lazily-create-LootContext-for-criterions.patch b/patches/server/Lazily-create-LootContext-for-criterions.patch similarity index 100% rename from patches/unapplied/server/Lazily-create-LootContext-for-criterions.patch rename to patches/server/Lazily-create-LootContext-for-criterions.patch diff --git a/patches/unapplied/server/Leashable-API.patch b/patches/server/Leashable-API.patch similarity index 98% rename from patches/unapplied/server/Leashable-API.patch rename to patches/server/Leashable-API.patch index 14d46d908d..c5f469b952 100644 --- a/patches/unapplied/server/Leashable-API.patch +++ b/patches/server/Leashable-API.patch @@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + return false; + } + -+ this.getHandle().dropLeash(true, false); ++ this.getHandle().removeLeash(); + return true; + } + @@ -98,7 +98,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - if (!this.isLeashed()) { - return false; - } -- ((Mob) this.getHandle()).dropLeash(true, false); +- ((Mob) this.getHandle()).removeLeash(); - return true; + throw new IllegalStateException("Entity not leashed"); // Paper - implement in CraftMob & PaperLeashable } diff --git a/patches/unapplied/server/Limit-pet-look-distance.patch b/patches/server/Limit-pet-look-distance.patch similarity index 100% rename from patches/unapplied/server/Limit-pet-look-distance.patch rename to patches/server/Limit-pet-look-distance.patch diff --git a/patches/unapplied/server/Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/unapplied/server/Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/server/Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/unapplied/server/Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/server/Make-a-PDC-view-accessible-directly-from-ItemStack.patch similarity index 100% rename from patches/unapplied/server/Make-a-PDC-view-accessible-directly-from-ItemStack.patch rename to patches/server/Make-a-PDC-view-accessible-directly-from-ItemStack.patch diff --git a/patches/unapplied/server/Make-interaction-leniency-distance-configurable.patch b/patches/server/Make-interaction-leniency-distance-configurable.patch similarity index 71% rename from patches/unapplied/server/Make-interaction-leniency-distance-configurable.patch rename to patches/server/Make-interaction-leniency-distance-configurable.patch index 42fbaa592b..e02c62cd77 100644 --- a/patches/unapplied/server/Make-interaction-leniency-distance-configurable.patch +++ b/patches/server/Make-interaction-leniency-distance-configurable.patch @@ -17,10 +17,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl - AABB axisalignedbb = entity.getBoundingBox(); + AABB axisalignedbb = entity.getBoundingBox(); -- if (this.player.canInteractWithEntity(axisalignedbb, 3.0D)) { +- if (this.player.canInteractWithEntity(axisalignedbb, 3.0D)) { + if (this.player.canInteractWithEntity(axisalignedbb, io.papermc.paper.configuration.GlobalConfiguration.get().misc.clientInteractionLeniencyDistance.or(3.0D))) { // Paper - configurable lenience value for interact range - packet.dispatch(new ServerboundInteractPacket.Handler() { - private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit - ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand); + packet.dispatch(new ServerboundInteractPacket.Handler() { + private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit + ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand); diff --git a/patches/unapplied/server/Missing-eating-regain-reason.patch b/patches/server/Missing-eating-regain-reason.patch similarity index 100% rename from patches/unapplied/server/Missing-eating-regain-reason.patch rename to patches/server/Missing-eating-regain-reason.patch diff --git a/patches/unapplied/server/Missing-effect-cause.patch b/patches/server/Missing-effect-cause.patch similarity index 100% rename from patches/unapplied/server/Missing-effect-cause.patch rename to patches/server/Missing-effect-cause.patch diff --git a/patches/unapplied/server/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/unapplied/server/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/unapplied/server/More-Chest-Block-API.patch b/patches/server/More-Chest-Block-API.patch similarity index 100% rename from patches/unapplied/server/More-Chest-Block-API.patch rename to patches/server/More-Chest-Block-API.patch diff --git a/patches/unapplied/server/More-DragonBattle-API.patch b/patches/server/More-DragonBattle-API.patch similarity index 100% rename from patches/unapplied/server/More-DragonBattle-API.patch rename to patches/server/More-DragonBattle-API.patch diff --git a/patches/unapplied/server/More-Raid-API.patch b/patches/server/More-Raid-API.patch similarity index 100% rename from patches/unapplied/server/More-Raid-API.patch rename to patches/server/More-Raid-API.patch diff --git a/patches/unapplied/server/More-Sign-Block-API.patch b/patches/server/More-Sign-Block-API.patch similarity index 100% rename from patches/unapplied/server/More-Sign-Block-API.patch rename to patches/server/More-Sign-Block-API.patch diff --git a/patches/unapplied/server/More-Teleport-API.patch b/patches/server/More-Teleport-API.patch similarity index 100% rename from patches/unapplied/server/More-Teleport-API.patch rename to patches/server/More-Teleport-API.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/More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/unapplied/server/More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/unapplied/server/Nameable-Banner-API.patch b/patches/server/Nameable-Banner-API.patch similarity index 100% rename from patches/unapplied/server/Nameable-Banner-API.patch rename to patches/server/Nameable-Banner-API.patch diff --git a/patches/unapplied/server/Only-call-EntityDamageEvents-before-actuallyHurt.patch b/patches/server/Only-call-EntityDamageEvents-before-actuallyHurt.patch similarity index 100% rename from patches/unapplied/server/Only-call-EntityDamageEvents-before-actuallyHurt.patch rename to patches/server/Only-call-EntityDamageEvents-before-actuallyHurt.patch diff --git a/patches/unapplied/server/Only-capture-actual-tree-growth.patch b/patches/server/Only-capture-actual-tree-growth.patch similarity index 100% rename from patches/unapplied/server/Only-capture-actual-tree-growth.patch rename to patches/server/Only-capture-actual-tree-growth.patch diff --git a/patches/unapplied/server/Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/Only-erase-allay-memory-on-non-item-targets.patch similarity index 100% rename from patches/unapplied/server/Only-erase-allay-memory-on-non-item-targets.patch rename to patches/server/Only-erase-allay-memory-on-non-item-targets.patch diff --git a/patches/unapplied/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/unapplied/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/Only-set-despawnTimer-for-Wandering-Traders-spawned-.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/Optimize-Bit-Operations-by-inlining.patch b/patches/server/Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/unapplied/server/Optimize-Bit-Operations-by-inlining.patch rename to patches/server/Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/unapplied/server/Optimize-Collision-to-not-load-chunks.patch b/patches/server/Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/unapplied/server/Optimize-Collision-to-not-load-chunks.patch rename to patches/server/Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/unapplied/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/unapplied/server/Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/Optimize-GoalSelector-Goal.Flag-Set-operations.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-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/unapplied/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/unapplied/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/unapplied/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/unapplied/server/Optimize-VarInts.patch b/patches/server/Optimize-VarInts.patch similarity index 100% rename from patches/unapplied/server/Optimize-VarInts.patch rename to patches/server/Optimize-VarInts.patch diff --git a/patches/unapplied/server/Optimize-Voxel-Shape-Merging.patch b/patches/server/Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/unapplied/server/Optimize-Voxel-Shape-Merging.patch rename to patches/server/Optimize-Voxel-Shape-Merging.patch diff --git a/patches/unapplied/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/unapplied/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/unapplied/server/Optimize-nearest-structure-border-iteration.patch b/patches/server/Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/unapplied/server/Optimize-nearest-structure-border-iteration.patch rename to patches/server/Optimize-nearest-structure-border-iteration.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/Per-world-ticks-per-spawn-settings.patch b/patches/server/Per-world-ticks-per-spawn-settings.patch similarity index 100% rename from patches/unapplied/server/Per-world-ticks-per-spawn-settings.patch rename to patches/server/Per-world-ticks-per-spawn-settings.patch diff --git a/patches/unapplied/server/Player-Entity-Tracking-Events.patch b/patches/server/Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/unapplied/server/Player-Entity-Tracking-Events.patch rename to patches/server/Player-Entity-Tracking-Events.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-NPE-if-hooked-entity-was-cleared.patch b/patches/server/Prevent-NPE-if-hooked-entity-was-cleared.patch similarity index 100% rename from patches/unapplied/server/Prevent-NPE-if-hooked-entity-was-cleared.patch rename to patches/server/Prevent-NPE-if-hooked-entity-was-cleared.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 100% 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 diff --git a/patches/unapplied/server/Prevent-empty-items-from-being-added-to-world.patch b/patches/server/Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/unapplied/server/Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/unapplied/server/Prevent-entity-loading-causing-async-lookups.patch b/patches/server/Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/unapplied/server/Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/unapplied/server/Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 96% rename from patches/unapplied/server/Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/Prevent-sending-oversized-item-data-in-equipment-and.patch index b5de289018..1413673442 100644 --- a/patches/unapplied/server/Prevent-sending-oversized-item-data-in-equipment-and.patch +++ b/patches/server/Prevent-sending-oversized-item-data-in-equipment-and.patch @@ -213,12 +213,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- 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 extends ServerCommonPacketListenerImpl - entity.refreshEntityData(ServerGamePacketListenerImpl.this.player); - // SPIGOT-7136 - Allays + entity.refreshEntityData(ServerGamePacketListenerImpl.this.player); + // SPIGOT-7136 - Allays if (entity instanceof Allay || entity instanceof net.minecraft.world.entity.animal.horse.AbstractHorse) { // Paper - Fix horse armor desync -- ServerGamePacketListenerImpl.this.send(new ClientboundSetEquipmentPacket(entity.getId(), Arrays.stream(net.minecraft.world.entity.EquipmentSlot.values()).map((slot) -> Pair.of(slot, ((LivingEntity) entity).getItemBySlot(slot).copy())).collect(Collectors.toList()))); +- ServerGamePacketListenerImpl.this.send(new ClientboundSetEquipmentPacket(entity.getId(), Arrays.stream(net.minecraft.world.entity.EquipmentSlot.values()).map((slot) -> Pair.of(slot, ((LivingEntity) entity).getItemBySlot(slot).copy())).collect(Collectors.toList()))); + ServerGamePacketListenerImpl.this.send(new ClientboundSetEquipmentPacket(entity.getId(), Arrays.stream(net.minecraft.world.entity.EquipmentSlot.values()).map((slot) -> Pair.of(slot, ((LivingEntity) entity).getItemBySlot(slot).copy())).collect(Collectors.toList()), true)); // Paper - sanitize - } + } ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); // Paper - fix slot desync - always refresh player inventory diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/patches/unapplied/server/Print-data-component-type-on-encoding-error.patch b/patches/server/Print-data-component-type-on-encoding-error.patch similarity index 100% rename from patches/unapplied/server/Print-data-component-type-on-encoding-error.patch rename to patches/server/Print-data-component-type-on-encoding-error.patch diff --git a/patches/unapplied/server/Prioritize-Minecraft-commands-in-function-parsing-an.patch b/patches/server/Prioritize-Minecraft-commands-in-function-parsing-an.patch similarity index 100% rename from patches/unapplied/server/Prioritize-Minecraft-commands-in-function-parsing-an.patch rename to patches/server/Prioritize-Minecraft-commands-in-function-parsing-an.patch diff --git a/patches/unapplied/server/Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 100% rename from patches/unapplied/server/Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/server/Properly-handle-BlockBreakEvent-isDropItems.patch diff --git a/patches/unapplied/server/Properly-handle-experience-dropping-on-block-break.patch b/patches/server/Properly-handle-experience-dropping-on-block-break.patch similarity index 100% rename from patches/unapplied/server/Properly-handle-experience-dropping-on-block-break.patch rename to patches/server/Properly-handle-experience-dropping-on-block-break.patch diff --git a/patches/unapplied/server/Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/Properly-remove-the-experimental-smithing-inventory-.patch similarity index 100% rename from patches/unapplied/server/Properly-remove-the-experimental-smithing-inventory-.patch rename to patches/server/Properly-remove-the-experimental-smithing-inventory-.patch diff --git a/patches/unapplied/server/Properly-resend-entities.patch b/patches/server/Properly-resend-entities.patch similarity index 95% rename from patches/unapplied/server/Properly-resend-entities.patch rename to patches/server/Properly-resend-entities.patch index 8360ad469b..433a9f10e1 100644 --- a/patches/unapplied/server/Properly-resend-entities.patch +++ b/patches/server/Properly-resend-entities.patch @@ -87,21 +87,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- 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 extends ServerCommonPacketListenerImpl - } + } - if (cancelled) { + if (cancelled) { + this.player.resyncUsingItem(this.player); // Paper - Properly cancel usable items - this.player.getBukkitEntity().updateInventory(); // SPIGOT-2524 - return; - } + this.player.getBukkitEntity().updateInventory(); // SPIGOT-2524 + return; + } @@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl - // Entity in bucket - SPIGOT-4048 and SPIGOT-6859a - if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) { -- entity.getBukkitEntity().update(ServerGamePacketListenerImpl.this.player); + // Entity in bucket - SPIGOT-4048 and SPIGOT-6859a + if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) { +- entity.getBukkitEntity().update(ServerGamePacketListenerImpl.this.player); + entity.resendPossiblyDesyncedEntityData(ServerGamePacketListenerImpl.this.player); // Paper - The entire mob gets deleted, so resend it - ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); - } + ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); + } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 diff --git a/patches/unapplied/server/Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/Properly-track-the-changed-item-from-dispense-events.patch similarity index 100% rename from patches/unapplied/server/Properly-track-the-changed-item-from-dispense-events.patch rename to patches/server/Properly-track-the-changed-item-from-dispense-events.patch diff --git a/patches/unapplied/server/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/unapplied/server/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/unapplied/server/Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/Proxy-ItemStack-to-CraftItemStack.patch similarity index 100% rename from patches/unapplied/server/Proxy-ItemStack-to-CraftItemStack.patch rename to patches/server/Proxy-ItemStack-to-CraftItemStack.patch diff --git a/patches/unapplied/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/unapplied/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch 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/Registry-Modification-API.patch b/patches/server/Registry-Modification-API.patch similarity index 99% rename from patches/unapplied/server/Registry-Modification-API.patch rename to patches/server/Registry-Modification-API.patch index 764c81c116..5727dcd8c1 100644 --- a/patches/unapplied/server/Registry-Modification-API.patch +++ b/patches/server/Registry-Modification-API.patch @@ -1267,15 +1267,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + Map, Exception> errors, + io.papermc.paper.registry.data.util.Conversions conversions // Paper - pass conversions ) { - String string = Registries.elementsDirPath(registry.key()); - FileToIdConverter fileToIdConverter = FileToIdConverter.json(string); + FileToIdConverter fileToIdConverter = FileToIdConverter.registry(registry.key()); + RegistryOps registryOps = RegistryOps.create(JsonOps.INSTANCE, infoGetter); @@ -0,0 +0,0 @@ public class RegistryDataLoader { RegistrationInfo registrationInfo = REGISTRATION_INFO_CACHE.apply(resource.knownPackInfo()); try { - loadElementFromResource(registry, elementDecoder, registryOps, resourceKey, resource, registrationInfo); + loadElementFromResource(registry, elementDecoder, registryOps, resourceKey, resource, registrationInfo, conversions); // Paper - pass conversions - } catch (Exception var15) { + } catch (Exception var14) { errors.put( resourceKey, @@ -0,0 +0,0 @@ public class RegistryDataLoader { @@ -1302,8 +1302,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 Resource resource = factory.getResourceOrThrow(resourceLocation); - loadElementFromResource(registry, decoder, registryOps2, resourceKey, resource, NETWORK_REGISTRATION_INFO); + loadElementFromResource(registry, decoder, registryOps2, resourceKey, resource, NETWORK_REGISTRATION_INFO, conversions); // Paper - pass conversions - } catch (Exception var18) { - loadingErrors.put(resourceKey, new IllegalStateException("Failed to parse local data", var18)); + } catch (Exception var17) { + loadingErrors.put(resourceKey, new IllegalStateException("Failed to parse local data", var17)); } @@ -0,0 +0,0 @@ public class RegistryDataLoader { } @@ -1358,10 +1358,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 ) { return CompletableFuture.supplyAsync(() -> { WritableRegistry writableRegistry = new MappedRegistry<>(type.registryKey(), Lifecycle.experimental()); -@@ -0,0 +0,0 @@ public class ReloadableServerRegistries { + io.papermc.paper.registry.PaperRegistryAccess.instance().registerReloadableRegistry(type.registryKey(), writableRegistry); // Paper - register reloadable registry Map map = new HashMap<>(); - String string = Registries.elementsDirPath(type.registryKey()); - SimpleJsonResourceReloadListener.scanDirectory(resourceManager, string, ops, type.codec(), map); + SimpleJsonResourceReloadListener.scanDirectory(resourceManager, type.registryKey(), ops, type.codec(), map); - map.forEach((id, value) -> writableRegistry.register(ResourceKey.create(type.registryKey(), id), (T)value, DEFAULT_REGISTRATION_INFO)); + map.forEach((id, value) -> io.papermc.paper.registry.PaperRegistryListenerManager.INSTANCE.registerWithListeners(writableRegistry, ResourceKey.create(type.registryKey(), id), value, DEFAULT_REGISTRATION_INFO, conversions)); // Paper - register with listeners TagLoader.loadTagsForRegistry(resourceManager, writableRegistry); 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/Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/unapplied/server/Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/server/Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/unapplied/server/Remove-streams-from-hot-code.patch b/patches/server/Remove-streams-from-hot-code.patch similarity index 100% rename from patches/unapplied/server/Remove-streams-from-hot-code.patch rename to patches/server/Remove-streams-from-hot-code.patch diff --git a/patches/unapplied/server/Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/unapplied/server/Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/unapplied/server/Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/Respect-randomizeData-on-more-entities-when-spawning.patch similarity index 100% rename from patches/unapplied/server/Respect-randomizeData-on-more-entities-when-spawning.patch rename to patches/server/Respect-randomizeData-on-more-entities-when-spawning.patch diff --git a/patches/unapplied/server/Restore-vanilla-entity-drops-behavior.patch b/patches/server/Restore-vanilla-entity-drops-behavior.patch similarity index 100% rename from patches/unapplied/server/Restore-vanilla-entity-drops-behavior.patch rename to patches/server/Restore-vanilla-entity-drops-behavior.patch diff --git a/patches/unapplied/server/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch similarity index 100% rename from patches/unapplied/server/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch rename to patches/server/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch diff --git a/patches/unapplied/server/Sanitize-sent-BlockEntity-NBT.patch b/patches/server/Sanitize-sent-BlockEntity-NBT.patch similarity index 100% rename from patches/unapplied/server/Sanitize-sent-BlockEntity-NBT.patch rename to patches/server/Sanitize-sent-BlockEntity-NBT.patch diff --git a/patches/unapplied/server/SculkCatalyst-bloom-API.patch b/patches/server/SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/unapplied/server/SculkCatalyst-bloom-API.patch rename to patches/server/SculkCatalyst-bloom-API.patch diff --git a/patches/unapplied/server/Send-block-entities-after-destroy-prediction.patch b/patches/server/Send-block-entities-after-destroy-prediction.patch similarity index 90% rename from patches/unapplied/server/Send-block-entities-after-destroy-prediction.patch rename to patches/server/Send-block-entities-after-destroy-prediction.patch index 3ada12acb6..1a9d17e0f7 100644 --- a/patches/unapplied/server/Send-block-entities-after-destroy-prediction.patch +++ b/patches/server/Send-block-entities-after-destroy-prediction.patch @@ -61,15 +61,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- 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 extends ServerCommonPacketListenerImpl - return; - } - // Paper end - Don't allow digging into unloaded chunks + return; + } + // Paper end - Don't allow digging into unloaded chunks + // Paper start - Send block entities after destroy prediction + this.player.gameMode.capturedBlockEntity = false; + this.player.gameMode.captureSentBlockEntities = true; + // Paper end - Send block entities after destroy prediction - this.player.gameMode.handleBlockBreakAction(blockposition, packetplayinblockdig_enumplayerdigtype, packet.getDirection(), this.player.level().getMaxY(), packet.getSequence()); - this.player.connection.ackBlockChangesUpTo(packet.getSequence()); + this.player.gameMode.handleBlockBreakAction(blockposition, packetplayinblockdig_enumplayerdigtype, packet.getDirection(), this.player.level().getMaxY(), packet.getSequence()); + this.player.connection.ackBlockChangesUpTo(packet.getSequence()); + // Paper start - Send block entities after destroy prediction + this.player.gameMode.captureSentBlockEntities = false; + // If a block entity was modified speedup the block change ack to avoid the block entity @@ -86,6 +86,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + } + // Paper end - Send block entities after destroy prediction - return; - default: - throw new IllegalArgumentException("Invalid player action"); + return; + default: + throw new IllegalArgumentException("Invalid player action"); diff --git a/patches/unapplied/server/Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/unapplied/server/Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/unapplied/server/Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/unapplied/server/Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/unapplied/server/Support-old-UUID-format-for-NBT.patch b/patches/server/Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/unapplied/server/Support-old-UUID-format-for-NBT.patch rename to patches/server/Support-old-UUID-format-for-NBT.patch diff --git a/patches/unapplied/server/Suspicious-Effect-Entry-API.patch b/patches/server/Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/unapplied/server/Suspicious-Effect-Entry-API.patch rename to patches/server/Suspicious-Effect-Entry-API.patch diff --git a/patches/unapplied/server/Sync-offhand-slot-in-menus.patch b/patches/server/Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/unapplied/server/Sync-offhand-slot-in-menus.patch rename to patches/server/Sync-offhand-slot-in-menus.patch diff --git a/patches/unapplied/server/Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/unapplied/server/Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/Throw-exception-on-world-create-while-being-ticked.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 100% 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 diff --git a/patches/unapplied/server/Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/Update-entity-data-when-attaching-firework-to-entity.patch similarity index 100% rename from patches/unapplied/server/Update-entity-data-when-attaching-firework-to-entity.patch rename to patches/server/Update-entity-data-when-attaching-firework-to-entity.patch diff --git a/patches/unapplied/server/Use-Velocity-compression-and-cipher-natives.patch b/patches/server/Use-Velocity-compression-and-cipher-natives.patch similarity index 99% rename from patches/unapplied/server/Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/Use-Velocity-compression-and-cipher-natives.patch index c2a16a9476..a484846a52 100644 --- a/patches/unapplied/server/Use-Velocity-compression-and-cipher-natives.patch +++ b/patches/server/Use-Velocity-compression-and-cipher-natives.patch @@ -13,7 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -0,0 +0,0 @@ dependencies { - runtimeOnly("org.xerial:sqlite-jdbc:3.46.1.3") + runtimeOnly("org.xerial:sqlite-jdbc:3.47.0.0") runtimeOnly("com.mysql:mysql-connector-j:9.1.0") runtimeOnly("com.lmax:disruptor:3.4.4") // Paper + // Paper start - Use Velocity cipher diff --git a/patches/unapplied/server/Use-array-for-gamerule-storage.patch b/patches/server/Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/unapplied/server/Use-array-for-gamerule-storage.patch rename to patches/server/Use-array-for-gamerule-storage.patch diff --git a/patches/unapplied/server/Use-correct-seed-on-api-world-load.patch b/patches/server/Use-correct-seed-on-api-world-load.patch similarity index 100% rename from patches/unapplied/server/Use-correct-seed-on-api-world-load.patch rename to patches/server/Use-correct-seed-on-api-world-load.patch diff --git a/patches/unapplied/server/Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/Use-correct-source-for-mushroom-block-spread-event.patch similarity index 100% rename from patches/unapplied/server/Use-correct-source-for-mushroom-block-spread-event.patch rename to patches/server/Use-correct-source-for-mushroom-block-spread-event.patch 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 100% 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 diff --git a/patches/unapplied/server/Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/Validate-ResourceLocation-in-NBT-reading.patch similarity index 97% rename from patches/unapplied/server/Validate-ResourceLocation-in-NBT-reading.patch rename to patches/server/Validate-ResourceLocation-in-NBT-reading.patch index 57f0170f5d..4bd5c4d2e5 100644 --- a/patches/unapplied/server/Validate-ResourceLocation-in-NBT-reading.patch +++ b/patches/server/Validate-ResourceLocation-in-NBT-reading.patch @@ -71,7 +71,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/src/main/java/net/minecraft/world/entity/Leashable.java @@ -0,0 +0,0 @@ public interface Leashable { @Nullable - default Leashable.LeashData readLeashData(CompoundTag nbt) { + private static Leashable.LeashData readLeashDataInternal(CompoundTag nbt) { if (nbt.contains("leash", 10)) { - return new Leashable.LeashData(Either.left(nbt.getCompound("leash").getUUID("UUID"))); + // Paper start @@ -107,14 +107,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -0,0 +0,0 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab - this.leashData = this.readLeashData(nbt); + this.readLeashData(nbt); this.setLeftHanded(nbt.getBoolean("LeftHanded")); if (nbt.contains("DeathLootTable", 8)) { - this.lootTable = Optional.of(ResourceKey.create(Registries.LOOT_TABLE, ResourceLocation.parse(nbt.getString("DeathLootTable")))); -+ this.lootTable = Optional.ofNullable(ResourceLocation.tryParse(nbt.getString("DeathLootTable"))).map((rs) -> ResourceKey.create(Registries.LOOT_TABLE, rs)); // Paper - Validate ResourceLocation - this.lootTableSeed = nbt.getLong("DeathLootTableSeed"); +- } else { +- this.lootTable = Optional.empty(); ++ this.lootTable = Optional.ofNullable(ResourceLocation.tryParse(nbt.getString("DeathLootTable"))).map((rs) -> ResourceKey.create(Registries.LOOT_TABLE, rs)); // Paper - Validate ResourceLocation } else { } + this.lootTableSeed = nbt.getLong("DeathLootTableSeed"); diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java diff --git a/patches/unapplied/server/Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/unapplied/server/Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/Warn-on-plugins-accessing-faraway-chunks.patch 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/add-more-scoreboard-API.patch b/patches/server/add-more-scoreboard-API.patch similarity index 100% rename from patches/unapplied/server/add-more-scoreboard-API.patch rename to patches/server/add-more-scoreboard-API.patch diff --git a/patches/unapplied/server/add-number-format-api.patch b/patches/server/add-number-format-api.patch similarity index 100% rename from patches/unapplied/server/add-number-format-api.patch rename to patches/server/add-number-format-api.patch diff --git a/patches/unapplied/server/check-global-player-list-where-appropriate.patch b/patches/server/check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/unapplied/server/check-global-player-list-where-appropriate.patch rename to patches/server/check-global-player-list-where-appropriate.patch diff --git a/patches/unapplied/server/check-if-itemstack-is-stackable-first.patch b/patches/server/check-if-itemstack-is-stackable-first.patch similarity index 100% rename from patches/unapplied/server/check-if-itemstack-is-stackable-first.patch rename to patches/server/check-if-itemstack-is-stackable-first.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 82% rename from patches/unapplied/server/config-for-disabling-entity-tag-tags.patch rename to patches/server/config-for-disabling-entity-tag-tags.patch index fcf4948927..9ca6c9cc9d 100644 --- a/patches/unapplied/server/config-for-disabling-entity-tag-tags.patch +++ b/patches/server/config-for-disabling-entity-tag-tags.patch @@ -10,8 +10,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java @@ -0,0 +0,0 @@ public class EntityType implements FeatureElement, EntityTypeT - if (minecraftserver != null && entity != null) { - if (world.isClientSide || !entity.onlyOpCanSetNbt() || player != null && minecraftserver.getPlayerList().isOp(player.getGameProfile())) { + if (entity.getType() == entitytypes) { + if (world.isClientSide || !entity.getType().onlyOpCanSetNbt() || player != null && minecraftserver.getPlayerList().isOp(player.getGameProfile())) { + // Paper start - filter out protected tags + if (player == null || !player.getBukkitEntity().hasPermission("minecraft.nbt.place")) { + nbt = nbt.update((compound) -> { @@ -21,7 +21,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + }); + } + // Paper end - filter out protected tags -+ - nbt.loadInto(entity); + nbt.loadInto(entity); + } } - } diff --git a/patches/unapplied/server/disable-forced-empty-world-ticks.patch b/patches/server/disable-forced-empty-world-ticks.patch similarity index 100% rename from patches/unapplied/server/disable-forced-empty-world-ticks.patch rename to patches/server/disable-forced-empty-world-ticks.patch diff --git a/patches/unapplied/server/ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/unapplied/server/ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/unapplied/server/fix-Instruments.patch b/patches/server/fix-Instruments.patch similarity index 100% rename from patches/unapplied/server/fix-Instruments.patch rename to patches/server/fix-Instruments.patch diff --git a/patches/unapplied/server/fix-Jigsaw-block-kicking-user.patch b/patches/server/fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/unapplied/server/fix-Jigsaw-block-kicking-user.patch rename to patches/server/fix-Jigsaw-block-kicking-user.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-entity-vehicle-collision-event-not-called.patch b/patches/server/fix-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/unapplied/server/fix-entity-vehicle-collision-event-not-called.patch rename to patches/server/fix-entity-vehicle-collision-event-not-called.patch diff --git a/patches/unapplied/server/fix-horse-inventories.patch b/patches/server/fix-horse-inventories.patch similarity index 100% rename from patches/unapplied/server/fix-horse-inventories.patch rename to patches/server/fix-horse-inventories.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/improve-BanList-types.patch b/patches/server/improve-BanList-types.patch similarity index 100% rename from patches/unapplied/server/improve-BanList-types.patch rename to patches/server/improve-BanList-types.patch diff --git a/patches/unapplied/server/improve-checking-handled-tags-in-itemmeta.patch b/patches/server/improve-checking-handled-tags-in-itemmeta.patch similarity index 100% rename from patches/unapplied/server/improve-checking-handled-tags-in-itemmeta.patch rename to patches/server/improve-checking-handled-tags-in-itemmeta.patch diff --git a/patches/unapplied/server/optimize-dirt-and-snow-spreading.patch b/patches/server/optimize-dirt-and-snow-spreading.patch similarity index 90% rename from patches/unapplied/server/optimize-dirt-and-snow-spreading.patch rename to patches/server/optimize-dirt-and-snow-spreading.patch index 7d1afb09a9..2d220d6694 100644 --- a/patches/unapplied/server/optimize-dirt-and-snow-spreading.patch +++ b/patches/server/optimize-dirt-and-snow-spreading.patch @@ -55,24 +55,23 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) { return; @@ -0,0 +0,0 @@ public abstract class SpreadingSnowyDirtBlock extends SnowyDirtBlock { - for (int i = 0; i < 4; ++i) { BlockPos blockposition1 = pos.offset(random.nextInt(3) - 1, random.nextInt(5) - 3, random.nextInt(3) - 1); -- + - if (world.getBlockState(blockposition1).is(Blocks.DIRT) && SpreadingSnowyDirtBlock.canPropagate(iblockdata1, world, blockposition1)) { -- org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(world, pos, blockposition1, (BlockState) iblockdata1.setValue(SpreadingSnowyDirtBlock.SNOWY, world.getBlockState(blockposition1.above()).is(Blocks.SNOW))); // CraftBukkit + // Paper start - Perf: optimize dirt and snow spreading + if (pos.getX() == blockposition1.getX() && pos.getY() == blockposition1.getY() && pos.getZ() == blockposition1.getZ()) { + continue; + } -+ net.minecraft.world.level.chunk.ChunkAccess access; ++ ++ final net.minecraft.world.level.chunk.ChunkAccess access; + if (cachedBlockChunk.locX == blockposition1.getX() >> 4 && cachedBlockChunk.locZ == blockposition1.getZ() >> 4) { + access = cachedBlockChunk; + } else { + access = world.getChunkAt(blockposition1); + } + if (access.getBlockState(blockposition1).is(Blocks.DIRT) && SpreadingSnowyDirtBlock.canPropagate(access, iblockdata1, world, blockposition1)) { -+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(world, pos, blockposition1, (BlockState) iblockdata1.setValue(SpreadingSnowyDirtBlock.SNOWY, access.getBlockState(blockposition1.above()).is(Blocks.SNOW))); // CraftBukkit + org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(world, pos, blockposition1, (BlockState) iblockdata1.setValue(SpreadingSnowyDirtBlock.SNOWY, isSnowySetting(world.getBlockState(blockposition1.above())))); // CraftBukkit + // Paper end - Perf: optimize dirt and snow spreading } } diff --git a/patches/unapplied/server/use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/unapplied/server/use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/unapplied/server/Add-PlayerPickItemEvent.patch b/patches/unapplied/server/Add-PlayerPickItemEvent.patch deleted file mode 100644 index a041c9e064..0000000000 --- a/patches/unapplied/server/Add-PlayerPickItemEvent.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: RodneyMKay <36546810+RodneyMKay@users.noreply.github.com> -Date: Wed, 8 Sep 2021 21:34:01 +0200 -Subject: [PATCH] Add PlayerPickItemEvent - - -diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -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 extends ServerCommonPacketListenerImpl - this.disconnect(Component.literal("Invalid hotbar selection (Hacking?)"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause - return; - } -- this.player.getInventory().pickSlot(packet.getSlot()); // Paper - Diff above if changed -+ // Paper start - Add PlayerPickItemEvent -+ // this.player.getInventory().pickSlot(packet.getSlot()); // Paper - Diff above if changed - moved down -+ Player bukkitPlayer = this.player.getBukkitEntity(); -+ int targetSlot = this.player.getInventory().getSuitableHotbarSlot(); -+ int sourceSlot = packet.getSlot(); -+ -+ io.papermc.paper.event.player.PlayerPickItemEvent event = new io.papermc.paper.event.player.PlayerPickItemEvent(bukkitPlayer, targetSlot, sourceSlot); -+ if (!event.callEvent()) return; -+ // Paper end - Add PlayerPickItemEvent -+ -+ this.player.getInventory().pickSlot(event.getSourceSlot(), event.getTargetSlot()); // Paper - Add PlayerPickItemEvent - // Paper end - validate pick item position - int i = this.player.getInventory().selected; - -diff --git a/src/main/java/net/minecraft/world/entity/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/entity/player/Inventory.java -+++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java -@@ -0,0 +0,0 @@ public class Inventory implements Container, Nameable { - } - - public void pickSlot(int slot) { -- this.selected = this.getSuitableHotbarSlot(); -+ // Paper start - Add PlayerPickItemEvent -+ pickSlot(slot, this.getSuitableHotbarSlot()); -+ } -+ -+ public void pickSlot(int slot, int targetSlot) { -+ this.selected = targetSlot; -+ // Paper end - Add PlayerPickItemEvent - ItemStack itemstack = (ItemStack) this.items.get(this.selected); - - this.items.set(this.selected, (ItemStack) this.items.get(slot));