From e4602b6d4808090149c6d5d7567134c308f05e11 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 15 Mar 2020 20:03:36 +0000
Subject: [PATCH] Drop
 Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch

This patch appears to be no longer relevant, and is seemingly a leading
cause of datapack performance being horrific
---
 ...blocking-on-Network-Manager-creation.patch |  7 ++--
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |  4 +--
 ...ecipes-in-RecipeBook-to-avoid-data-e.patch | 36 -------------------
 ...patch => 0233-PlayerReadyArrowEvent.patch} |  6 ++--
 ...-EntityShootBowEvent-for-Illusioner.patch} |  4 +--
 ...lement-EntityKnockbackByEntityEvent.patch} |  4 +--
 ...patch => 0236-Expand-Explosions-API.patch} |  6 ++--
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  8 ++---
 ...-API.patch => 0238-RangedEntity-API.patch} |  4 +--
 ...o-disable-ender-dragon-legacy-check.patch} |  4 +--
 ...-Implement-World.getEntity-UUID-API.patch} |  6 ++--
 ...0241-InventoryCloseEvent-Reason-API.patch} | 20 +++++------
 ...0242-Configurable-Bed-Search-Radius.patch} |  4 +--
 ...I.patch => 0243-Vex-getSummoner-API.patch} |  4 +--
 ...ventory-when-cancelling-PlayerInter.patch} |  4 +--
 ...e-the-Entity-Random-seed-for-squids.patch} |  4 +--
 ...illa-entity-warnings-for-duplicates.patch} |  6 ++--
 ...-if-stack-size-above-max-stack-size.patch} |  6 ++--
 ...48-Use-asynchronous-Log4j-2-loggers.patch} |  6 ++--
 ...more-information-to-Entity.toString.patch} |  6 ++--
 ...es-option-to-debug-dupe-uuid-issues.patch} | 12 +++----
 ...ts.patch => 0251-EnderDragon-Events.patch} |  4 +--
 ...atch => 0252-PlayerElytraBoostEvent.patch} |  4 +--
 ...Speedup-BlockPos-by-fixing-inlining.patch} |  8 ++---
 ...patch => 0254-Optimize-RegistryID.c.patch} |  4 +--
 ...-armor-stands-from-doing-entity-loo.patch} |  4 +--
 ...-Vanished-players-don-t-have-rights.patch} |  4 +--
 ...anytime-entities-change-to-guarante.patch} |  4 +--
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |  6 ++--
 ...atch => 0259-EntityTransformedEvent.patch} |  4 +--
 ...tch => 0260-SkeletonHorse-Additions.patch} |  4 +--
 ...event-Saving-Bad-entities-to-chunks.patch} |  4 +--
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  4 +--
 ...ad-Entities-in-entityList-iteration.patch} | 14 ++++----
 ...64-MC-111480-Start-Entity-ID-s-at-1.patch} |  6 ++--
 ...5-Implement-Expanded-ArmorStand-API.patch} |  4 +--
 ...vent.patch => 0266-AnvilDamageEvent.patch} |  4 +--
 ...ent.patch => 0267-Add-TNTPrimeEvent.patch} |  6 ++--
 ...d-make-tab-spam-limits-configurable.patch} |  6 ++--
 ...h => 0269-Add-hand-to-bucket-events.patch} |  4 +--
 ...-Experience-should-save-as-Integers.patch} |  4 +--
 ...ent-rendering-skulls-from-same-user.patch} |  6 ++--
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  4 +--
 ...0273-Make-EnderDragon-implement-Mob.patch} |  4 +--
 ...4-Use-ConcurrentHashMap-in-JsonList.patch} |  4 +--
 ...5-Use-a-Queue-for-Queueing-Commands.patch} |  6 ++--
 ...le-Entities-from-a-chunk-without-sn.patch} |  4 +--
 ...llow-disabling-armour-stand-ticking.patch} |  4 +--
 ...timize-BlockPosition-helper-methods.patch} |  6 ++--
 ...ts-from-world-player-list-not-serve.patch} |  4 +--
 ...tore-vanlla-default-mob-spawn-range.patch} |  6 ++--
 ...81-Optimize-CraftBlockData-Creation.patch} |  6 ++--
 ...-124320.patch => 0282-Fix-MC-124320.patch} |  6 ++--
 ...tch => 0283-Slime-Pathfinder-Events.patch} |  4 +--
 ...e-speed-for-water-flowing-over-lava.patch} |  4 +--
 ... => 0285-Optimize-RegistryMaterials.patch} |  4 +--
 ...ch => 0286-Add-PhantomPreSpawnEvent.patch} |  4 +--
 ....patch => 0287-Add-More-Creeper-API.patch} |  4 +--
 ...=> 0288-Inventory-removeItemAnySlot.patch} |  4 +--
 ...oadChunk-int-int-false-load-unconve.patch} |  6 ++--
 ...ray-tracing-methods-to-LivingEntity.patch} |  8 ++---
 ...-attack-cooldown-methods-for-Player.patch} |  8 ++---
 ....patch => 0292-Improve-death-events.patch} | 24 ++++++-------
 ...w-chests-to-be-placed-with-NBT-data.patch} |  6 ++--
 ...I.patch => 0294-Mob-Pathfinding-API.patch} |  6 ++--
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |  4 +--
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |  8 ++---
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |  4 +--
 ...ning-from-loading-generating-chunks.patch} |  4 +--
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  4 +--
 ...t-furnace-cook-speed-multiplier-API.patch} |  4 +--
 ...0301-Support-Overriding-World-Seeds.patch} |  4 +--
 ...h => 0302-Optimize-Server-World-Map.patch} |  4 +--
 ....patch => 0303-PreSpawnerSpawnEvent.patch} |  6 ++--
 ...rseException-in-Entity-and-TE-names.patch} | 14 ++++----
 ... 0305-Avoid-dimension-id-collisions.patch} |  4 +--
 ...=> 0306-Honor-EntityAgeable.ageLock.patch} |  4 +--
 ...le-connection-throttle-kick-message.patch} |  4 +--
 ...> 0308-Hook-into-CB-plugin-rewrites.patch} |  6 ++--
 ...09-Allow-setting-the-vex-s-summoner.patch} |  4 +--
 ...I.patch => 0310-Add-sun-related-API.patch} | 10 +++---
 ...wned-for-Villager-Aggression-Config.patch} |  4 +--
 ...-Johnny.patch => 0312-Here-s-Johnny.patch} |  4 +--
 ...Turtle-API.patch => 0313-Turtle-API.patch} |  4 +--
 ...it-lightning-strike-effect-distance.patch} | 10 +++---
 ...her-worlds-for-shooter-of-projectil.patch} |  4 +--
 ...Call-player-spectator-target-events.patch} |  6 ++--
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  6 ++--
 ...PI.patch => 0318-Add-more-Witch-API.patch} |  4 +--
 ...MC-93764.patch => 0319-Fix-MC-93764.patch} |  4 +--
 ...vent-players-from-moving-into-unloa.patch} |  6 ++--
 ...1-Reset-players-airTicks-on-respawn.patch} |  8 ++---
 ...after-profile-lookups-if-not-needed.patch} |  4 +--
 ...le-thread-count-default-for-bootstr.patch} |  4 +--
 ...=> 0324-Optimize-World-Time-Updates.patch} |  4 +--
 ...tore-custom-InventoryHolder-support.patch} |  4 +--
 ...=> 0326-Use-Vanilla-Minecart-Speeds.patch} |  4 +--
 ...0327-Fix-SpongeAbsortEvent-handling.patch} |  4 +--
 ...-allow-digging-into-unloaded-chunks.patch} |  4 +--
 ...=> 0329-Optimize-redstone-algorithm.patch} |  4 +--
 ...ntity-dismount-during-teleportation.patch} | 12 +++----
 ...mits.patch => 0331-Book-Size-Limits.patch} |  4 +--
 ...ult-permission-message-configurable.patch} |  4 +--
 ...I.patch => 0333-Add-more-Zombie-API.patch} | 10 +++---
 ...revent-rayTrace-from-loading-chunks.patch} |  4 +--
 ...-Large-Packets-disconnecting-client.patch} |  4 +--
 ...world-storage-in-CraftOfflinePlayer.patch} |  4 +--
 ...0337-Add-PlayerConnectionCloseEvent.patch} |  4 +--
 ...revent-Enderman-from-loading-chunks.patch} |  4 +--
 ...replace-OfflinePlayer-getLastPlayed.patch} | 12 +++----
 ...tch => 0340-Fix-PlayerEditBookEvent.patch} |  4 +--
 ...ehicle-tracking-issue-on-disconnect.patch} |  6 ++--
 ...nRetractEvent-for-all-empty-pistons.patch} |  4 +--
 ...remove-from-being-called-on-Players.patch} |  6 ++--
 ...ent.patch => 0344-BlockDestroyEvent.patch} |  4 +--
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |  4 +--
 ...h => 0346-Fix-sign-edit-memory-leak.patch} |  4 +--
 ... 0347-Limit-Client-Sign-length-more.patch} |  4 +--
 ...onvertSigns-boolean-every-sign-save.patch} |  4 +--
 ...Signs-in-Chunks-creating-too-large-.patch} |  4 +--
 ...-Fix-Whitelist-On-Off-inconsistency.patch} |  4 +--
 ...t-tick-at-start-of-drowning-process.patch} |  4 +--
 ...52-Allow-Saving-of-Oversized-Chunks.patch} |  4 +--
 ...ggleEvent-when-whitelist-is-toggled.patch} |  4 +--
 ...54-Add-LivingEntity-getTargetEntity.patch} | 14 ++++----
 ...ngth-when-serialising-BungeeCord-te.patch} |  4 +--
 ...=> 0356-Entity-getEntitySpawnReason.patch} | 12 +++----
 ...ty-Metadata-for-all-tracked-players.patch} |  4 +--
 ...tch => 0358-Fire-event-on-GS4-query.patch} |  4 +--
 ...59-Implement-PlayerPostRespawnEvent.patch} |  4 +--
 ...for-pickupDelay-breaks-picking-up-i.patch} |  4 +--
 ...-and-setters-for-EntityItem-owner-a.patch} |  4 +--
 ...ts.patch => 0362-Server-Tick-Events.patch} |  4 +--
 ...363-PlayerDeathEvent-getItemsToKeep.patch} |  6 ++--
 ...Optimize-Captured-TileEntity-Lookup.patch} |  4 +--
 ...API.patch => 0365-Add-Heightmap-API.patch} |  4 +--
 ...> 0366-Mob-Spawner-API-Enhancements.patch} |  8 ++---
 ...ayer-View-Distance-API-placeholders.patch} | 10 +++---
 ...-to-changed-postToMainThread-method.patch} |  4 +--
 ...-item-frames-are-modified-MC-123450.patch} |  4 +--
 ...sPrimaryThread-and-MinecraftServer-.patch} |  4 +--
 ...-entity-loss-due-to-unloaded-chunks.patch} |  4 +--
 ... 0372-Duplicate-UUID-Resolve-Option.patch} | 14 ++++----
 ...73-improve-CraftWorld-isChunkLoaded.patch} |  6 ++--
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  6 ++--
 ...-some-generation-concurrency-issues.patch} |  4 +--
 ...ityAreaEffectCloud-from-going-negat.patch} |  4 +--
 ....patch => 0377-ChunkMapDistance-CME.patch} |  4 +--
 ...0378-Implement-CraftBlockSoundGroup.patch} |  4 +--
 ...d.patch => 0379-Chunk-debug-command.patch} | 10 +++---
 ...ch => 0380-incremental-chunk-saving.patch} |  6 ++--
 ...ptions-from-dispenser-entity-spawns.patch} |  4 +--
 ...82-Fix-World-isChunkGenerated-calls.patch} | 12 +++----
 ...te-location-if-we-failed-to-read-it.patch} |  4 +--
 ...ad-in-DataPaletteBlock-lock-failure.patch} |  4 +--
 ...tatus-cache-when-saving-protochunks.patch} |  6 ++--
 ...7-Anti-Xray.patch => 0386-Anti-Xray.patch} |  4 +--
 ...l-Spawned-mobs-towards-natural-spaw.patch} |  4 +--
 ...urable-projectile-relative-velocity.patch} |  4 +--
 ...being-ticked-when-notifying-navigat.patch} |  4 +--
 ...h => 0390-offset-item-frame-ticking.patch} |  4 +--
 ...pper-searches-if-there-are-no-items.patch} |  6 ++--
 ...2-Asynchronous-chunk-IO-and-loading.patch} |  4 +--
 ...tChunkIfLoadedImmediately-in-places.patch} |  4 +--
 ...ads.patch => 0394-Reduce-sync-loads.patch} |  4 +--
 ...ement-alternative-item-despawn-rate.patch} |  4 +--
 ...f-we-have-a-custom-Bukkit-generator.patch} |  4 +--
 ...-158900.patch => 0397-Fix-MC-158900.patch} |  4 +--
 ...ment-optional-per-player-mob-spawns.patch} |  4 +--
 ...event-consuming-the-wrong-itemstack.patch} |  4 +--
 ...ssanger-entities-once-from-spawners.patch} |  6 ++--
 ... => 0401-Fix-nether-portal-creation.patch} |  4 +--
 ...gs.patch => 0402-Generator-Settings.patch} |  4 +--
 ...o-tick-instant-grow-farms-MC-113809.patch} |  4 +--
 ...-161754.patch => 0404-Fix-MC-161754.patch} |  4 +--
 ...e-improvement-for-Chunk.getEntities.patch} |  4 +--
 ...anging-entities-that-are-not-ItemFr.patch} |  6 ++--
 ...07-Expose-the-internal-current-tick.patch} |  4 +--
 ...sneak-when-changing-worlds-MC-10657.patch} |  8 ++---
 ...-option-to-disable-pillager-patrols.patch} |  4 +--
 ...r-when-player-hand-set-to-empty-typ.patch} |  4 +--
 ...=> 0411-PlayerLaunchProjectileEvent.patch} |  4 +--
 ...tMagicNumbers.isSupportedApiVersion.patch} |  4 +--
 ...k-loads-when-villagers-try-to-find-.patch} |  4 +--
 ...Fix-spawn-radius-being-treated-as-0.patch} |  6 ++--
 ...656-Fix-Follow-Range-Initial-Target.patch} |  4 +--
 ...pers.patch => 0416-Optimize-Hoppers.patch} |  4 +--
 ...ayerDeathEvent-shouldDropExperience.patch} |  6 ++--
 ...ading-chunks-checking-hive-position.patch} |  4 +--
 ...hunks-from-Hoppers-and-other-things.patch} |  4 +--
 ...ializing-mismatching-chunk-coordina.patch} |  4 +--
 ...imise-IEntityAccess-getPlayerByUUID.patch} |  4 +--
 ...422-Fix-items-not-falling-correctly.patch} |  4 +--
 ...patch => 0423-Lag-compensate-eating.patch} |  4 +--
 ...ize-call-to-getFluid-for-explosions.patch} |  4 +--
 ...-in-stack-not-having-effects-when-d.patch} |  4 +--
 ... 0426-Activation-Range-Improvements.patch} | 24 ++++++-------
 ...Add-effect-to-block-break-naturally.patch} |  4 +--
 ...=> 0428-Tracking-Range-Improvements.patch} |  4 +--
 ...tor-behavior-for-EntityPhanton-goal.patch} |  4 +--
 ...-items-vanishing-through-end-portal.patch} |  6 ++--
 ...h => 0431-Seed-based-feature-search.patch} |  4 +--
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |  4 +--
 ...-getChunkAt-calls-for-loaded-chunks.patch} |  4 +--
 ...more-tolerant-of-invalid-attributes.patch} |  4 +--
 ...w-overriding-the-java-version-check.patch} |  6 ++--
 ...tch => 0436-Add-ThrownEggHatchEvent.patch} |  4 +--
 ... 0437-Optimise-random-block-ticking.patch} |  4 +--
 ...p-API.patch => 0438-Entity-Jump-API.patch} | 10 +++---
 ...-to-nerf-pigmen-from-nether-portals.patch} | 10 +++---
 ...0440-fix-blockstate-capture-undoing.patch} |  4 +--
 ... => 0441-Make-the-GUI-graph-fancier.patch} |  4 +--
 ... => 0442-Backport-fix-for-MC-167561.patch} |  6 ++--
 ...43-add-hand-to-BlockMultiPlaceEvent.patch} |  4 +--
 ...4-Prevent-teleporting-dead-entities.patch} |  4 +--
 ...ipwire-hook-placement-before-update.patch} |  4 +--
 ...o-allow-iron-golems-to-spawn-in-air.patch} |  4 +--
 ...chance-of-villager-zombie-infection.patch} |  4 +--
 ...-BlockRedstoneEvent-for-fence-gates.patch} |  6 ++--
 219 files changed, 584 insertions(+), 619 deletions(-)
 rename Spigot-Server-Patches/{0233-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (98%)
 delete mode 100644 Spigot-Server-Patches/0232-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
 rename Spigot-Server-Patches/{0234-PlayerReadyArrowEvent.patch => 0233-PlayerReadyArrowEvent.patch} (94%)
 rename Spigot-Server-Patches/{0235-Fire-EntityShootBowEvent-for-Illusioner.patch => 0234-Fire-EntityShootBowEvent-for-Illusioner.patch} (94%)
 rename Spigot-Server-Patches/{0236-Implement-EntityKnockbackByEntityEvent.patch => 0235-Implement-EntityKnockbackByEntityEvent.patch} (94%)
 rename Spigot-Server-Patches/{0237-Expand-Explosions-API.patch => 0236-Expand-Explosions-API.patch} (92%)
 rename Spigot-Server-Patches/{0238-LivingEntity-Hand-Raised-Item-Use-API.patch => 0237-LivingEntity-Hand-Raised-Item-Use-API.patch} (93%)
 rename Spigot-Server-Patches/{0239-RangedEntity-API.patch => 0238-RangedEntity-API.patch} (98%)
 rename Spigot-Server-Patches/{0240-Add-config-to-disable-ender-dragon-legacy-check.patch => 0239-Add-config-to-disable-ender-dragon-legacy-check.patch} (96%)
 rename Spigot-Server-Patches/{0241-Implement-World.getEntity-UUID-API.patch => 0240-Implement-World.getEntity-UUID-API.patch} (89%)
 rename Spigot-Server-Patches/{0242-InventoryCloseEvent-Reason-API.patch => 0241-InventoryCloseEvent-Reason-API.patch} (96%)
 rename Spigot-Server-Patches/{0243-Configurable-Bed-Search-Radius.patch => 0242-Configurable-Bed-Search-Radius.patch} (98%)
 rename Spigot-Server-Patches/{0244-Vex-getSummoner-API.patch => 0243-Vex-getSummoner-API.patch} (95%)
 rename Spigot-Server-Patches/{0245-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (94%)
 rename Spigot-Server-Patches/{0246-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0245-Don-t-change-the-Entity-Random-seed-for-squids.patch} (90%)
 rename Spigot-Server-Patches/{0247-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0246-Re-add-vanilla-entity-warnings-for-duplicates.patch} (91%)
 rename Spigot-Server-Patches/{0248-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (89%)
 rename Spigot-Server-Patches/{0249-Use-asynchronous-Log4j-2-loggers.patch => 0248-Use-asynchronous-Log4j-2-loggers.patch} (94%)
 rename Spigot-Server-Patches/{0250-add-more-information-to-Entity.toString.patch => 0249-add-more-information-to-Entity.toString.patch} (92%)
 rename Spigot-Server-Patches/{0251-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (96%)
 rename Spigot-Server-Patches/{0252-EnderDragon-Events.patch => 0251-EnderDragon-Events.patch} (97%)
 rename Spigot-Server-Patches/{0253-PlayerElytraBoostEvent.patch => 0252-PlayerElytraBoostEvent.patch} (95%)
 rename Spigot-Server-Patches/{0254-Speedup-BlockPos-by-fixing-inlining.patch => 0253-Speedup-BlockPos-by-fixing-inlining.patch} (98%)
 rename Spigot-Server-Patches/{0255-Optimize-RegistryID.c.patch => 0254-Optimize-RegistryID.c.patch} (96%)
 rename Spigot-Server-Patches/{0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (96%)
 rename Spigot-Server-Patches/{0257-Vanished-players-don-t-have-rights.patch => 0256-Vanished-players-don-t-have-rights.patch} (99%)
 rename Spigot-Server-Patches/{0258-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (93%)
 rename Spigot-Server-Patches/{0259-Add-some-Debug-to-Chunk-Entity-slices.patch => 0258-Add-some-Debug-to-Chunk-Entity-slices.patch} (96%)
 rename Spigot-Server-Patches/{0260-EntityTransformedEvent.patch => 0259-EntityTransformedEvent.patch} (98%)
 rename Spigot-Server-Patches/{0261-SkeletonHorse-Additions.patch => 0260-SkeletonHorse-Additions.patch} (97%)
 rename Spigot-Server-Patches/{0262-Prevent-Saving-Bad-entities-to-chunks.patch => 0261-Prevent-Saving-Bad-entities-to-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0263-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0262-Don-t-call-getItemMeta-on-hasItemMeta.patch} (97%)
 rename Spigot-Server-Patches/{0264-Ignore-Dead-Entities-in-entityList-iteration.patch => 0263-Ignore-Dead-Entities-in-entityList-iteration.patch} (96%)
 rename Spigot-Server-Patches/{0265-MC-111480-Start-Entity-ID-s-at-1.patch => 0264-MC-111480-Start-Entity-ID-s-at-1.patch} (90%)
 rename Spigot-Server-Patches/{0266-Implement-Expanded-ArmorStand-API.patch => 0265-Implement-Expanded-ArmorStand-API.patch} (98%)
 rename Spigot-Server-Patches/{0267-AnvilDamageEvent.patch => 0266-AnvilDamageEvent.patch} (95%)
 rename Spigot-Server-Patches/{0268-Add-TNTPrimeEvent.patch => 0267-Add-TNTPrimeEvent.patch} (98%)
 rename Spigot-Server-Patches/{0269-Break-up-and-make-tab-spam-limits-configurable.patch => 0268-Break-up-and-make-tab-spam-limits-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0270-Add-hand-to-bucket-events.patch => 0269-Add-hand-to-bucket-events.patch} (99%)
 rename Spigot-Server-Patches/{0271-MC-135506-Experience-should-save-as-Integers.patch => 0270-MC-135506-Experience-should-save-as-Integers.patch} (94%)
 rename Spigot-Server-Patches/{0272-Fix-client-rendering-skulls-from-same-user.patch => 0271-Fix-client-rendering-skulls-from-same-user.patch} (97%)
 rename Spigot-Server-Patches/{0273-Add-Early-Warning-Feature-to-WatchDog.patch => 0272-Add-Early-Warning-Feature-to-WatchDog.patch} (99%)
 rename Spigot-Server-Patches/{0274-Make-EnderDragon-implement-Mob.patch => 0273-Make-EnderDragon-implement-Mob.patch} (94%)
 rename Spigot-Server-Patches/{0275-Use-ConcurrentHashMap-in-JsonList.patch => 0274-Use-ConcurrentHashMap-in-JsonList.patch} (98%)
 rename Spigot-Server-Patches/{0276-Use-a-Queue-for-Queueing-Commands.patch => 0275-Use-a-Queue-for-Queueing-Commands.patch} (94%)
 rename Spigot-Server-Patches/{0277-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (94%)
 rename Spigot-Server-Patches/{0278-Allow-disabling-armour-stand-ticking.patch => 0277-Allow-disabling-armour-stand-ticking.patch} (99%)
 rename Spigot-Server-Patches/{0279-Optimize-BlockPosition-helper-methods.patch => 0278-Optimize-BlockPosition-helper-methods.patch} (97%)
 rename Spigot-Server-Patches/{0280-Send-nearby-packets-from-world-player-list-not-serve.patch => 0279-Send-nearby-packets-from-world-player-list-not-serve.patch} (98%)
 rename Spigot-Server-Patches/{0281-Restore-vanlla-default-mob-spawn-range.patch => 0280-Restore-vanlla-default-mob-spawn-range.patch} (85%)
 rename Spigot-Server-Patches/{0282-Optimize-CraftBlockData-Creation.patch => 0281-Optimize-CraftBlockData-Creation.patch} (95%)
 rename Spigot-Server-Patches/{0283-Fix-MC-124320.patch => 0282-Fix-MC-124320.patch} (96%)
 rename Spigot-Server-Patches/{0284-Slime-Pathfinder-Events.patch => 0283-Slime-Pathfinder-Events.patch} (98%)
 rename Spigot-Server-Patches/{0285-Configurable-speed-for-water-flowing-over-lava.patch => 0284-Configurable-speed-for-water-flowing-over-lava.patch} (97%)
 rename Spigot-Server-Patches/{0286-Optimize-RegistryMaterials.patch => 0285-Optimize-RegistryMaterials.patch} (94%)
 rename Spigot-Server-Patches/{0287-Add-PhantomPreSpawnEvent.patch => 0286-Add-PhantomPreSpawnEvent.patch} (98%)
 rename Spigot-Server-Patches/{0288-Add-More-Creeper-API.patch => 0287-Add-More-Creeper-API.patch} (96%)
 rename Spigot-Server-Patches/{0289-Inventory-removeItemAnySlot.patch => 0288-Inventory-removeItemAnySlot.patch} (96%)
 rename Spigot-Server-Patches/{0290-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (91%)
 rename Spigot-Server-Patches/{0291-Add-ray-tracing-methods-to-LivingEntity.patch => 0290-Add-ray-tracing-methods-to-LivingEntity.patch} (96%)
 rename Spigot-Server-Patches/{0292-Expose-attack-cooldown-methods-for-Player.patch => 0291-Expose-attack-cooldown-methods-for-Player.patch} (93%)
 rename Spigot-Server-Patches/{0293-Improve-death-events.patch => 0292-Improve-death-events.patch} (98%)
 rename Spigot-Server-Patches/{0294-Allow-chests-to-be-placed-with-NBT-data.patch => 0293-Allow-chests-to-be-placed-with-NBT-data.patch} (92%)
 rename Spigot-Server-Patches/{0295-Mob-Pathfinding-API.patch => 0294-Mob-Pathfinding-API.patch} (98%)
 rename Spigot-Server-Patches/{0296-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0295-Prevent-chunk-loading-from-Fluid-Flowing.patch} (98%)
 rename Spigot-Server-Patches/{0297-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (99%)
 rename Spigot-Server-Patches/{0298-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (98%)
 rename Spigot-Server-Patches/{0299-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0298-Prevent-mob-spawning-from-loading-generating-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0300-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (97%)
 rename Spigot-Server-Patches/{0301-Implement-furnace-cook-speed-multiplier-API.patch => 0300-Implement-furnace-cook-speed-multiplier-API.patch} (97%)
 rename Spigot-Server-Patches/{0302-Support-Overriding-World-Seeds.patch => 0301-Support-Overriding-World-Seeds.patch} (98%)
 rename Spigot-Server-Patches/{0303-Optimize-Server-World-Map.patch => 0302-Optimize-Server-World-Map.patch} (99%)
 rename Spigot-Server-Patches/{0304-PreSpawnerSpawnEvent.patch => 0303-PreSpawnerSpawnEvent.patch} (93%)
 rename Spigot-Server-Patches/{0305-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0304-Catch-JsonParseException-in-Entity-and-TE-names.patch} (94%)
 rename Spigot-Server-Patches/{0306-Avoid-dimension-id-collisions.patch => 0305-Avoid-dimension-id-collisions.patch} (94%)
 rename Spigot-Server-Patches/{0307-Honor-EntityAgeable.ageLock.patch => 0306-Honor-EntityAgeable.ageLock.patch} (89%)
 rename Spigot-Server-Patches/{0308-Configurable-connection-throttle-kick-message.patch => 0307-Configurable-connection-throttle-kick-message.patch} (96%)
 rename Spigot-Server-Patches/{0309-Hook-into-CB-plugin-rewrites.patch => 0308-Hook-into-CB-plugin-rewrites.patch} (98%)
 rename Spigot-Server-Patches/{0310-Allow-setting-the-vex-s-summoner.patch => 0309-Allow-setting-the-vex-s-summoner.patch} (94%)
 rename Spigot-Server-Patches/{0311-Add-sun-related-API.patch => 0310-Add-sun-related-API.patch} (91%)
 rename Spigot-Server-Patches/{0312-Check-Drowned-for-Villager-Aggression-Config.patch => 0311-Check-Drowned-for-Villager-Aggression-Config.patch} (94%)
 rename Spigot-Server-Patches/{0313-Here-s-Johnny.patch => 0312-Here-s-Johnny.patch} (95%)
 rename Spigot-Server-Patches/{0314-Turtle-API.patch => 0313-Turtle-API.patch} (98%)
 rename Spigot-Server-Patches/{0315-Limit-lightning-strike-effect-distance.patch => 0314-Limit-lightning-strike-effect-distance.patch} (96%)
 rename Spigot-Server-Patches/{0316-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (95%)
 rename Spigot-Server-Patches/{0317-Call-player-spectator-target-events.patch => 0316-Call-player-spectator-target-events.patch} (96%)
 rename Spigot-Server-Patches/{0318-Add-Velocity-IP-Forwarding-Support.patch => 0317-Add-Velocity-IP-Forwarding-Support.patch} (99%)
 rename Spigot-Server-Patches/{0319-Add-more-Witch-API.patch => 0318-Add-more-Witch-API.patch} (98%)
 rename Spigot-Server-Patches/{0320-Fix-MC-93764.patch => 0319-Fix-MC-93764.patch} (88%)
 rename Spigot-Server-Patches/{0321-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0320-Add-option-to-prevent-players-from-moving-into-unloa.patch} (97%)
 rename Spigot-Server-Patches/{0322-Reset-players-airTicks-on-respawn.patch => 0321-Reset-players-airTicks-on-respawn.patch} (88%)
 rename Spigot-Server-Patches/{0323-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0322-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (95%)
 rename Spigot-Server-Patches/{0324-Use-more-reasonable-thread-count-default-for-bootstr.patch => 0323-Use-more-reasonable-thread-count-default-for-bootstr.patch} (92%)
 rename Spigot-Server-Patches/{0325-Optimize-World-Time-Updates.patch => 0324-Optimize-World-Time-Updates.patch} (97%)
 rename Spigot-Server-Patches/{0326-Restore-custom-InventoryHolder-support.patch => 0325-Restore-custom-InventoryHolder-support.patch} (96%)
 rename Spigot-Server-Patches/{0327-Use-Vanilla-Minecart-Speeds.patch => 0326-Use-Vanilla-Minecart-Speeds.patch} (94%)
 rename Spigot-Server-Patches/{0328-Fix-SpongeAbsortEvent-handling.patch => 0327-Fix-SpongeAbsortEvent-handling.patch} (96%)
 rename Spigot-Server-Patches/{0329-Don-t-allow-digging-into-unloaded-chunks.patch => 0328-Don-t-allow-digging-into-unloaded-chunks.patch} (94%)
 rename Spigot-Server-Patches/{0330-Optimize-redstone-algorithm.patch => 0329-Optimize-redstone-algorithm.patch} (99%)
 rename Spigot-Server-Patches/{0331-force-entity-dismount-during-teleportation.patch => 0330-force-entity-dismount-during-teleportation.patch} (96%)
 rename Spigot-Server-Patches/{0332-Book-Size-Limits.patch => 0331-Book-Size-Limits.patch} (98%)
 rename Spigot-Server-Patches/{0333-Make-the-default-permission-message-configurable.patch => 0332-Make-the-default-permission-message-configurable.patch} (96%)
 rename Spigot-Server-Patches/{0334-Add-more-Zombie-API.patch => 0333-Add-more-Zombie-API.patch} (96%)
 rename Spigot-Server-Patches/{0335-Prevent-rayTrace-from-loading-chunks.patch => 0334-Prevent-rayTrace-from-loading-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0336-Handle-Large-Packets-disconnecting-client.patch => 0335-Handle-Large-Packets-disconnecting-client.patch} (98%)
 rename Spigot-Server-Patches/{0337-Lazy-init-world-storage-in-CraftOfflinePlayer.patch => 0336-Lazy-init-world-storage-in-CraftOfflinePlayer.patch} (97%)
 rename Spigot-Server-Patches/{0338-Add-PlayerConnectionCloseEvent.patch => 0337-Add-PlayerConnectionCloseEvent.patch} (98%)
 rename Spigot-Server-Patches/{0339-Prevent-Enderman-from-loading-chunks.patch => 0338-Prevent-Enderman-from-loading-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0340-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0339-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (96%)
 rename Spigot-Server-Patches/{0341-Fix-PlayerEditBookEvent.patch => 0340-Fix-PlayerEditBookEvent.patch} (96%)
 rename Spigot-Server-Patches/{0342-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0341-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (89%)
 rename Spigot-Server-Patches/{0343-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0342-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (97%)
 rename Spigot-Server-Patches/{0344-Block-Entity-remove-from-being-called-on-Players.patch => 0343-Block-Entity-remove-from-being-called-on-Players.patch} (92%)
 rename Spigot-Server-Patches/{0345-BlockDestroyEvent.patch => 0344-BlockDestroyEvent.patch} (96%)
 rename Spigot-Server-Patches/{0346-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0345-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (97%)
 rename Spigot-Server-Patches/{0347-Fix-sign-edit-memory-leak.patch => 0346-Fix-sign-edit-memory-leak.patch} (96%)
 rename Spigot-Server-Patches/{0348-Limit-Client-Sign-length-more.patch => 0347-Limit-Client-Sign-length-more.patch} (97%)
 rename Spigot-Server-Patches/{0349-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0348-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (94%)
 rename Spigot-Server-Patches/{0350-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch => 0349-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch} (98%)
 rename Spigot-Server-Patches/{0351-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0350-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (97%)
 rename Spigot-Server-Patches/{0352-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0351-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (92%)
 rename Spigot-Server-Patches/{0353-Allow-Saving-of-Oversized-Chunks.patch => 0352-Allow-Saving-of-Oversized-Chunks.patch} (99%)
 rename Spigot-Server-Patches/{0354-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0353-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (90%)
 rename Spigot-Server-Patches/{0355-Add-LivingEntity-getTargetEntity.patch => 0354-Add-LivingEntity-getTargetEntity.patch} (96%)
 rename Spigot-Server-Patches/{0356-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0355-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (96%)
 rename Spigot-Server-Patches/{0357-Entity-getEntitySpawnReason.patch => 0356-Entity-getEntitySpawnReason.patch} (96%)
 rename Spigot-Server-Patches/{0358-Update-entity-Metadata-for-all-tracked-players.patch => 0357-Update-entity-Metadata-for-all-tracked-players.patch} (96%)
 rename Spigot-Server-Patches/{0359-Fire-event-on-GS4-query.patch => 0358-Fire-event-on-GS4-query.patch} (99%)
 rename Spigot-Server-Patches/{0360-Implement-PlayerPostRespawnEvent.patch => 0359-Implement-PlayerPostRespawnEvent.patch} (96%)
 rename Spigot-Server-Patches/{0361-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0360-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (95%)
 rename Spigot-Server-Patches/{0362-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0361-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (95%)
 rename Spigot-Server-Patches/{0363-Server-Tick-Events.patch => 0362-Server-Tick-Events.patch} (95%)
 rename Spigot-Server-Patches/{0364-PlayerDeathEvent-getItemsToKeep.patch => 0363-PlayerDeathEvent-getItemsToKeep.patch} (96%)
 rename Spigot-Server-Patches/{0365-Optimize-Captured-TileEntity-Lookup.patch => 0364-Optimize-Captured-TileEntity-Lookup.patch} (95%)
 rename Spigot-Server-Patches/{0366-Add-Heightmap-API.patch => 0365-Add-Heightmap-API.patch} (97%)
 rename Spigot-Server-Patches/{0367-Mob-Spawner-API-Enhancements.patch => 0366-Mob-Spawner-API-Enhancements.patch} (97%)
 rename Spigot-Server-Patches/{0368-Per-Player-View-Distance-API-placeholders.patch => 0367-Per-Player-View-Distance-API-placeholders.patch} (95%)
 rename Spigot-Server-Patches/{0369-Fix-CB-call-to-changed-postToMainThread-method.patch => 0368-Fix-CB-call-to-changed-postToMainThread-method.patch} (91%)
 rename Spigot-Server-Patches/{0370-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0369-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (95%)
 rename Spigot-Server-Patches/{0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0370-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (96%)
 rename Spigot-Server-Patches/{0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0371-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0373-Duplicate-UUID-Resolve-Option.patch => 0372-Duplicate-UUID-Resolve-Option.patch} (98%)
 rename Spigot-Server-Patches/{0374-improve-CraftWorld-isChunkLoaded.patch => 0373-improve-CraftWorld-isChunkLoaded.patch} (93%)
 rename Spigot-Server-Patches/{0375-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0374-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (99%)
 rename Spigot-Server-Patches/{0376-Fix-some-generation-concurrency-issues.patch => 0375-Fix-some-generation-concurrency-issues.patch} (99%)
 rename Spigot-Server-Patches/{0377-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch => 0376-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch} (92%)
 rename Spigot-Server-Patches/{0378-ChunkMapDistance-CME.patch => 0377-ChunkMapDistance-CME.patch} (97%)
 rename Spigot-Server-Patches/{0379-Implement-CraftBlockSoundGroup.patch => 0378-Implement-CraftBlockSoundGroup.patch} (98%)
 rename Spigot-Server-Patches/{0380-Chunk-debug-command.patch => 0379-Chunk-debug-command.patch} (99%)
 rename Spigot-Server-Patches/{0381-incremental-chunk-saving.patch => 0380-incremental-chunk-saving.patch} (99%)
 rename Spigot-Server-Patches/{0382-Catch-exceptions-from-dispenser-entity-spawns.patch => 0381-Catch-exceptions-from-dispenser-entity-spawns.patch} (94%)
 rename Spigot-Server-Patches/{0383-Fix-World-isChunkGenerated-calls.patch => 0382-Fix-World-isChunkGenerated-calls.patch} (98%)
 rename Spigot-Server-Patches/{0384-Show-blockstate-location-if-we-failed-to-read-it.patch => 0383-Show-blockstate-location-if-we-failed-to-read-it.patch} (95%)
 rename Spigot-Server-Patches/{0385-Log-other-thread-in-DataPaletteBlock-lock-failure.patch => 0384-Log-other-thread-in-DataPaletteBlock-lock-failure.patch} (97%)
 rename Spigot-Server-Patches/{0386-Use-ChunkStatus-cache-when-saving-protochunks.patch => 0385-Use-ChunkStatus-cache-when-saving-protochunks.patch} (92%)
 rename Spigot-Server-Patches/{0387-Anti-Xray.patch => 0386-Anti-Xray.patch} (99%)
 rename Spigot-Server-Patches/{0388-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0387-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (97%)
 rename Spigot-Server-Patches/{0389-Configurable-projectile-relative-velocity.patch => 0388-Configurable-projectile-relative-velocity.patch} (98%)
 rename Spigot-Server-Patches/{0390-Mark-entities-as-being-ticked-when-notifying-navigat.patch => 0389-Mark-entities-as-being-ticked-when-notifying-navigat.patch} (93%)
 rename Spigot-Server-Patches/{0391-offset-item-frame-ticking.patch => 0390-offset-item-frame-ticking.patch} (91%)
 rename Spigot-Server-Patches/{0392-Avoid-hopper-searches-if-there-are-no-items.patch => 0391-Avoid-hopper-searches-if-there-are-no-items.patch} (97%)
 rename Spigot-Server-Patches/{0393-Asynchronous-chunk-IO-and-loading.patch => 0392-Asynchronous-chunk-IO-and-loading.patch} (99%)
 rename Spigot-Server-Patches/{0394-Use-getChunkIfLoadedImmediately-in-places.patch => 0393-Use-getChunkIfLoadedImmediately-in-places.patch} (98%)
 rename Spigot-Server-Patches/{0395-Reduce-sync-loads.patch => 0394-Reduce-sync-loads.patch} (99%)
 rename Spigot-Server-Patches/{0396-Implement-alternative-item-despawn-rate.patch => 0395-Implement-alternative-item-despawn-rate.patch} (98%)
 rename Spigot-Server-Patches/{0397-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch => 0396-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch} (97%)
 rename Spigot-Server-Patches/{0398-Fix-MC-158900.patch => 0397-Fix-MC-158900.patch} (95%)
 rename Spigot-Server-Patches/{0399-implement-optional-per-player-mob-spawns.patch => 0398-implement-optional-per-player-mob-spawns.patch} (99%)
 rename Spigot-Server-Patches/{0400-Prevent-consuming-the-wrong-itemstack.patch => 0399-Prevent-consuming-the-wrong-itemstack.patch} (96%)
 rename Spigot-Server-Patches/{0401-only-add-passanger-entities-once-from-spawners.patch => 0400-only-add-passanger-entities-once-from-spawners.patch} (89%)
 rename Spigot-Server-Patches/{0402-Fix-nether-portal-creation.patch => 0401-Fix-nether-portal-creation.patch} (94%)
 rename Spigot-Server-Patches/{0403-Generator-Settings.patch => 0402-Generator-Settings.patch} (97%)
 rename Spigot-Server-Patches/{0404-Fix-zero-tick-instant-grow-farms-MC-113809.patch => 0403-Fix-zero-tick-instant-grow-farms-MC-113809.patch} (98%)
 rename Spigot-Server-Patches/{0405-Fix-MC-161754.patch => 0404-Fix-MC-161754.patch} (93%)
 rename Spigot-Server-Patches/{0406-Performance-improvement-for-Chunk.getEntities.patch => 0405-Performance-improvement-for-Chunk.getEntities.patch} (95%)
 rename Spigot-Server-Patches/{0407-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch => 0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} (93%)
 rename Spigot-Server-Patches/{0408-Expose-the-internal-current-tick.patch => 0407-Expose-the-internal-current-tick.patch} (91%)
 rename Spigot-Server-Patches/{0409-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch => 0408-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} (91%)
 rename Spigot-Server-Patches/{0410-Add-option-to-disable-pillager-patrols.patch => 0409-Add-option-to-disable-pillager-patrols.patch} (95%)
 rename Spigot-Server-Patches/{0411-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0410-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (96%)
 rename Spigot-Server-Patches/{0412-PlayerLaunchProjectileEvent.patch => 0411-PlayerLaunchProjectileEvent.patch} (99%)
 rename Spigot-Server-Patches/{0413-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0412-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (92%)
 rename Spigot-Server-Patches/{0414-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0413-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (94%)
 rename Spigot-Server-Patches/{0415-Fix-spawn-radius-being-treated-as-0.patch => 0414-Fix-spawn-radius-being-treated-as-0.patch} (90%)
 rename Spigot-Server-Patches/{0416-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0415-MC-145656-Fix-Follow-Range-Initial-Target.patch} (97%)
 rename Spigot-Server-Patches/{0417-Optimize-Hoppers.patch => 0416-Optimize-Hoppers.patch} (99%)
 rename Spigot-Server-Patches/{0418-PlayerDeathEvent-shouldDropExperience.patch => 0417-PlayerDeathEvent-shouldDropExperience.patch} (89%)
 rename Spigot-Server-Patches/{0419-Prevent-bees-loading-chunks-checking-hive-position.patch => 0418-Prevent-bees-loading-chunks-checking-hive-position.patch} (93%)
 rename Spigot-Server-Patches/{0420-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0419-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (96%)
 rename Spigot-Server-Patches/{0421-Guard-against-serializing-mismatching-chunk-coordina.patch => 0420-Guard-against-serializing-mismatching-chunk-coordina.patch} (98%)
 rename Spigot-Server-Patches/{0422-Optimise-IEntityAccess-getPlayerByUUID.patch => 0421-Optimise-IEntityAccess-getPlayerByUUID.patch} (96%)
 rename Spigot-Server-Patches/{0423-Fix-items-not-falling-correctly.patch => 0422-Fix-items-not-falling-correctly.patch} (95%)
 rename Spigot-Server-Patches/{0424-Lag-compensate-eating.patch => 0423-Lag-compensate-eating.patch} (98%)
 rename Spigot-Server-Patches/{0425-Optimize-call-to-getFluid-for-explosions.patch => 0424-Optimize-call-to-getFluid-for-explosions.patch} (93%)
 rename Spigot-Server-Patches/{0426-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0425-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (94%)
 rename Spigot-Server-Patches/{0427-Activation-Range-Improvements.patch => 0426-Activation-Range-Improvements.patch} (97%)
 rename Spigot-Server-Patches/{0428-Add-effect-to-block-break-naturally.patch => 0427-Add-effect-to-block-break-naturally.patch} (95%)
 rename Spigot-Server-Patches/{0429-Tracking-Range-Improvements.patch => 0428-Tracking-Range-Improvements.patch} (97%)
 rename Spigot-Server-Patches/{0430-Fix-comparator-behavior-for-EntityPhanton-goal.patch => 0429-Fix-comparator-behavior-for-EntityPhanton-goal.patch} (92%)
 rename Spigot-Server-Patches/{0431-Fix-items-vanishing-through-end-portal.patch => 0430-Fix-items-vanishing-through-end-portal.patch} (93%)
 rename Spigot-Server-Patches/{0432-Seed-based-feature-search.patch => 0431-Seed-based-feature-search.patch} (98%)
 rename Spigot-Server-Patches/{0433-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0432-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (97%)
 rename Spigot-Server-Patches/{0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0433-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (98%)
 rename Spigot-Server-Patches/{0435-Be-more-tolerant-of-invalid-attributes.patch => 0434-Be-more-tolerant-of-invalid-attributes.patch} (95%)
 rename Spigot-Server-Patches/{0436-Allow-overriding-the-java-version-check.patch => 0435-Allow-overriding-the-java-version-check.patch} (88%)
 rename Spigot-Server-Patches/{0437-Add-ThrownEggHatchEvent.patch => 0436-Add-ThrownEggHatchEvent.patch} (95%)
 rename Spigot-Server-Patches/{0438-Optimise-random-block-ticking.patch => 0437-Optimise-random-block-ticking.patch} (99%)
 rename Spigot-Server-Patches/{0439-Entity-Jump-API.patch => 0438-Entity-Jump-API.patch} (94%)
 rename Spigot-Server-Patches/{0440-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0439-Add-option-to-nerf-pigmen-from-nether-portals.patch} (95%)
 rename Spigot-Server-Patches/{0441-fix-blockstate-capture-undoing.patch => 0440-fix-blockstate-capture-undoing.patch} (95%)
 rename Spigot-Server-Patches/{0442-Make-the-GUI-graph-fancier.patch => 0441-Make-the-GUI-graph-fancier.patch} (99%)
 rename Spigot-Server-Patches/{0443-Backport-fix-for-MC-167561.patch => 0442-Backport-fix-for-MC-167561.patch} (95%)
 rename Spigot-Server-Patches/{0444-add-hand-to-BlockMultiPlaceEvent.patch => 0443-add-hand-to-BlockMultiPlaceEvent.patch} (94%)
 rename Spigot-Server-Patches/{0445-Prevent-teleporting-dead-entities.patch => 0444-Prevent-teleporting-dead-entities.patch} (92%)
 rename Spigot-Server-Patches/{0446-Validate-tripwire-hook-placement-before-update.patch => 0445-Validate-tripwire-hook-placement-before-update.patch} (92%)
 rename Spigot-Server-Patches/{0447-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0446-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (96%)
 rename Spigot-Server-Patches/{0448-Configurable-chance-of-villager-zombie-infection.patch => 0447-Configurable-chance-of-villager-zombie-infection.patch} (97%)
 rename Spigot-Server-Patches/{0449-Call-BlockRedstoneEvent-for-fence-gates.patch => 0448-Call-BlockRedstoneEvent-for-fence-gates.patch} (93%)

diff --git a/Spigot-Server-Patches/0102-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0102-Avoid-blocking-on-Network-Manager-creation.patch
index 7cffce3eba..fc7010e021 100644
--- a/Spigot-Server-Patches/0102-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0102-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From 55ced1105b5d5fe2f705ff0fdeeaa7f00fe95294 Mon Sep 17 00:00:00 2001
+From 3bf973d26328e2f06667c9ecd43998ac5a1fb446 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 23:19:16 -0400
 Subject: [PATCH] Avoid blocking on Network Manager creation
@@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation
 Per Paper issue 294
 
 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
-index e7e21685..404e7834 100644
+index e7e216850..37a22ba6f 100644
 --- a/src/main/java/net/minecraft/server/ServerConnection.java
 +++ b/src/main/java/net/minecraft/server/ServerConnection.java
 @@ -39,6 +39,15 @@ public class ServerConnection {
@@ -43,4 +43,5 @@ index e7e21685..404e7834 100644
              if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
              {
 -- 
-2.17.1
+2.25.1
+
diff --git a/Spigot-Server-Patches/0233-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 98%
rename from Spigot-Server-Patches/0233-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-Server-Patches/0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 240a813164..f8b8df0faf 100644
--- a/Spigot-Server-Patches/0233-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From 37e33369c3579bbdf56a449fbeb38e83e1433564 Mon Sep 17 00:00:00 2001
+From 403fc7f5a6970b4b9a8e61594897dc3fd34ef494 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:51:17 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -104,5 +104,5 @@ index f9b0f39f7..caf277439 100644
  
          return event;
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0232-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0232-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
deleted file mode 100644
index 8b8e9b5d3c..0000000000
--- a/Spigot-Server-Patches/0232-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f515ce3d4d364afc397e823afbf29457bca7cf4a Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 16 Jun 2018 16:23:38 -0400
-Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors
-
-This code was causing NPE's in saving player data, potentially related to reloads.
-
-diff --git a/src/main/java/net/minecraft/server/RecipeBookServer.java b/src/main/java/net/minecraft/server/RecipeBookServer.java
-index 0203e26ec..aa6e5681f 100644
---- a/src/main/java/net/minecraft/server/RecipeBookServer.java
-+++ b/src/main/java/net/minecraft/server/RecipeBookServer.java
-@@ -79,6 +79,10 @@ public class RecipeBookServer extends RecipeBook {
- 
-         while (iterator.hasNext()) {
-             MinecraftKey minecraftkey = (MinecraftKey) iterator.next();
-+            // Paper start - ignore missing recipes
-+            final Optional<? extends IRecipe<?>> recipe = this.l.a(minecraftkey);
-+            if (!recipe.isPresent()) continue;
-+            // Paper end
- 
-             nbttaglist.add(NBTTagString.a(minecraftkey.toString()));
-         }
-@@ -89,6 +93,10 @@ public class RecipeBookServer extends RecipeBook {
- 
-         while (iterator1.hasNext()) {
-             MinecraftKey minecraftkey1 = (MinecraftKey) iterator1.next();
-+            // Paper start - ignore missing recipes
-+            final Optional<? extends IRecipe<?>> recipe = this.l.a(minecraftkey1);
-+            if (!recipe.isPresent()) continue;
-+            // Paper end
- 
-             nbttaglist1.add(NBTTagString.a(minecraftkey1.toString()));
-         }
--- 
-2.25.0.windows.1
-
diff --git a/Spigot-Server-Patches/0234-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0233-PlayerReadyArrowEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0234-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0233-PlayerReadyArrowEvent.patch
index 2b0cc5f21e..8de75ff48b 100644
--- a/Spigot-Server-Patches/0234-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0233-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From a357c5059ef997e144535886449cf34ea30c8ae4 Mon Sep 17 00:00:00 2001
+From 84996a89580e1171c42e4871b8e82043622cc595 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:12:53 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
@@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 1d3c7ce488..4721c288ba 100644
+index 1d3c7ce48..4721c288b 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2157,6 +2157,17 @@ public abstract class EntityHuman extends EntityLiving {
@@ -38,5 +38,5 @@ index 1d3c7ce488..4721c288ba 100644
                      }
                  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0235-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0234-Fire-EntityShootBowEvent-for-Illusioner.patch
similarity index 94%
rename from Spigot-Server-Patches/0235-Fire-EntityShootBowEvent-for-Illusioner.patch
rename to Spigot-Server-Patches/0234-Fire-EntityShootBowEvent-for-Illusioner.patch
index 571c889005..ebfe361088 100644
--- a/Spigot-Server-Patches/0235-Fire-EntityShootBowEvent-for-Illusioner.patch
+++ b/Spigot-Server-Patches/0234-Fire-EntityShootBowEvent-for-Illusioner.patch
@@ -1,4 +1,4 @@
-From 8a9248e1324f866573fb7013ad89d0a7812affd5 Mon Sep 17 00:00:00 2001
+From 5cade1df1ba14c3675f0a17c9cfd62237313056f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 22:19:36 -0400
 Subject: [PATCH] Fire EntityShootBowEvent for Illusioner
@@ -29,5 +29,5 @@ index 2ea0583a3..81b7cd06f 100644
  
      class a extends EntityIllagerWizard.c {
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0236-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0235-Implement-EntityKnockbackByEntityEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0236-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0235-Implement-EntityKnockbackByEntityEvent.patch
index ff91e1cb43..32ef60379e 100644
--- a/Spigot-Server-Patches/0236-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0235-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From ebd1410d870c38f3e1cacd5bc446639fa3f3226e Mon Sep 17 00:00:00 2001
+From 90dd27292788b75a84247749bc49342b85bc0f87 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:46:23 +0200
 Subject: [PATCH] Implement EntityKnockbackByEntityEvent
@@ -27,5 +27,5 @@ index a738848ec..2196dbfce 100644
      }
  
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0237-Expand-Explosions-API.patch b/Spigot-Server-Patches/0236-Expand-Explosions-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0237-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0236-Expand-Explosions-API.patch
index f10f277100..5f1556e216 100644
--- a/Spigot-Server-Patches/0237-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0236-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 993655ee16a3acee6e738dda4c754537d2b1c680 Mon Sep 17 00:00:00 2001
+From 5652c286dae234aefa2136dd3db4575e7e7012f8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Jun 2018 23:17:24 -0400
 Subject: [PATCH] Expand Explosions API
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index aefa7bb18..a58337be3 100644
+index f5a3dd484..9552d409e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -871,6 +871,11 @@ public class CraftWorld implements World {
@@ -22,5 +22,5 @@ index aefa7bb18..a58337be3 100644
      @Override
      public boolean createExplosion(Location loc, float power) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0238-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0237-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0238-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0237-LivingEntity-Hand-Raised-Item-Use-API.patch
index 08646d0997..afd5e3eb57 100644
--- a/Spigot-Server-Patches/0238-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0237-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From 62d366be402dc4ebd7d813e5e383d400202cfe46 Mon Sep 17 00:00:00 2001
+From d28986f2f3395d26ed21732afea59fb4d901903c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:21:28 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2196dbfce9..fea821be1c 100644
+index 2196dbfce..fea821be1 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -112,7 +112,7 @@ public abstract class EntityLiving extends Entity {
@@ -32,7 +32,7 @@ index 2196dbfce9..fea821be1c 100644
          return this.isHandRaised() ? this.activeItem.k() - this.dE() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 7d89c0e8e5..02346f1c50 100644
+index 7d89c0e8e..02346f1c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -654,5 +654,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -62,5 +62,5 @@ index 7d89c0e8e5..02346f1c50 100644
      // Paper end
  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0239-RangedEntity-API.patch b/Spigot-Server-Patches/0238-RangedEntity-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0239-RangedEntity-API.patch
rename to Spigot-Server-Patches/0238-RangedEntity-API.patch
index 4607c2b30c..878729875f 100644
--- a/Spigot-Server-Patches/0239-RangedEntity-API.patch
+++ b/Spigot-Server-Patches/0238-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From 4011816022ca926c37a6617b631eab9967362037 Mon Sep 17 00:00:00 2001
+From 0d672c41952443ff1d66b7b9d20bd7123cc547b4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 26 Jun 2018 22:00:49 -0400
 Subject: [PATCH] RangedEntity API
@@ -158,5 +158,5 @@ index 38b555cc7..03cf6136e 100644
      private BossBar bossBar;
  
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0240-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0239-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 96%
rename from Spigot-Server-Patches/0240-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0239-Add-config-to-disable-ender-dragon-legacy-check.patch
index d5455a738d..83bcf9108b 100644
--- a/Spigot-Server-Patches/0240-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0239-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -1,4 +1,4 @@
-From feef818cc5cfdd932c98332379135eb104f4d78a Mon Sep 17 00:00:00 2001
+From c5fcf0e51be374de58eb2beac360264b84354a20 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 22 Jun 2018 10:38:31 -0500
 Subject: [PATCH] Add config to disable ender dragon legacy check
@@ -47,5 +47,5 @@ index 909d13c42..218c04245 100644
          if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) {
              if (nbttagcompound.b("DragonUUID")) {
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0241-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0240-Implement-World.getEntity-UUID-API.patch
similarity index 89%
rename from Spigot-Server-Patches/0241-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0240-Implement-World.getEntity-UUID-API.patch
index 291c04f0ae..0972707445 100644
--- a/Spigot-Server-Patches/0241-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0240-Implement-World.getEntity-UUID-API.patch
@@ -1,11 +1,11 @@
-From 35945816d00a9dff5cedd0f1d8c4b0cb946a0409 Mon Sep 17 00:00:00 2001
+From f44b556e643f7c249f90b209f3d588c52994eeb3 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:08:14 +0200
 Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a58337be3..f957d4272 100644
+index 9552d409e..05a6b2504 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1285,6 +1285,15 @@ public class CraftWorld implements World {
@@ -25,5 +25,5 @@ index a58337be3..f957d4272 100644
      public void save() {
          org.spigotmc.AsyncCatcher.catchOp("world save"); // Spigot
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch
index 5270cca11e..bb0de8ccf0 100644
--- a/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 395926f7e3d53453169ffd333e788356c979edf5 Mon Sep 17 00:00:00 2001
+From 03c282e818f80d14196d55326936fdd765c10911 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 4721c288ba..36748ccb73 100644
+index 4721c288b..36748ccb7 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -164,7 +164,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -34,7 +34,7 @@ index 4721c288ba..36748ccb73 100644
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 625b684287..f849dba215 100644
+index 625b68428..f849dba21 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -368,7 +368,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -88,7 +88,7 @@ index 625b684287..f849dba215 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4a0a847944..8eb12e89ea 100644
+index 4a0a84794..8eb12e89e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2040,7 +2040,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -101,7 +101,7 @@ index 4a0a847944..8eb12e89ea 100644
          this.player.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 002f7e844a..fd0f5c6f29 100644
+index 002f7e844..fd0f5c6f2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -403,7 +403,7 @@ public abstract class PlayerList {
@@ -114,7 +114,7 @@ index 002f7e844a..fd0f5c6f29 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c773314cff..bad4e6f7fc 100644
+index c773314cf..bad4e6f7f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1047,7 +1047,7 @@ public class WorldServer extends World {
@@ -136,7 +136,7 @@ index c773314cff..bad4e6f7fc 100644
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index cd8ad27047..e169679c88 100644
+index cd8ad2704..e169679c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -619,8 +619,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -155,7 +155,7 @@ index cd8ad27047..e169679c88 100644
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 52640237ae..d7d86a8b24 100644
+index 52640237a..d7d86a8b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -786,7 +786,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,7 +168,7 @@ index 52640237ae..d7d86a8b24 100644
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index caf277439a..f931fa48b4 100644
+index caf277439..f931fa48b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1293,8 +1293,19 @@ public class CraftEventFactory {
@@ -193,5 +193,5 @@ index caf277439a..f931fa48b4 100644
          human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity());
      }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0243-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0242-Configurable-Bed-Search-Radius.patch
similarity index 98%
rename from Spigot-Server-Patches/0243-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0242-Configurable-Bed-Search-Radius.patch
index b2f62222ad..65b29b019b 100644
--- a/Spigot-Server-Patches/0243-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0242-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From 76f529f06c0254ff538046d8fd57220f3eefaeab Mon Sep 17 00:00:00 2001
+From e1e34ffc3abb34c17b19e507d3e1d4972de73c4c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:22:06 -0400
 Subject: [PATCH] Configurable Bed Search Radius
@@ -149,5 +149,5 @@ index 794756342..06a35629a 100644
          VoxelShape voxelshape = iworldreader.getType(blockposition).getCollisionShape(iworldreader, blockposition);
  
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0244-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0243-Vex-getSummoner-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0244-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0243-Vex-getSummoner-API.patch
index c15f49a8f0..786fe7695b 100644
--- a/Spigot-Server-Patches/0244-Vex-getSummoner-API.patch
+++ b/Spigot-Server-Patches/0243-Vex-getSummoner-API.patch
@@ -1,4 +1,4 @@
-From 7b6494b56f7f05c5d7a55525082a90605161562b Mon Sep 17 00:00:00 2001
+From 8b0a68363ba2615983a36bef836a4984eb19b3e4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:30:22 -0400
 Subject: [PATCH] Vex#getSummoner API
@@ -47,5 +47,5 @@ index 737a37b6f..169c951ec 100644
      public String toString() {
          return "CraftVex";
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0245-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 94%
rename from Spigot-Server-Patches/0245-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 7726406f5a..bdd00ab90a 100644
--- a/Spigot-Server-Patches/0245-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From 3326c5867df77d3d6ae7ee79d33b2ad7b3ebd72a Mon Sep 17 00:00:00 2001
+From 90ec807ac72876f1190ff8144bcb600453c15175 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 13 Jul 2018 14:54:43 +0200
 Subject: [PATCH] Refresh player inventory when cancelling
@@ -28,5 +28,5 @@ index 8eb12e89e..8648845ac 100644
                      }
                      // CraftBukkit end
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0246-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0245-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 90%
rename from Spigot-Server-Patches/0246-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0245-Don-t-change-the-Entity-Random-seed-for-squids.patch
index 112589b464..b0206d4bb8 100644
--- a/Spigot-Server-Patches/0246-Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/0245-Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -1,4 +1,4 @@
-From 6485e9ecad897fa344735fc3ffb9f0b57ce46a81 Mon Sep 17 00:00:00 2001
+From 858907dcfa9ce67019472ceedb6dfb77919873ef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:05:00 -0400
 Subject: [PATCH] Don't change the Entity Random seed for squids
@@ -18,5 +18,5 @@ index 1c1ff2069..92efe4e7f 100644
      }
  
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0247-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0246-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 91%
rename from Spigot-Server-Patches/0247-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0246-Re-add-vanilla-entity-warnings-for-duplicates.patch
index 8322ba2873..f29d49cfe2 100644
--- a/Spigot-Server-Patches/0247-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0246-Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -1,4 +1,4 @@
-From c028e6bde7f7c652ca0827017bfdea624603fbe5 Mon Sep 17 00:00:00 2001
+From 172128b3cbbab15cc5ddeddbec8f86ef2af5fada Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:08:05 -0400
 Subject: [PATCH] Re-add vanilla entity warnings for duplicates
@@ -8,7 +8,7 @@ These are a critical sign that somethin went wrong, and you've lost some data...
 We should kind of know about these things you know.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f0c912be43..d46a664bdb 100644
+index bad4e6f7f..c30630fa9 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1032,7 +1032,8 @@ public class WorldServer extends World {
@@ -22,5 +22,5 @@ index f0c912be43..d46a664bdb 100644
          }
      }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0248-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 89%
rename from Spigot-Server-Patches/0248-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index f548a9f371..8110841c42 100644
--- a/Spigot-Server-Patches/0248-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -1,11 +1,11 @@
-From 5abcca34e2d2e1667c9940c92bbee26f4bbba795 Mon Sep 17 00:00:00 2001
+From 41308cf343500ec700daf71942ced419358d250c Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 16 Jul 2018 12:42:20 +0200
 Subject: [PATCH] Avoid item merge if stack size above max stack size
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index fcc1c0993..5f46c7f86 100644
+index 5efcc50ab..e5c9bac88 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -170,6 +170,10 @@ public class EntityItem extends Entity {
@@ -20,5 +20,5 @@ index fcc1c0993..5f46c7f86 100644
              double radius = world.spigotConfig.itemMerge;
              List<EntityItem> list = this.world.a(EntityItem.class, this.getBoundingBox().grow(radius, radius, radius), (entityitem) -> {
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0249-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0248-Use-asynchronous-Log4j-2-loggers.patch
similarity index 94%
rename from Spigot-Server-Patches/0249-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0248-Use-asynchronous-Log4j-2-loggers.patch
index faf75dfdd3..7b2e31949d 100644
--- a/Spigot-Server-Patches/0249-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0248-Use-asynchronous-Log4j-2-loggers.patch
@@ -1,11 +1,11 @@
-From 46899c78b914ac9c9befdc72fb414654ce6335f1 Mon Sep 17 00:00:00 2001
+From e7ee3e6490bc87b238ba0fcb8cd1839abbf4d6a3 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 17 Jul 2018 16:42:17 +0200
 Subject: [PATCH] Use asynchronous Log4j 2 loggers
 
 
 diff --git a/pom.xml b/pom.xml
-index 9e06edfe2..907807ee5 100644
+index 6f2fe9c26..55679af92 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -74,6 +74,13 @@
@@ -54,5 +54,5 @@ index 0694b2146..30efeb5fa 100644
 +log4j2.AsyncQueueFullPolicy="com.destroystokyo.paper.log.LogFullPolicy"
  log4j.skipJansi=true
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0250-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0249-add-more-information-to-Entity.toString.patch
similarity index 92%
rename from Spigot-Server-Patches/0250-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0249-add-more-information-to-Entity.toString.patch
index dc402a12c3..cc8372bc07 100644
--- a/Spigot-Server-Patches/0250-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0249-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From 4f8d778101a5b5dc9ffe73b19f14d72796e5efdb Mon Sep 17 00:00:00 2001
+From 82dec6a475fc31b39a9a1934131e02c1dde08dfa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:13:28 -0400
 Subject: [PATCH] add more information to Entity.toString()
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 64dc37c70c..ec59ffc2e7 100644
+index 64dc37c70..ec59ffc2e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2499,7 +2499,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,5 +19,5 @@ index 64dc37c70c..ec59ffc2e7 100644
  
      public boolean isInvulnerable(DamageSource damagesource) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0251-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0251-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index f93fb822f2..a11284597b 100644
--- a/Spigot-Server-Patches/0251-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -1,4 +1,4 @@
-From 3379865420c1dcc82edb153736223cb3fc735378 Mon Sep 17 00:00:00 2001
+From 8e5d2840e7a280737241deb39703c81b570f4ff0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 08:25:40 -0400
 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
 Add -Ddebug.entities=true to your JVM flags to gain more information
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ec59ffc2e7..2612d60e38 100644
+index ec59ffc2e..2612d60e3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -76,6 +76,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,7 +19,7 @@ index ec59ffc2e7..2612d60e38 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index fcf229ad5d..f640d2ac76 100644
+index fcf229ad5..f640d2ac7 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1061,6 +1061,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -40,7 +40,7 @@ index fcf229ad5d..f640d2ac76 100644
  
      protected void g() {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5a237fa1dd..1814be9817 100644
+index f349c7fe2..cab9ec5dd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -63,6 +63,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -52,7 +52,7 @@ index 5a237fa1dd..1814be9817 100644
      public boolean captureBlockStates = false;
      public boolean captureTreeGeneration = false;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c30630fa94..70e4b58a93 100644
+index c30630fa9..70e4b58a9 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -76,6 +76,9 @@ public class WorldServer extends World {
@@ -122,5 +122,5 @@ index c30630fa94..70e4b58a93 100644
              // CraftBukkit start - SPIGOT-5278
              if (entity instanceof EntityDrowned) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0252-EnderDragon-Events.patch b/Spigot-Server-Patches/0251-EnderDragon-Events.patch
similarity index 97%
rename from Spigot-Server-Patches/0252-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0251-EnderDragon-Events.patch
index 69161e6fc7..7d6d01e1c5 100644
--- a/Spigot-Server-Patches/0252-EnderDragon-Events.patch
+++ b/Spigot-Server-Patches/0251-EnderDragon-Events.patch
@@ -1,4 +1,4 @@
-From 1810be56bd2d574eff23ede93286de716da30eb9 Mon Sep 17 00:00:00 2001
+From 12f70d0e821fcf94e04d3ae07a5915f67c02734b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:51:27 -0500
 Subject: [PATCH] EnderDragon Events
@@ -58,5 +58,5 @@ index bc08b53fc..db43ac1cc 100644
              }
  
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0253-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0252-PlayerElytraBoostEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0253-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0252-PlayerElytraBoostEvent.patch
index 1f0a916f53..955b8dae93 100644
--- a/Spigot-Server-Patches/0253-PlayerElytraBoostEvent.patch
+++ b/Spigot-Server-Patches/0252-PlayerElytraBoostEvent.patch
@@ -1,4 +1,4 @@
-From d4d3cc6be23b114b37ebea6ea438beaafa55e597 Mon Sep 17 00:00:00 2001
+From 2e8a4e34c37924dbff4983f6b6aaeffe92253d17 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:59:59 -0500
 Subject: [PATCH] PlayerElytraBoostEvent
@@ -30,5 +30,5 @@ index 92dac35ec..bd524a35b 100644
  
              return InteractionResultWrapper.success(entityhuman.b(enumhand));
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0254-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0253-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 98%
rename from Spigot-Server-Patches/0254-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0253-Speedup-BlockPos-by-fixing-inlining.patch
index 6152d8308d..0fca4cda87 100644
--- a/Spigot-Server-Patches/0254-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0253-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 2f7135a6499499a1f67c56a25881f026a74ee1b2 Mon Sep 17 00:00:00 2001
+From 4256459777a7348525ce2230b1ec54a626df4830 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 71089442c1..c439a8d019 100644
+index 71089442c..c439a8d01 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -7,25 +7,22 @@ import javax.annotation.concurrent.Immutable;
@@ -110,7 +110,7 @@ index 71089442c1..c439a8d019 100644
          return (int) (f + f1 + f2);
      }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 5dbd3e60fe..e9ea232a78 100644
+index 5dbd3e60f..e9ea232a7 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -342,11 +342,13 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -209,5 +209,5 @@ index 5dbd3e60fe..e9ea232a78 100644
  
          @Override
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0255-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0254-Optimize-RegistryID.c.patch
similarity index 96%
rename from Spigot-Server-Patches/0255-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0254-Optimize-RegistryID.c.patch
index af83500a39..212efd6f77 100644
--- a/Spigot-Server-Patches/0255-Optimize-RegistryID.c.patch
+++ b/Spigot-Server-Patches/0254-Optimize-RegistryID.c.patch
@@ -1,4 +1,4 @@
-From ae9bcdc84f1bc311b5e4bef15658721b17c392a5 Mon Sep 17 00:00:00 2001
+From 52a2b3dbfdcd9dc9d17559be0f1eacc3a03f8cfa Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 23 Jul 2018 13:08:19 -0400
 Subject: [PATCH] Optimize RegistryID.c()
@@ -64,5 +64,5 @@ index e15d28671..e8a48b9a4 100644
  
      public int b() {
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 96%
rename from Spigot-Server-Patches/0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index e6908f7883..b31293ab3c 100644
--- a/Spigot-Server-Patches/0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,4 +1,4 @@
-From 7d627aabb5f289fc6cb4767f06f948cb00ea71f1 Mon Sep 17 00:00:00 2001
+From f693d754977454c76f680711e220d7565bbae95d Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
@@ -38,5 +38,5 @@ index cab9ec5dd..749915198 100644
          int i = MathHelper.floor(axisalignedbb.minX);
          int j = MathHelper.f(axisalignedbb.maxX);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0257-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0256-Vanished-players-don-t-have-rights.patch
similarity index 99%
rename from Spigot-Server-Patches/0257-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0256-Vanished-players-don-t-have-rights.patch
index 3c4420cf2d..6edd4d8c79 100644
--- a/Spigot-Server-Patches/0257-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0256-Vanished-players-don-t-have-rights.patch
@@ -1,4 +1,4 @@
-From e56e57826ef9eb475aa4e63695ef7c21ee67006c Mon Sep 17 00:00:00 2001
+From b6b1a2d029d0bf249832256d1f7b0542e6ab2b39 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 14:22:26 +0200
 Subject: [PATCH] Vanished players don't have rights
@@ -146,5 +146,5 @@ index f931fa48b..317a5bf4e 100644
          return event;
      }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0258-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 93%
rename from Spigot-Server-Patches/0258-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
index 531d9958be..d2359d6cc5 100644
--- a/Spigot-Server-Patches/0258-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
+++ b/Spigot-Server-Patches/0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@@ -1,4 +1,4 @@
-From de9e6201b6df14fa0dfc31a4fcb3037d9a626da3 Mon Sep 17 00:00:00 2001
+From 08dec51859ba7c4f1206df43f6bd32dd53bf4cd1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 22:18:31 -0400
 Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
@@ -26,5 +26,5 @@ index 3af311c6e..68cde3356 100644
          this.entities.remove(entity); // Paper
      }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0259-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0258-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 96%
rename from Spigot-Server-Patches/0259-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0258-Add-some-Debug-to-Chunk-Entity-slices.patch
index 3edc9bf33d..570ee9b59a 100644
--- a/Spigot-Server-Patches/0259-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0258-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From 45990e551bfbcb491cba48dac25b6b669428216c Mon Sep 17 00:00:00 2001
+From e2bb3541dbb9a1f29b90e194cbe05bcc834e1a7c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 22:44:23 -0400
 Subject: [PATCH] Add some Debug to Chunk Entity slices
@@ -57,7 +57,7 @@ index 68cde3356..1d47e4737 100644
              return;
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fcc47182c..09ec144eb 100644
+index d8f85eda0..ace74179c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -69,5 +69,5 @@ index fcc47182c..09ec144eb 100644
  
      public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0260-EntityTransformedEvent.patch b/Spigot-Server-Patches/0259-EntityTransformedEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0260-EntityTransformedEvent.patch
rename to Spigot-Server-Patches/0259-EntityTransformedEvent.patch
index 92a55797cd..edd75ba447 100644
--- a/Spigot-Server-Patches/0260-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0259-EntityTransformedEvent.patch
@@ -1,4 +1,4 @@
-From 6c4c03f5b661a5a1c2c674fe6b4e613079504979 Mon Sep 17 00:00:00 2001
+From 2ffe51580f5c462b8028922ca61bc36f6bc1a0c6 Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:30:03 -0400
 Subject: [PATCH] EntityTransformedEvent
@@ -61,5 +61,5 @@ index 91cac5d53..8082fa617 100644
          worldserver.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason
          // CraftBukkit end
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0261-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0260-SkeletonHorse-Additions.patch
similarity index 97%
rename from Spigot-Server-Patches/0261-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0260-SkeletonHorse-Additions.patch
index b934c5e69d..54ca417b18 100644
--- a/Spigot-Server-Patches/0261-SkeletonHorse-Additions.patch
+++ b/Spigot-Server-Patches/0260-SkeletonHorse-Additions.patch
@@ -1,4 +1,4 @@
-From 8bee08608cdd24f44c5b187c54c5bf11c4ca32c5 Mon Sep 17 00:00:00 2001
+From 0ef80e45124c0ed6bc20f23cbc6da5ed15bd1cd7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 27 Jul 2018 22:36:31 -0500
 Subject: [PATCH] SkeletonHorse Additions
@@ -74,5 +74,5 @@ index e822c2200..2a7d1d4ec 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0262-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0261-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0262-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0261-Prevent-Saving-Bad-entities-to-chunks.patch
index d578ba2579..b069530268 100644
--- a/Spigot-Server-Patches/0262-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0261-Prevent-Saving-Bad-entities-to-chunks.patch
@@ -1,4 +1,4 @@
-From 1bb924aba6e3b2a14806f3837f67e05731106ed6 Mon Sep 17 00:00:00 2001
+From 10efa52cd47217eb5757530232f015dcfa58b04e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 26 Jul 2018 00:11:12 -0400
 Subject: [PATCH] Prevent Saving Bad entities to chunks
@@ -61,5 +61,5 @@ index 4af5a230b..6371f2f5b 100644
              ProtoChunk protochunk = (ProtoChunk) ichunkaccess;
  
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0263-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0262-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 97%
rename from Spigot-Server-Patches/0263-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0262-Don-t-call-getItemMeta-on-hasItemMeta.patch
index d4a47b7713..9b22a0cefa 100644
--- a/Spigot-Server-Patches/0263-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0262-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -1,4 +1,4 @@
-From d510614e516f981c111c5832c6488d5892b44ab4 Mon Sep 17 00:00:00 2001
+From c30ebcb7dec21a9ab0a374cdd3527d7230417b1e Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Thu, 26 Jul 2018 14:10:23 +0200
 Subject: [PATCH] Don't call getItemMeta on hasItemMeta
@@ -77,5 +77,5 @@ index 3a82bede7..d73141839 100644
      public void testConflictingStoredEnchantment() {
          EnchantmentStorageMeta itemMeta = (EnchantmentStorageMeta) Bukkit.getItemFactory().getItemMeta(Material.ENCHANTED_BOOK);
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0264-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 96%
rename from Spigot-Server-Patches/0264-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch
index 9cda2249a7..af30a56469 100644
--- a/Spigot-Server-Patches/0264-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From 1f36f26c18a57565356f9a8514cc467d7b0094d5 Mon Sep 17 00:00:00 2001
+From 100a6d3800f83f2af6d7200bebf89e5fc12c5262 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
 they shouldn't of been in the list in the first place.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index eecf27370b..d704fc79c0 100644
+index eecf27370..d704fc79c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -179,6 +179,7 @@ public class PaperCommand extends Command {
@@ -23,7 +23,7 @@ index eecf27370b..d704fc79c0 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1d47e47370..c464d69623 100644
+index 1d47e4737..c464d6962 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -681,6 +681,7 @@ public class Chunk implements IChunkAccess {
@@ -51,7 +51,7 @@ index 1d47e47370..c464d69623 100644
                  if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
                      list.add(t0);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ace74179ce..5d9d32ea45 100644
+index ace74179c..5d9d32ea4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -195,6 +195,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -63,7 +63,7 @@ index ace74179ce..5d9d32ea45 100644
      public float getBukkitYaw() {
          return this.yaw;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 70e4b58a93..54505e056e 100644
+index 70e4b58a9..54505e056 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -904,7 +904,7 @@ public class WorldServer extends World {
@@ -92,7 +92,7 @@ index 70e4b58a93..54505e056e 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f957d42723..a6a273c31b 100644
+index 05a6b2504..326c3564c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1021,6 +1021,7 @@ public class CraftWorld implements World {
@@ -128,5 +128,5 @@ index f957d42723..a6a273c31b 100644
  
                  if (bukkitEntity == null) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0265-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0264-MC-111480-Start-Entity-ID-s-at-1.patch
similarity index 90%
rename from Spigot-Server-Patches/0265-MC-111480-Start-Entity-ID-s-at-1.patch
rename to Spigot-Server-Patches/0264-MC-111480-Start-Entity-ID-s-at-1.patch
index 0e51a18fcd..dafc3ff753 100644
--- a/Spigot-Server-Patches/0265-MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/0264-MC-111480-Start-Entity-ID-s-at-1.patch
@@ -1,4 +1,4 @@
-From 00c25be7c84bad842cc900163723e1c5929f436d Mon Sep 17 00:00:00 2001
+From b629f1e020482b5c3c7b8354aab7f82b04d492ee Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 22:58:47 -0400
 Subject: [PATCH] MC-111480: Start Entity ID's at 1
@@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special,
 and can break things such as Elytra Fireworks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ca794328a..845993bb4 100644
+index 5d9d32ea4..02aa493f1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -93,7 +93,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -20,5 +20,5 @@ index ca794328a..845993bb4 100644
      private static final AxisAlignedBB d = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
      private static double e = 1.0D;
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0266-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0265-Implement-Expanded-ArmorStand-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0266-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0265-Implement-Expanded-ArmorStand-API.patch
index c43a466a80..709ffc59db 100644
--- a/Spigot-Server-Patches/0266-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0265-Implement-Expanded-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From 4383b1ee134cc543befaf00f504b7a4016da0ce1 Mon Sep 17 00:00:00 2001
+From 135ee7ade8be2ba0e4e172bd20ead8a359a9dfcc Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Thu, 26 Jul 2018 02:25:46 -0400
 Subject: [PATCH] Implement Expanded ArmorStand API
@@ -126,5 +126,5 @@ index 124c3185b..d1d689e5d 100644
      // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0267-AnvilDamageEvent.patch b/Spigot-Server-Patches/0266-AnvilDamageEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0267-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0266-AnvilDamageEvent.patch
index 20776b0133..dcb41627a9 100644
--- a/Spigot-Server-Patches/0267-AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/0266-AnvilDamageEvent.patch
@@ -1,4 +1,4 @@
-From 6fb7424d3b3e0451b83a40e963588d4960d89c27 Mon Sep 17 00:00:00 2001
+From b7004155a4eece3f913e23e79f303e2e5c9a0f7c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 20 Jul 2018 23:37:03 -0500
 Subject: [PATCH] AnvilDamageEvent
@@ -26,5 +26,5 @@ index 1d9ce5ef1..286b930dd 100644
                          if (iblockdata1 == null) {
                              world.a(blockposition, false);
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0268-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0267-Add-TNTPrimeEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0268-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0267-Add-TNTPrimeEvent.patch
index 5fc241f9ec..368db18fb9 100644
--- a/Spigot-Server-Patches/0268-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0267-Add-TNTPrimeEvent.patch
@@ -1,4 +1,4 @@
-From 30d0707a9432fb622ecf7d8ffaf2dc6bb2306690 Mon Sep 17 00:00:00 2001
+From 856dddfd5217457b7e3554c53d2b67f9618ffea3 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 16 Jul 2018 00:05:05 +0300
 Subject: [PATCH] Add TNTPrimeEvent
@@ -115,7 +115,7 @@ index 6cb82420b..592fcd538 100644
                  world.a(blockposition, false);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 07abcc1e2..3df8e30ec 100644
+index 138e2ea56..6a4ccaeb0 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock;
@@ -139,5 +139,5 @@ index 07abcc1e2..3df8e30ec 100644
  
                  this.world.a(blockposition, false);
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0269-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0268-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0269-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0268-Break-up-and-make-tab-spam-limits-configurable.patch
index 10b00caa22..47695d9c4f 100644
--- a/Spigot-Server-Patches/0269-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0268-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From fa2b3cf4d7e1b4f935bf7bf8e7c092a082a96f69 Mon Sep 17 00:00:00 2001
+From 9c0c887a6afa42eabf0c85e15d32c8e3009bbd60 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 29 Jul 2018 05:02:15 +0100
 Subject: [PATCH] Break up and make tab spam limits configurable
@@ -45,7 +45,7 @@ index 26ab855dc..adef07d4d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3a7e197e3..77c375f71 100644
+index 8648845ac..6627d8402 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -74,5 +74,5 @@ index 3a7e197e3..77c375f71 100644
              return;
          }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0270-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0269-Add-hand-to-bucket-events.patch
similarity index 99%
rename from Spigot-Server-Patches/0270-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0269-Add-hand-to-bucket-events.patch
index 5104553d8e..be2e08fc2e 100644
--- a/Spigot-Server-Patches/0270-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0269-Add-hand-to-bucket-events.patch
@@ -1,4 +1,4 @@
-From 9997320f8a64cd61f47e9c255eb5ec1d562095f3 Mon Sep 17 00:00:00 2001
+From af01ef90f1b7dad0af7a9da89c74fd3403a86807 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events
@@ -107,5 +107,5 @@ index 317a5bf4e..f006b441a 100644
          }
  
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0271-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0270-MC-135506-Experience-should-save-as-Integers.patch
similarity index 94%
rename from Spigot-Server-Patches/0271-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0270-MC-135506-Experience-should-save-as-Integers.patch
index 8a9cc69629..65e5c3c037 100644
--- a/Spigot-Server-Patches/0271-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0270-MC-135506-Experience-should-save-as-Integers.patch
@@ -1,4 +1,4 @@
-From d5fe8ff182d9cd4c7892c3fcbd9c97eaa3401b9c Mon Sep 17 00:00:00 2001
+From 64d59282e1f9063daca2a22e2fe2b4ae90155a8f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 3 Aug 2018 00:04:54 -0400
 Subject: [PATCH] MC-135506: Experience should save as Integers
@@ -27,5 +27,5 @@ index 87c6b77ce..53c6c3389 100644
      }
  
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0272-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0271-Fix-client-rendering-skulls-from-same-user.patch
similarity index 97%
rename from Spigot-Server-Patches/0272-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0271-Fix-client-rendering-skulls-from-same-user.patch
index b8d116ad58..3ca2459b19 100644
--- a/Spigot-Server-Patches/0272-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0271-Fix-client-rendering-skulls-from-same-user.patch
@@ -1,4 +1,4 @@
-From 786e0d9fafbc25fb577d7f2ebfae70d2e0f3e5f1 Mon Sep 17 00:00:00 2001
+From 3b8f8252fd955b3f1d7a9f3315fee47c8e9693a7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Nov 2016 00:40:42 -0500
 Subject: [PATCH] Fix client rendering skulls from same user
@@ -12,7 +12,7 @@ This allows the client to render multiple skull textures from the same user,
 for when different skins were used when skull was made.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 1d2eb4a6e..962183491 100644
+index 641a52b96..0b0c3c681 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -54,7 +54,7 @@ public final class ItemStack {
@@ -117,5 +117,5 @@ index 177cceb77..0882d82ce 100644
      public NBTTagCompound b() {
          return this.save(new NBTTagCompound());
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0273-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0272-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 99%
rename from Spigot-Server-Patches/0273-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0272-Add-Early-Warning-Feature-to-WatchDog.patch
index a6f116b0ee..ae10fb913d 100644
--- a/Spigot-Server-Patches/0273-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0272-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -1,4 +1,4 @@
-From 70203148ed53ddb0b445550b8dbe08007e4ae1d9 Mon Sep 17 00:00:00 2001
+From 6f1b4d5dedcc6c6d5d557cf3d1672bcfbfdad4f8 Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Wed, 8 Aug 2018 15:30:52 -0400
 Subject: [PATCH] Add Early Warning Feature to WatchDog
@@ -183,5 +183,5 @@ index 121c7ff60..07936eeba 100644
              {
                  interrupt();
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0274-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0273-Make-EnderDragon-implement-Mob.patch
similarity index 94%
rename from Spigot-Server-Patches/0274-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0273-Make-EnderDragon-implement-Mob.patch
index d147a057e0..5298aec92a 100644
--- a/Spigot-Server-Patches/0274-Make-EnderDragon-implement-Mob.patch
+++ b/Spigot-Server-Patches/0273-Make-EnderDragon-implement-Mob.patch
@@ -1,4 +1,4 @@
-From ed5c78d991cad1485545b89735ced47f95a922d8 Mon Sep 17 00:00:00 2001
+From b9c594fb6cd2169f52b7f07465aa29da29e59281 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 10 Aug 2018 22:11:49 -0400
 Subject: [PATCH] Make EnderDragon implement Mob
@@ -32,5 +32,5 @@ index cc115cc36..4947249da 100644
  
      @Override
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0275-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0274-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 98%
rename from Spigot-Server-Patches/0275-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0274-Use-ConcurrentHashMap-in-JsonList.patch
index 63983be718..8491839b60 100644
--- a/Spigot-Server-Patches/0275-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0274-Use-ConcurrentHashMap-in-JsonList.patch
@@ -1,4 +1,4 @@
-From b48ad0723e1228ae382cd3ea1185d7b0d982f120 Mon Sep 17 00:00:00 2001
+From d1c9e47e37c5d29417002931231e8d2659fee1c5 Mon Sep 17 00:00:00 2001
 From: egg82 <phantom_zero@ymail.com>
 Date: Tue, 7 Aug 2018 01:24:23 -0600
 Subject: [PATCH] Use ConcurrentHashMap in JsonList
@@ -99,5 +99,5 @@ index 734e7ecf6..8570e38f4 100644
          String s = this.b.toJson(collection);
          BufferedWriter bufferedwriter = null;
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0276-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0275-Use-a-Queue-for-Queueing-Commands.patch
similarity index 94%
rename from Spigot-Server-Patches/0276-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0275-Use-a-Queue-for-Queueing-Commands.patch
index 8a939481a6..a5cc7434c1 100644
--- a/Spigot-Server-Patches/0276-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0275-Use-a-Queue-for-Queueing-Commands.patch
@@ -1,4 +1,4 @@
-From 97036c2d66087267395e463dc61d8d31b69f4424 Mon Sep 17 00:00:00 2001
+From f843bf9620847c2e3752de8a863b48a16a707571 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 12 Aug 2018 02:33:39 -0400
 Subject: [PATCH] Use a Queue for Queueing Commands
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
 Lists are bad as Queues mmmkay.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index ec257ba31f..349a0ea213 100644
+index ec257ba31..349a0ea21 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -44,7 +44,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -32,5 +32,5 @@ index ec257ba31f..349a0ea213 100644
              // CraftBukkit start - ServerCommand for preprocessing
              ServerCommandEvent event = new ServerCommandEvent(console, servercommand.command);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0277-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 94%
rename from Spigot-Server-Patches/0277-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index ac79bd3dba..5f90b581ad 100644
--- a/Spigot-Server-Patches/0277-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-Server-Patches/0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,4 +1,4 @@
-From c48d9f4c77534b6550412d97c24b44b6d366a188 Mon Sep 17 00:00:00 2001
+From aba7ad835af0314f275d0bfac6bc14f14d531a75 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:16:34 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
@@ -35,5 +35,5 @@ index 299523799..91f2066b1 100644
  
          return entities;
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0278-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0277-Allow-disabling-armour-stand-ticking.patch
similarity index 99%
rename from Spigot-Server-Patches/0278-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0277-Allow-disabling-armour-stand-ticking.patch
index c1daadcfb0..0dc242a957 100644
--- a/Spigot-Server-Patches/0278-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0277-Allow-disabling-armour-stand-ticking.patch
@@ -1,4 +1,4 @@
-From 0994b1f1e7de07d1654d56b9626f69cc15fb2959 Mon Sep 17 00:00:00 2001
+From 87b77cad98f830c2bafe7b8e16e2c98094796c06 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:09 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
@@ -277,5 +277,5 @@ index d1d689e5d..ac105270d 100644
      // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0279-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0278-Optimize-BlockPosition-helper-methods.patch
similarity index 97%
rename from Spigot-Server-Patches/0279-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0278-Optimize-BlockPosition-helper-methods.patch
index 84021e44df..a239e15b13 100644
--- a/Spigot-Server-Patches/0279-Optimize-BlockPosition-helper-methods.patch
+++ b/Spigot-Server-Patches/0278-Optimize-BlockPosition-helper-methods.patch
@@ -1,4 +1,4 @@
-From 68ffe4970dcf909ead368265bc723e5a8bb90c7f Mon Sep 17 00:00:00 2001
+From 6c4b570924752e5bab437614cf2b0755bed0a1ff Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Wed, 15 Aug 2018 12:05:12 -0700
 Subject: [PATCH] Optimize BlockPosition helper methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods
 Resolves #1338
 
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 5a505b753..142476395 100644
+index e9ea232a7..e76528f19 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -134,57 +134,74 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -98,5 +98,5 @@ index 5a505b753..142476395 100644
  
      @Override
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0280-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch
similarity index 98%
rename from Spigot-Server-Patches/0280-Send-nearby-packets-from-world-player-list-not-serve.patch
rename to Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch
index b42ddd3c5e..0262594bf9 100644
--- a/Spigot-Server-Patches/0280-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch
@@ -1,4 +1,4 @@
-From 1996f2fcdf1d7446e5a1c91a1dc61786449b116c Mon Sep 17 00:00:00 2001
+From 624df41d0c445d3bf05a430b44a9032d90a48376 Mon Sep 17 00:00:00 2001
 From: Mystiflow <mystiflow@gmail.com>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list
@@ -81,5 +81,5 @@ index 326c3564c..fe0912c06 100644
  
      private static Map<String, GameRules.GameRuleKey<?>> gamerules;
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0281-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0280-Restore-vanlla-default-mob-spawn-range.patch
similarity index 85%
rename from Spigot-Server-Patches/0281-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0280-Restore-vanlla-default-mob-spawn-range.patch
index b3438ecdac..4e22a4d544 100644
--- a/Spigot-Server-Patches/0281-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0280-Restore-vanlla-default-mob-spawn-range.patch
@@ -1,11 +1,11 @@
-From 1c5d44fef7344af01c0aaa5b09911964da1ea76a Mon Sep 17 00:00:00 2001
+From a485890b51d7dd81b18da68b6039681d20e34dc2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Aug 2018 12:43:16 -0400
 Subject: [PATCH] Restore vanlla default mob-spawn-range
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 5686a4f1a..c2906f20a 100644
+index 4965a48c3..58767972a 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -165,7 +165,7 @@ public class SpigotWorldConfig
@@ -18,5 +18,5 @@ index 5686a4f1a..c2906f20a 100644
      }
  
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0282-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0281-Optimize-CraftBlockData-Creation.patch
similarity index 95%
rename from Spigot-Server-Patches/0282-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0281-Optimize-CraftBlockData-Creation.patch
index f6154598db..515cb01127 100644
--- a/Spigot-Server-Patches/0282-Optimize-CraftBlockData-Creation.patch
+++ b/Spigot-Server-Patches/0281-Optimize-CraftBlockData-Creation.patch
@@ -1,4 +1,4 @@
-From 7246646de47fcafd5219444ac7fbe44c68574aa5 Mon Sep 17 00:00:00 2001
+From ff43a33658c40c998527521c00d78e1f3908c7bd Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Thu, 23 Aug 2018 11:45:32 -0400
 Subject: [PATCH] Optimize CraftBlockData Creation
@@ -36,7 +36,7 @@ index 9ab57be85..c1ff62aa5 100644
          return this.getBlock().k(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index e371e7f6d..32e1e7e20 100644
+index 683b17a0c..a0746a169 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -549,7 +549,17 @@ public class CraftBlockData implements BlockData {
@@ -58,5 +58,5 @@ index e371e7f6d..32e1e7e20 100644
      }
  }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0283-Fix-MC-124320.patch b/Spigot-Server-Patches/0282-Fix-MC-124320.patch
similarity index 96%
rename from Spigot-Server-Patches/0283-Fix-MC-124320.patch
rename to Spigot-Server-Patches/0282-Fix-MC-124320.patch
index 5715f634ec..fcafe2633a 100644
--- a/Spigot-Server-Patches/0283-Fix-MC-124320.patch
+++ b/Spigot-Server-Patches/0282-Fix-MC-124320.patch
@@ -1,4 +1,4 @@
-From d8977d2a7209f4b7f6523cb8c8ebc71ceeed68a7 Mon Sep 17 00:00:00 2001
+From 44b4978b2f2c21267dcc18515c9c986c711c9150 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 23 Aug 2018 09:25:30 -0500
 Subject: [PATCH] Fix MC-124320
@@ -17,7 +17,7 @@ index 5f261b9b9..b9b750c36 100644
          IBlockData iblockdata1 = iblockdata;
          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index ca8e43fdf..149de2c57 100644
+index b7c67f0cd..d86f76f30 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -354,8 +354,9 @@ public class EntityEnderman extends EntityMonster {
@@ -49,5 +49,5 @@ index ca8e43fdf..149de2c57 100644
              if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1, blockposition1)) {
                  // CraftBukkit start - Place event
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0284-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0283-Slime-Pathfinder-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0284-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0283-Slime-Pathfinder-Events.patch
index 068ba53f82..ee3ba35ec1 100644
--- a/Spigot-Server-Patches/0284-Slime-Pathfinder-Events.patch
+++ b/Spigot-Server-Patches/0283-Slime-Pathfinder-Events.patch
@@ -1,4 +1,4 @@
-From 6c0ae9f5105e2d7110301f84efda3a6dbe298197 Mon Sep 17 00:00:00 2001
+From 9d78806cb95ad358b096de75396d79a09e624e2d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 08:18:42 -0500
 Subject: [PATCH] Slime Pathfinder Events
@@ -166,5 +166,5 @@ index ce6ed6e89..6e9f1b66d 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0285-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0284-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 97%
rename from Spigot-Server-Patches/0285-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0284-Configurable-speed-for-water-flowing-over-lava.patch
index ceef65c15b..6fc273e095 100644
--- a/Spigot-Server-Patches/0285-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0284-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,4 +1,4 @@
-From ed07543a84e9138f21e466ed7c05b8b2a6440b9c Mon Sep 17 00:00:00 2001
+From 56b1bf3608cef2c0324805e96628badabb82e420 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 8 Aug 2018 16:33:21 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
@@ -63,5 +63,5 @@ index f56e14e1e..6d351f097 100644
  
      }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0286-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0285-Optimize-RegistryMaterials.patch
similarity index 94%
rename from Spigot-Server-Patches/0286-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0285-Optimize-RegistryMaterials.patch
index c71aed3c0f..99a3c0236d 100644
--- a/Spigot-Server-Patches/0286-Optimize-RegistryMaterials.patch
+++ b/Spigot-Server-Patches/0285-Optimize-RegistryMaterials.patch
@@ -1,4 +1,4 @@
-From 78858b4afe31d5113d447014455190134e115a14 Mon Sep 17 00:00:00 2001
+From fa26bac76e8d9a8d2e42958564faf5613d324084 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Aug 2018 20:49:50 -0400
 Subject: [PATCH] Optimize RegistryMaterials
@@ -31,5 +31,5 @@ index 2d6a7b3a4..8477febca 100644
      }
  }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0287-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0286-Add-PhantomPreSpawnEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0287-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0286-Add-PhantomPreSpawnEvent.patch
index b078a5d17e..54ab4da020 100644
--- a/Spigot-Server-Patches/0287-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-Server-Patches/0286-Add-PhantomPreSpawnEvent.patch
@@ -1,4 +1,4 @@
-From a23e2b70f800aa1c6beecc83497f32a23d53dc9d Mon Sep 17 00:00:00 2001
+From b545162dc8015f80b7e162de86d032856d029d2a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 25 Aug 2018 19:56:51 -0500
 Subject: [PATCH] Add PhantomPreSpawnEvent
@@ -86,5 +86,5 @@ index 9f9ee9239..2b9731369 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0288-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0287-Add-More-Creeper-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0288-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0287-Add-More-Creeper-API.patch
index c69c5f8f9f..5e2588af42 100644
--- a/Spigot-Server-Patches/0288-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0287-Add-More-Creeper-API.patch
@@ -1,4 +1,4 @@
-From 938ec7bad64961812a276eeca50182aac6d82771 Mon Sep 17 00:00:00 2001
+From 5ac23948fb65632ebb4b47e95cd268d6552fb425 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 11:50:26 -0500
 Subject: [PATCH] Add More Creeper API
@@ -61,5 +61,5 @@ index 896405148..075a5e77e 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0289-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0288-Inventory-removeItemAnySlot.patch
similarity index 96%
rename from Spigot-Server-Patches/0289-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0288-Inventory-removeItemAnySlot.patch
index 492baf93b2..e8ef21c859 100644
--- a/Spigot-Server-Patches/0289-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0288-Inventory-removeItemAnySlot.patch
@@ -1,4 +1,4 @@
-From 709122fd6dbbff605b357f26baf0f272095682a6 Mon Sep 17 00:00:00 2001
+From 1ac398b35579dd8be181195d6646a8dc4a3fb2b8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 28 Aug 2018 23:04:15 -0400
 Subject: [PATCH] Inventory#removeItemAnySlot
@@ -57,5 +57,5 @@ index 0d637e207..026a0c399 100644
                  // Drat! we don't have this type in the inventory
                  if (first == -1) {
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0290-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 91%
rename from Spigot-Server-Patches/0290-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index bcd835641f..8f60c798d8 100644
--- a/Spigot-Server-Patches/0290-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From a8a52313ee7e3bdb0a7b6f512c7fd9ef8d4d7327 Mon Sep 17 00:00:00 2001
+From 34fad952972d6d653e377a4c48733dbabc6a5431 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 2 Sep 2018 19:34:33 -0700
 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
@@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2b82a9438..ce1ac730c 100644
+index fe0912c06..9940b9520 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -495,7 +495,7 @@ public class CraftWorld implements World {
@@ -19,5 +19,5 @@ index 2b82a9438..ce1ac730c 100644
          // If generate = false, but the chunk already exists, we will get this back.
          if (chunk instanceof ProtoChunkExtension) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0291-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0290-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 96%
rename from Spigot-Server-Patches/0291-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0290-Add-ray-tracing-methods-to-LivingEntity.patch
index 84743dee59..1a816062ef 100644
--- a/Spigot-Server-Patches/0291-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0290-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,11 +1,11 @@
-From cd7e912885165be1e5db3cc50802f5a8301a18be Mon Sep 17 00:00:00 2001
+From d7f1f91234c64c346a8370b929ec2b329eeaeb5b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:20:03 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0b84ead5f2..fa097e0551 100644
+index 0b84ead5f..fa097e055 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3254,6 +3254,23 @@ public abstract class EntityLiving extends Entity {
@@ -33,7 +33,7 @@ index 0b84ead5f2..fa097e0551 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 02346f1c50..d197094f54 100644
+index 02346f1c5..d197094f5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -196,6 +196,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -66,5 +66,5 @@ index 02346f1c50..d197094f54 100644
      public List<Block> getLastTwoTargetBlocks(Set<Material> transparent, int maxDistance) {
          return getLineOfSight(transparent, maxDistance, 2);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0292-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0291-Expose-attack-cooldown-methods-for-Player.patch
similarity index 93%
rename from Spigot-Server-Patches/0292-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0291-Expose-attack-cooldown-methods-for-Player.patch
index 6319ee37d3..178073a137 100644
--- a/Spigot-Server-Patches/0292-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0291-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,11 +1,11 @@
-From a257773366babc48f6a1c3230cee3b7d68852384 Mon Sep 17 00:00:00 2001
+From 007fe854bd38c938febf2296f1a64997bec74314 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:02:00 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 36748ccb73..308ac18f7e 100644
+index 36748ccb7..308ac18f7 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2123,14 +2123,17 @@ public abstract class EntityHuman extends EntityLiving {
@@ -27,7 +27,7 @@ index 36748ccb73..308ac18f7e 100644
          this.aB = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d7d86a8b24..d584c76ecd 100644
+index d7d86a8b2..d584c76ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1940,6 +1940,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -52,5 +52,5 @@ index d7d86a8b24..d584c76ecd 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0293-Improve-death-events.patch b/Spigot-Server-Patches/0292-Improve-death-events.patch
similarity index 98%
rename from Spigot-Server-Patches/0293-Improve-death-events.patch
rename to Spigot-Server-Patches/0292-Improve-death-events.patch
index de89f94ee6..82457407de 100644
--- a/Spigot-Server-Patches/0293-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0292-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From 08330b806b1c6fee692aedb3dabc2137b8295eef Mon Sep 17 00:00:00 2001
+From 0926eb667c99b565347b26b71f797d2b2eadeadc Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
-index 6daa400d27..38fe29f8a2 100644
+index 6daa400d2..38fe29f8a 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
 @@ -175,6 +175,7 @@ public class CombatTracker {
@@ -27,7 +27,7 @@ index 6daa400d27..38fe29f8a2 100644
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 02aa493f17..e8b70a5ca5 100644
+index 02aa493f1..e8b70a5ca 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1503,6 +1503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -47,7 +47,7 @@ index 02aa493f17..e8b70a5ca5 100644
  
      protected void k(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 42b9a339e9..8ad131e4fc 100644
+index 42b9a339e..8ad131e4f 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -701,7 +701,8 @@ public class EntityArmorStand extends EntityLiving {
@@ -61,7 +61,7 @@ index 42b9a339e9..8ad131e4fc 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 2be6c7bde9..82a32d5dbf 100644
+index 2be6c7bde..82a32d5db 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -571,15 +571,25 @@ public class EntityFox extends EntityAnimal {
@@ -94,7 +94,7 @@ index 2be6c7bde9..82a32d5dbf 100644
  
      public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
 diff --git a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
-index 80717ad9ac..53aac5bccd 100644
+index 80717ad9a..53aac5bcc 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
 @@ -55,11 +55,19 @@ public abstract class EntityHorseChestedAbstract extends EntityHorseAbstract {
@@ -119,7 +119,7 @@ index 80717ad9ac..53aac5bccd 100644
      public void b(NBTTagCompound nbttagcompound) {
          super.b(nbttagcompound);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fa097e0551..eed3e7c58e 100644
+index fa097e055..eed3e7c58 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -89,7 +89,7 @@ public abstract class EntityLiving extends Entity {
@@ -279,7 +279,7 @@ index fa097e0551..eed3e7c58e 100644
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f849dba215..4b40ffa978 100644
+index f849dba21..4b40ffa97 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -76,6 +76,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -330,7 +330,7 @@ index f849dba215..4b40ffa978 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 90fdf89c81..b761a41dcd 100644
+index 90fdf89c8..b761a41dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 @@ -821,6 +821,22 @@ public enum CraftSound {
@@ -357,7 +357,7 @@ index 90fdf89c81..b761a41dcd 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d584c76ecd..878287cf0d 100644
+index d584c76ec..878287cf0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1733,7 +1733,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -378,7 +378,7 @@ index d584c76ecd..878287cf0d 100644
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f006b441ad..39ce40bd58 100644
+index f006b441a..39ce40bd5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -749,9 +749,16 @@ public class CraftEventFactory {
@@ -447,5 +447,5 @@ index f006b441ad..39ce40bd58 100644
       * Server methods
       */
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0294-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0293-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 92%
rename from Spigot-Server-Patches/0294-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0293-Allow-chests-to-be-placed-with-NBT-data.patch
index 4aa1054e0f..63fff7f261 100644
--- a/Spigot-Server-Patches/0294-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0293-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -1,11 +1,11 @@
-From 4ac284d3aa453ecbbc9a1b1386017807ec647926 Mon Sep 17 00:00:00 2001
+From 3e077f1bf8f2c01f9dea36dbfbdb39e81ed161c2 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Sep 2018 18:43:31 -0500
 Subject: [PATCH] Allow chests to be placed with NBT data
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 962183491..1be4cd163 100644
+index 0b0c3c681..d953cdef1 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -240,6 +240,7 @@ public final class ItemStack {
@@ -30,5 +30,5 @@ index c4766f729..b22bd06e2 100644
      // CraftBukkit end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0295-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0294-Mob-Pathfinding-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0295-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0294-Mob-Pathfinding-API.patch
index 340cbc11ac..a4a6e3a159 100644
--- a/Spigot-Server-Patches/0295-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0294-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From 8fd28572ae389bfe1c6e7251634faaafbcaedbae Mon Sep 17 00:00:00 2001
+From 34442249275444961016441d3496362c4c48cadd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 13:30:00 -0400
 Subject: [PATCH] Mob Pathfinding API
@@ -227,7 +227,7 @@ index b1db95daa..18cdd2a6f 100644
      public int d = -1;
      public float e;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 5bf1cd06f..53c2d154e 100644
+index 90e63fbf2..c89bc7024 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable;
@@ -243,5 +243,5 @@ index 5bf1cd06f..53c2d154e 100644
      public void setTarget(LivingEntity target) {
          EntityInsentient entity = getHandle();
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0296-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0295-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 98%
rename from Spigot-Server-Patches/0296-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0295-Prevent-chunk-loading-from-Fluid-Flowing.patch
index ba64b05ee8..f86d722dd7 100644
--- a/Spigot-Server-Patches/0296-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0295-Prevent-chunk-loading-from-Fluid-Flowing.patch
@@ -1,4 +1,4 @@
-From bc9f4ac177333ed1d663fefc34e681de57b715c9 Mon Sep 17 00:00:00 2001
+From 3c964129094fed21fa99aed9111584300e583f93 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:36:16 -0400
 Subject: [PATCH] Prevent chunk loading from Fluid Flowing
@@ -74,5 +74,5 @@ index 3099a5e65..376dca188 100644
              Fluid fluid = (Fluid) pair.getSecond();
              Fluid fluid1 = this.a(iworldreader, blockposition1, iblockdata1);
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0297-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 99%
rename from Spigot-Server-Patches/0297-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 63ea612d38..d908dedf6b 100644
--- a/Spigot-Server-Patches/0297-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -1,11 +1,11 @@
-From 9471146c065d29d7d11f1538d6dcffdcf985d32b Mon Sep 17 00:00:00 2001
+From d2072c82ded4da97259e387eb5006d7390169ad0 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:55 +0300
 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
 
 
 diff --git a/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java
-index 005ebec266..97d85f8451 100644
+index 005ebec26..97d85f845 100644
 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java
 +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java
 @@ -43,7 +43,7 @@ public class ArgumentBlock {
@@ -32,7 +32,7 @@ index 005ebec266..97d85f8451 100644
          this.s = this::l;
          if (this.i.canRead() && this.i.peek() == '#') {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 3325111f8a..0606e69a61 100644
+index 0682c6e85..cdd262d86 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -87,6 +87,12 @@ import org.bukkit.persistence.PersistentDataContainer;
@@ -432,5 +432,5 @@ index 3325111f8a..0606e69a61 100644
 +    // Paper end
  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0298-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 98%
rename from Spigot-Server-Patches/0298-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index ae634095cd..b7e5014ec1 100644
--- a/Spigot-Server-Patches/0298-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -1,4 +1,4 @@
-From ea6be7d9eec94c640a01e551254eb74777100b35 Mon Sep 17 00:00:00 2001
+From c78da171571b4c501b074da90f332bd2cfd04617 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:56:36 -0400
 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
@@ -74,5 +74,5 @@ index d4cd50918..d6a3b9933 100644
  
                          if (entitycreature.a(pathtype) == 0.0F) {
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0299-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0298-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0299-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0298-Prevent-mob-spawning-from-loading-generating-chunks.patch
index d22b5327b1..2e82e9172e 100644
--- a/Spigot-Server-Patches/0299-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0298-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -1,4 +1,4 @@
-From 13f578fb8354a5ef83e3765c1ddb1513ac7b0ac5 Mon Sep 17 00:00:00 2001
+From c477f5ca9e218c211b69584171d6193f71e8062c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 12 Sep 2018 21:12:57 -0400
 Subject: [PATCH] Prevent mob spawning from loading/generating chunks
@@ -31,5 +31,5 @@ index 224443e03..fdac5bb3a 100644
  
                                          if (Objects.equals(chunkcoordintpair, chunk.getPos()) || worldserver.getChunkProvider().a(chunkcoordintpair)) {
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0300-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 97%
rename from Spigot-Server-Patches/0300-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 58a33ffa1c..eee9c26a23 100644
--- a/Spigot-Server-Patches/0300-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -1,4 +1,4 @@
-From 89395a6f037f018a26ae8cb2c1d3875f86e9fa3d Mon Sep 17 00:00:00 2001
+From 25c89be5d3c5ac036b8725db797a95b163b7275a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 12 Sep 2018 21:47:01 -0400
 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
@@ -67,5 +67,5 @@ index 253890e53..0102a170d 100644
  
          @Nullable
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0301-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0300-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0301-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0300-Implement-furnace-cook-speed-multiplier-API.patch
index 0222227334..44bab8e984 100644
--- a/Spigot-Server-Patches/0301-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0300-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From 7ee109973dbce56d13226f7108948a67f50b6477 Mon Sep 17 00:00:00 2001
+From 5e77ee0ecdf1572e88759c5122e315da8cf830f4 Mon Sep 17 00:00:00 2001
 From: Tassu <git@tassu.me>
 Date: Thu, 13 Sep 2018 08:45:21 +0300
 Subject: [PATCH] Implement furnace cook speed multiplier API
@@ -80,5 +80,5 @@ index 9cc67915c..1ce10ea04 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0301-Support-Overriding-World-Seeds.patch
similarity index 98%
rename from Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch
rename to Spigot-Server-Patches/0301-Support-Overriding-World-Seeds.patch
index 7b2b9a5ad1..a9d0f76327 100644
--- a/Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0301-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From e0300bd3374224689c4a9cd454254a19f8f1a1e0 Mon Sep 17 00:00:00 2001
+From 21398dff09048bae64ad0de46e3b26d3436291a2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:05:31 -0400
 Subject: [PATCH] Support Overriding World Seeds
@@ -98,5 +98,5 @@ index 4cf288790..f36b64246 100644
              if (parsedSettings.isJsonObject()) {
                  worldSettings.setGeneratorSettings(parsedSettings.getAsJsonObject());
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0303-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0302-Optimize-Server-World-Map.patch
similarity index 99%
rename from Spigot-Server-Patches/0303-Optimize-Server-World-Map.patch
rename to Spigot-Server-Patches/0302-Optimize-Server-World-Map.patch
index 456ca781b6..9324ec8772 100644
--- a/Spigot-Server-Patches/0303-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0302-Optimize-Server-World-Map.patch
@@ -1,4 +1,4 @@
-From 70cbd0e7773ec3e6c0cb8ca31e0a958749e12139 Mon Sep 17 00:00:00 2001
+From 4c3cbbfd6996fbf68abb243106da513d0a722c64 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:37:31 -0400
 Subject: [PATCH] Optimize Server World Map
@@ -247,5 +247,5 @@ index 52ec526fc..a3156d003 100644
              DimensionManager dimensionmanager = worldserver.worldProvider.getDimensionManager();
              ForcedChunk forcedchunk = (ForcedChunk) worldserver.getWorldPersistentData().b(ForcedChunk::new, "chunks");
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0304-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0303-PreSpawnerSpawnEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0304-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0303-PreSpawnerSpawnEvent.patch
index eb29c3841d..e6548e505e 100644
--- a/Spigot-Server-Patches/0304-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0303-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 70ef18b1711516ce14317f6cfe9f1c5723c8c1eb Mon Sep 17 00:00:00 2001
+From 8e2d2210569877d0568577da6e6e55daf987389e Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:53:23 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
@@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for
 spawners.
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index fe8bc7f75..90ca1ee14 100644
+index 43c491f71..cb7cb789b 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -111,11 +111,11 @@ public abstract class MobSpawnerAbstract {
@@ -28,5 +28,5 @@ index fe8bc7f75..90ca1ee14 100644
                              if (!event.callEvent()) {
                                  flag = true;
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0305-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0304-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 94%
rename from Spigot-Server-Patches/0305-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0304-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 6e248d3e46..71f7e0caac 100644
--- a/Spigot-Server-Patches/0305-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0304-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From 4be55289f11432ae8f1525e88839e5c5732836db Mon Sep 17 00:00:00 2001
+From ca5a86333945a2359dd570e33c5be15be84ece80 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 22 Sep 2018 15:56:59 -0400
 Subject: [PATCH] Catch JsonParseException in Entity and TE names
@@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly
 No more crashing though.
 
 diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
-index 7867122974..ef2a496eda 100644
+index 786712297..ef2a496ed 100644
 --- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 +++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 @@ -59,7 +59,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
@@ -26,7 +26,7 @@ index 7867122974..ef2a496eda 100644
  
          if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e8b70a5ca5..9a23380600 100644
+index e8b70a5ca..9a2338060 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1679,7 +1679,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index e8b70a5ca5..9a23380600 100644
  
                      this.setCustomNameVisible(nbttagcompound.getBoolean("CustomNameVisible"));
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 2a22bc6f3e..3a482466ec 100644
+index 2a22bc6f3..3a482466e 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -409,4 +409,19 @@ public final class MCUtil {
@@ -63,7 +63,7 @@ index 2a22bc6f3e..3a482466ec 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java
-index 93911a8251..d35604edb2 100644
+index 93911a825..d35604edb 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java
 @@ -60,7 +60,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity {
@@ -76,7 +76,7 @@ index 93911a8251..d35604edb2 100644
  
          if (this.hasWorld()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityContainer.java b/src/main/java/net/minecraft/server/TileEntityContainer.java
-index 473ec2cbde..ab6b86e4e9 100644
+index 473ec2cbd..ab6b86e4e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityContainer.java
 +++ b/src/main/java/net/minecraft/server/TileEntityContainer.java
 @@ -17,7 +17,7 @@ public abstract class TileEntityContainer extends TileEntity implements IInvento
@@ -89,5 +89,5 @@ index 473ec2cbde..ab6b86e4e9 100644
  
      }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0305-Avoid-dimension-id-collisions.patch
similarity index 94%
rename from Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch
rename to Spigot-Server-Patches/0305-Avoid-dimension-id-collisions.patch
index 1f0bd4544b..79b8460dcb 100644
--- a/Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0305-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From e75865f7fcf2070416e62057ef5a6b8bc66eb190 Mon Sep 17 00:00:00 2001
+From bdd8538f1464d27e07f46d9c5e98c225b4eee934 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 25 Sep 2018 06:53:43 +0200
 Subject: [PATCH] Avoid dimension id collisions
@@ -21,5 +21,5 @@ index f36b64246..4289d029c 100644
                      dimension++;
                      break;
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0307-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0306-Honor-EntityAgeable.ageLock.patch
similarity index 89%
rename from Spigot-Server-Patches/0307-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0306-Honor-EntityAgeable.ageLock.patch
index 33bdbb37e9..fdd914054e 100644
--- a/Spigot-Server-Patches/0307-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0306-Honor-EntityAgeable.ageLock.patch
@@ -1,4 +1,4 @@
-From 75cfa2e57d0ff320616705d625bc3de1717c5c43 Mon Sep 17 00:00:00 2001
+From 3bb8ed8325e88e461ca22e78eb5f211948bdc4a6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 23 Sep 2018 20:59:53 -0500
 Subject: [PATCH] Honor EntityAgeable.ageLock
@@ -17,5 +17,5 @@ index cec938436..3d27f0964 100644
          int k = j;
  
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0308-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0307-Configurable-connection-throttle-kick-message.patch
similarity index 96%
rename from Spigot-Server-Patches/0308-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0307-Configurable-connection-throttle-kick-message.patch
index 4aefbd4179..cc29f8d124 100644
--- a/Spigot-Server-Patches/0308-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0307-Configurable-connection-throttle-kick-message.patch
@@ -1,4 +1,4 @@
-From 398196f95888864e3806b5760956bd7cdb17b2bf Mon Sep 17 00:00:00 2001
+From 93f743c597f7213554bda4827159d3dab780f5fa Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 2 Oct 2018 09:57:50 +0100
 Subject: [PATCH] Configurable connection throttle kick message
@@ -34,5 +34,5 @@ index 8928d93e4..0532f975b 100644
                              this.b.close(chatmessage);
                              return;
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0309-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0308-Hook-into-CB-plugin-rewrites.patch
similarity index 98%
rename from Spigot-Server-Patches/0309-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0308-Hook-into-CB-plugin-rewrites.patch
index 9c2ca14f56..f2885223d7 100644
--- a/Spigot-Server-Patches/0309-Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/0308-Hook-into-CB-plugin-rewrites.patch
@@ -1,4 +1,4 @@
-From 210300e7972f42ccac44af3d20da7d2c5a376afb Mon Sep 17 00:00:00 2001
+From f17840fb1a9ed8fc2f6ce92405290068e258d44f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 3 Oct 2018 20:09:18 -0400
 Subject: [PATCH] Hook into CB plugin rewrites
@@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
 debugging in an IDE pre-relocate.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 467b2d938..61f102355 100644
+index 2d334a594..79c9489c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -6,7 +6,9 @@ import java.io.FileOutputStream;
@@ -187,5 +187,5 @@ index 467b2d938..61f102355 100644
                          {
                              if ( owner.equals( "org/bukkit/Material" ) )
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0310-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0309-Allow-setting-the-vex-s-summoner.patch
similarity index 94%
rename from Spigot-Server-Patches/0310-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0309-Allow-setting-the-vex-s-summoner.patch
index 586e2137c1..b989dfa7aa 100644
--- a/Spigot-Server-Patches/0310-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/0309-Allow-setting-the-vex-s-summoner.patch
@@ -1,4 +1,4 @@
-From 4dc40c1775c78bde423d620db9bf4d4adc94a05b Mon Sep 17 00:00:00 2001
+From d5eb1130ffd33d83a7824f1d964323a5c64cd7ef Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 21:47:44 -0500
 Subject: [PATCH] Allow setting the vex's summoner
@@ -32,5 +32,5 @@ index 169c951ec..2f7df3074 100644
  
      @Override
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0311-Add-sun-related-API.patch b/Spigot-Server-Patches/0310-Add-sun-related-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0311-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0310-Add-sun-related-API.patch
index 092f6c339e..a6b680f162 100644
--- a/Spigot-Server-Patches/0311-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0310-Add-sun-related-API.patch
@@ -1,11 +1,11 @@
-From acbf444d827b68afd4c0b3a95289fa3abc00523b Mon Sep 17 00:00:00 2001
+From 9b1e5a4f47ad58077b804230c5f7a2f5d8999824 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index b5816dc89e..bed15873b6 100644
+index b5816dc89..bed15873b 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1341,6 +1341,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -17,7 +17,7 @@ index b5816dc89e..bed15873b6 100644
          if (this.world.isDay() && !this.world.isClientSide) {
              float f = this.aI();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ce1ac730cb..323d78b22f 100644
+index 9940b9520..b41404652 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -852,6 +852,13 @@ public class CraftWorld implements World {
@@ -35,7 +35,7 @@ index ce1ac730cb..323d78b22f 100644
      public boolean createExplosion(double x, double y, double z, float power) {
          return createExplosion(x, y, z, power, false, true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index c89bc7024b..eaad222fd3 100644
+index c89bc7024..eaad222fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -78,4 +78,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
@@ -51,5 +51,5 @@ index c89bc7024b..eaad222fd3 100644
 +    // Paper end
  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0312-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0311-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 94%
rename from Spigot-Server-Patches/0312-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0311-Check-Drowned-for-Villager-Aggression-Config.patch
index e1433be33d..b7e85f768b 100644
--- a/Spigot-Server-Patches/0312-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/0311-Check-Drowned-for-Villager-Aggression-Config.patch
@@ -1,4 +1,4 @@
-From 83b0524a338f924e7ba399ecb218dc27210ea168 Mon Sep 17 00:00:00 2001
+From b36c012db5e35944fda342922b97e70304ae5371 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 10 Oct 2018 21:22:44 -0500
 Subject: [PATCH] Check Drowned for Villager Aggression Config
@@ -18,5 +18,5 @@ index 70c06ca77..77885f67f 100644
          this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bw));
      }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0313-Here-s-Johnny.patch b/Spigot-Server-Patches/0312-Here-s-Johnny.patch
similarity index 95%
rename from Spigot-Server-Patches/0313-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0312-Here-s-Johnny.patch
index 66e6fa17f0..22fbc3896b 100644
--- a/Spigot-Server-Patches/0313-Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/0312-Here-s-Johnny.patch
@@ -1,4 +1,4 @@
-From 1e7fdb5e3eeaf2540a4310d130543d633407bb6a Mon Sep 17 00:00:00 2001
+From 7d691218ef28e137e708cf79fb91e24e628da53d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 01:37:22 -0500
 Subject: [PATCH] Here's Johnny!
@@ -37,5 +37,5 @@ index 951d47929..5ff957ced 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0314-Turtle-API.patch b/Spigot-Server-Patches/0313-Turtle-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0314-Turtle-API.patch
rename to Spigot-Server-Patches/0313-Turtle-API.patch
index 7c80c235f1..479a9133f4 100644
--- a/Spigot-Server-Patches/0314-Turtle-API.patch
+++ b/Spigot-Server-Patches/0313-Turtle-API.patch
@@ -1,4 +1,4 @@
-From a4255ab47148cc0b59007704a6f4ac1ed48b373b Mon Sep 17 00:00:00 2001
+From e5fe16d5ec0b517fbc1143aa49cb4fdfc61fc5ae Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 29 Sep 2018 16:08:23 -0500
 Subject: [PATCH] Turtle API
@@ -153,5 +153,5 @@ index 123a2c75c..8edcf7af6 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0315-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0314-Limit-lightning-strike-effect-distance.patch
similarity index 96%
rename from Spigot-Server-Patches/0315-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0314-Limit-lightning-strike-effect-distance.patch
index ff2e1e88cf..e09a66b9dc 100644
--- a/Spigot-Server-Patches/0315-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0314-Limit-lightning-strike-effect-distance.patch
@@ -1,11 +1,11 @@
-From f4e1ede0e866a8f95fcf9a7adf08311a6509edb2 Mon Sep 17 00:00:00 2001
+From 6a6e3975077b008f8f327ca08643cd1eaa7a87f8 Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 487b0d5cd6..b8789c8ecc 100644
+index 487b0d5cd..b8789c8ec 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -242,6 +242,28 @@ public class PaperWorldConfig {
@@ -38,7 +38,7 @@ index 487b0d5cd6..b8789c8ecc 100644
      private void fixedInhabitedTime() {
          if (PaperConfig.version < 16) {
 diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
-index 7c518983a9..bdb534deb4 100644
+index 7c518983a..bdb534deb 100644
 --- a/src/main/java/net/minecraft/server/EntityLightning.java
 +++ b/src/main/java/net/minecraft/server/EntityLightning.java
 @@ -64,6 +64,17 @@ public class EntityLightning extends Entity {
@@ -69,7 +69,7 @@ index 7c518983a9..bdb534deb4 100644
  
          --this.lifeTicks;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f12cadc735..78a9b31891 100644
+index a411a23de..49b1939d1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1271,7 +1271,7 @@ public class WorldServer extends World {
@@ -82,5 +82,5 @@ index f12cadc735..78a9b31891 100644
  
      @Override
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0316-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 95%
rename from Spigot-Server-Patches/0316-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index 871e31b45a..8f3fd87424 100644
--- a/Spigot-Server-Patches/0316-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/Spigot-Server-Patches/0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@@ -1,4 +1,4 @@
-From 92c918d21661c0c057fea5381883b61b291fb1ea Mon Sep 17 00:00:00 2001
+From 7da42baba510552c0cb1df21a0c74db0977b0663 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 17 Oct 2018 19:17:27 -0400
 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles
@@ -32,5 +32,5 @@ index 9eed1dce3..6c091b680 100644
              if (entity instanceof EntityLiving) {
                  this.shooter = (EntityLiving) entity;
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0317-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0316-Call-player-spectator-target-events.patch
similarity index 96%
rename from Spigot-Server-Patches/0317-Call-player-spectator-target-events.patch
rename to Spigot-Server-Patches/0316-Call-player-spectator-target-events.patch
index 66216cad97..549a5b6028 100644
--- a/Spigot-Server-Patches/0317-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0316-Call-player-spectator-target-events.patch
@@ -1,11 +1,11 @@
-From ddf9098de1112465064b9e294429137b11f49e98 Mon Sep 17 00:00:00 2001
+From 53af1cd635d13b6d5e941ae56d6a8de11cb9d948 Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:32:19 -0500
 Subject: [PATCH] Call player spectator target events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4b40ffa978..bf21fb69a5 100644
+index 4b40ffa97..bf21fb69a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -61,7 +61,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -67,5 +67,5 @@ index 4b40ffa978..bf21fb69a5 100644
  
      @Override
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0318-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from Spigot-Server-Patches/0318-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch
index dcc6acd71b..8236cd1efd 100644
--- a/Spigot-Server-Patches/0318-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch
@@ -1,4 +1,4 @@
-From ed163d80c617edd6e48714cc403a3d8a5c3a2f9d Mon Sep 17 00:00:00 2001
+From 50e4286b71f66dfe05505d9856df25b120928111 Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 8 Oct 2018 14:36:14 -0400
 Subject: [PATCH] Add Velocity IP Forwarding Support
@@ -278,7 +278,7 @@ index ae74dc9e1..7eb230f1b 100644
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
          this.a = packetdataserializer.i();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 625a00c3d..55fc1390a 100644
+index 4289d029c..fa35b8459 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -647,7 +647,7 @@ public final class CraftServer implements Server {
@@ -291,5 +291,5 @@ index 625a00c3d..55fc1390a 100644
          } else {
              return this.configuration.getInt("settings.connection-throttle");
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0319-Add-more-Witch-API.patch b/Spigot-Server-Patches/0318-Add-more-Witch-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0319-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0318-Add-more-Witch-API.patch
index dfa01402d5..ead32cd753 100644
--- a/Spigot-Server-Patches/0319-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0318-Add-more-Witch-API.patch
@@ -1,4 +1,4 @@
-From 2d61118e91c6ad8897f59f32eb3d9f8311481884 Mon Sep 17 00:00:00 2001
+From 53dee72bcea86101b83cd9fc6d59c948be6cbe5f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 14:10:46 -0500
 Subject: [PATCH] Add more Witch API
@@ -146,5 +146,5 @@ index bae107e76..b43a2bbd5 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0320-Fix-MC-93764.patch b/Spigot-Server-Patches/0319-Fix-MC-93764.patch
similarity index 88%
rename from Spigot-Server-Patches/0320-Fix-MC-93764.patch
rename to Spigot-Server-Patches/0319-Fix-MC-93764.patch
index 502ded5003..edcf164ca3 100644
--- a/Spigot-Server-Patches/0320-Fix-MC-93764.patch
+++ b/Spigot-Server-Patches/0319-Fix-MC-93764.patch
@@ -1,4 +1,4 @@
-From 8d74a1d31f57e2c6dc0c179601db6a18d6a1e821 Mon Sep 17 00:00:00 2001
+From f2429882921a9ca0d8f156105b09d086589164c7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Oct 2018 19:38:45 -0500
 Subject: [PATCH] Fix MC-93764
@@ -18,5 +18,5 @@ index 9d4fcf8bc..4b9760709 100644
  
      @Override
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0321-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0320-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 97%
rename from Spigot-Server-Patches/0321-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0320-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 2f8d2979be..bbb8252833 100644
--- a/Spigot-Server-Patches/0321-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0320-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -1,4 +1,4 @@
-From ade44b08c750ffcf815f12a5e98071d3c52a62fe Mon Sep 17 00:00:00 2001
+From f871d28d4e2f369979bf91ffcabdb2f7d180a70a Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
@@ -20,7 +20,7 @@ index b8789c8ec..0862a1d62 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 77c375f71..ccad0a601 100644
+index 6627d8402..bde60377e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -351,6 +351,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -63,5 +63,5 @@ index 77c375f71..ccad0a601 100644
                              if (!this.player.H() && (!this.player.getWorldServer().getGameRules().getBoolean(GameRules.DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isGliding())) {
                                  float f2 = this.player.isGliding() ? 300.0F : 100.0F;
 -- 
-2.25.0.windows.1
+2.25.1
 
diff --git a/Spigot-Server-Patches/0322-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0321-Reset-players-airTicks-on-respawn.patch
similarity index 88%
rename from Spigot-Server-Patches/0322-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0321-Reset-players-airTicks-on-respawn.patch
index c8ef958486..c1c7708ead 100644
--- a/Spigot-Server-Patches/0322-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0321-Reset-players-airTicks-on-respawn.patch
@@ -1,11 +1,11 @@
-From 38a4719c10be78309b32b84152609dd9798b058a Mon Sep 17 00:00:00 2001
+From 7b22e6668240d850db0689d1e7f525260f776d80 Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9a23380600..ecd0387627 100644
+index 9a2338060..ecd038762 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2326,6 +2326,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,7 +17,7 @@ index 9a23380600..ecd0387627 100644
          return 300;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index bf21fb69a5..e91938b54c 100644
+index bf21fb69a..e91938b54 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1867,6 +1867,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -29,5 +29,5 @@ index bf21fb69a5..e91938b54c 100644
          this.fallDistance = 0;
          this.foodData = new FoodMetaData(this);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0323-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0322-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 95%
rename from Spigot-Server-Patches/0323-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0322-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index 7e63b710c0..cdcd9056ff 100644
--- a/Spigot-Server-Patches/0323-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0322-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -1,4 +1,4 @@
-From abdac842cad2aefea0af10435e422918867fbffc Mon Sep 17 00:00:00 2001
+From 1415b8bf619feafdff4bc2889802c28825e6c73c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 20:25:05 -0400
 Subject: [PATCH] Don't sleep after profile lookups if not needed
@@ -32,5 +32,5 @@ index 71e48e87b..23f1447cf 100644
                      try {
                          Thread.sleep(DELAY_BETWEEN_PAGES);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0324-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0323-Use-more-reasonable-thread-count-default-for-bootstr.patch
similarity index 92%
rename from Spigot-Server-Patches/0324-Use-more-reasonable-thread-count-default-for-bootstr.patch
rename to Spigot-Server-Patches/0323-Use-more-reasonable-thread-count-default-for-bootstr.patch
index 7847c46134..6ed820bd11 100644
--- a/Spigot-Server-Patches/0324-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0323-Use-more-reasonable-thread-count-default-for-bootstr.patch
@@ -1,4 +1,4 @@
-From 94ad20a66877884fc46b2f8348839fac269eb3cb Mon Sep 17 00:00:00 2001
+From 0adf0a54a9c7fecea654294f0b8a33dae051d6e2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 23:14:38 -0400
 Subject: [PATCH] Use more reasonable thread count default for bootstrap
@@ -18,5 +18,5 @@ index 7e224ebef..dc6d03062 100644
  
          if (i <= 0) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0325-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0324-Optimize-World-Time-Updates.patch
similarity index 97%
rename from Spigot-Server-Patches/0325-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0324-Optimize-World-Time-Updates.patch
index 9ecd138a6c..5b45068fa9 100644
--- a/Spigot-Server-Patches/0325-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0324-Optimize-World-Time-Updates.patch
@@ -1,4 +1,4 @@
-From 7b6875067185e9004af4496d92c394fad7ccccb2 Mon Sep 17 00:00:00 2001
+From 0951662a1b4fe1206ab3f5507d6aeb05d93ed73d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Nov 2018 23:11:51 -0400
 Subject: [PATCH] Optimize World Time Updates
@@ -41,5 +41,5 @@ index a3156d003..2a01e609c 100644
  
          while (iterator.hasNext()) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0326-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0325-Restore-custom-InventoryHolder-support.patch
similarity index 96%
rename from Spigot-Server-Patches/0326-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0325-Restore-custom-InventoryHolder-support.patch
index cd577f8a39..e821c794c3 100644
--- a/Spigot-Server-Patches/0326-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0325-Restore-custom-InventoryHolder-support.patch
@@ -1,4 +1,4 @@
-From 69055d2af5fb73621a58b66e9e65620504934a66 Mon Sep 17 00:00:00 2001
+From 420f1740a630febfb0083462b94d06cfe0b1f4b3 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 5 Nov 2018 04:23:51 +0000
 Subject: [PATCH] Restore custom InventoryHolder support
@@ -42,5 +42,5 @@ index 9957ed040..ae280dd40 100644
      }
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0327-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0326-Use-Vanilla-Minecart-Speeds.patch
similarity index 94%
rename from Spigot-Server-Patches/0327-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0326-Use-Vanilla-Minecart-Speeds.patch
index c1533fde27..735c485397 100644
--- a/Spigot-Server-Patches/0327-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0326-Use-Vanilla-Minecart-Speeds.patch
@@ -1,4 +1,4 @@
-From d4a7cfb80c410ba7686baa9226f3d530d358bd17 Mon Sep 17 00:00:00 2001
+From 85ff7573d1b7480d8e511d2716db2cbedbe48acb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 8 Nov 2018 21:33:09 -0500
 Subject: [PATCH] Use Vanilla Minecart Speeds
@@ -23,5 +23,5 @@ index c2843d5d6..665bbe07f 100644
      // CraftBukkit end
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0328-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0327-Fix-SpongeAbsortEvent-handling.patch
similarity index 96%
rename from Spigot-Server-Patches/0328-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0327-Fix-SpongeAbsortEvent-handling.patch
index 32c2bfa431..648a0f7c31 100644
--- a/Spigot-Server-Patches/0328-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0327-Fix-SpongeAbsortEvent-handling.patch
@@ -1,4 +1,4 @@
-From 6d5624204ccf8343905c51628233fc07f6ded851 Mon Sep 17 00:00:00 2001
+From 3b67e7c6c62205dc6e979fe22afff3148d41a48d Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Nov 2018 05:15:21 +0000
 Subject: [PATCH] Fix SpongeAbsortEvent handling
@@ -37,5 +37,5 @@ index 685a30f3f..9edf937a6 100644
                  }
                  world.setTypeAndData(blockposition2, block.getHandle(), block.getFlag());
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0329-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0328-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0329-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0328-Don-t-allow-digging-into-unloaded-chunks.patch
index 9fb1affe75..1c30257d8b 100644
--- a/Spigot-Server-Patches/0329-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0328-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From 451cf4b95cae005f0afc654ebfa95bffadf834d1 Mon Sep 17 00:00:00 2001
+From 38e63e5a220ff15e394cb4f034129a9490317c8e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Nov 2018 21:01:09 +0000
 Subject: [PATCH] Don't allow digging into unloaded chunks
@@ -21,5 +21,5 @@ index bde60377e..b21fca9e5 100644
                  return;
              default:
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0330-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0329-Optimize-redstone-algorithm.patch
similarity index 99%
rename from Spigot-Server-Patches/0330-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0329-Optimize-redstone-algorithm.patch
index b7d6f4e1b3..598f631558 100644
--- a/Spigot-Server-Patches/0330-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0329-Optimize-redstone-algorithm.patch
@@ -1,4 +1,4 @@
-From 688ca6cf90b4945b2162d9317215938b4633b9ab Mon Sep 17 00:00:00 2001
+From 37ce37c395071a338bf1c51f860a6d46891a723d Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@@ -1147,5 +1147,5 @@ index 1905aae87..f54743a91 100644
          int i = 0;
          EnumDirection[] aenumdirection = World.a;
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0331-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0330-force-entity-dismount-during-teleportation.patch
similarity index 96%
rename from Spigot-Server-Patches/0331-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0330-force-entity-dismount-during-teleportation.patch
index f6dc0f033b..b980f3d5a2 100644
--- a/Spigot-Server-Patches/0331-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0330-force-entity-dismount-during-teleportation.patch
@@ -1,4 +1,4 @@
-From f674142f1829bd9ec4930a304eab8c2aa9847e5e Mon Sep 17 00:00:00 2001
+From 663b60042f1326b9b598dc64ba18123066086c8a Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation
@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ecd0387627..f900c1a2a3 100644
+index ecd038762..f900c1a2a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2027,12 +2027,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -72,7 +72,7 @@ index ecd0387627..f900c1a2a3 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 308ac18f7e..584166f225 100644
+index 308ac18f7..584166f22 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -968,9 +968,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -91,7 +91,7 @@ index 308ac18f7e..584166f225 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index eed3e7c58e..4e64a80a8a 100644
+index eed3e7c58..4e64a80a8 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2735,11 +2735,13 @@ public abstract class EntityLiving extends Entity {
@@ -112,7 +112,7 @@ index eed3e7c58e..4e64a80a8a 100644
              this.a(entity);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e91938b54c..35ea476014 100644
+index e91938b54..35ea47601 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1021,11 +1021,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -133,5 +133,5 @@ index e91938b54c..35ea476014 100644
  
          if (entity1 != entity && this.playerConnection != null) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0332-Book-Size-Limits.patch b/Spigot-Server-Patches/0331-Book-Size-Limits.patch
similarity index 98%
rename from Spigot-Server-Patches/0332-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0331-Book-Size-Limits.patch
index d76d048df8..6c49639941 100644
--- a/Spigot-Server-Patches/0332-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0331-Book-Size-Limits.patch
@@ -1,4 +1,4 @@
-From 01b52b8dcfb26b5c86ddd4f0c91cced2842842da Mon Sep 17 00:00:00 2001
+From 0eb27d72c28840e861e1e358a2db21780bdcc3b5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Nov 2018 23:08:50 -0500
 Subject: [PATCH] Book Size Limits
@@ -77,5 +77,5 @@ index b21fca9e5..784f0a3f2 100644
          // CraftBukkit start
          if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0333-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0332-Make-the-default-permission-message-configurable.patch
similarity index 96%
rename from Spigot-Server-Patches/0333-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0332-Make-the-default-permission-message-configurable.patch
index cc5a08871e..3c0953c127 100644
--- a/Spigot-Server-Patches/0333-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0332-Make-the-default-permission-message-configurable.patch
@@ -1,4 +1,4 @@
-From 0005ca24f8b6064a1a076abc22376ddaf06d1384 Mon Sep 17 00:00:00 2001
+From 6757eb6bda8ebc7fab9a7f749ad48e9ce3c53adc Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:49:56 +0000
 Subject: [PATCH] Make the default permission message configurable
@@ -45,5 +45,5 @@ index fa35b8459..30dd66b81 100644
      public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull UUID uuid) {
          return createProfile(uuid, null);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0334-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0333-Add-more-Zombie-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0334-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0333-Add-more-Zombie-API.patch
index 55fe3865bf..01dc98989d 100644
--- a/Spigot-Server-Patches/0334-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0333-Add-more-Zombie-API.patch
@@ -1,11 +1,11 @@
-From 78651298e03c7548fcbc65d604158f5740d3762c Mon Sep 17 00:00:00 2001
+From 336c2e0bbfe918d24a5bf09919ef3118255d35ae Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index bed15873b6..6d53254f83 100644
+index bed15873b..6d53254f8 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1260,6 +1260,8 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -18,7 +18,7 @@ index bed15873b6..6d53254f83 100644
          byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b);
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 31aba6bfc3..2d4f8aac8f 100644
+index 31aba6bfc..2d4f8aac8 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -33,6 +33,7 @@ public class EntityZombie extends EntityMonster {
@@ -92,7 +92,7 @@ index 31aba6bfc3..2d4f8aac8f 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index 0429cf020e..c4320dbb67 100644
+index 0429cf020..c4320dbb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 @@ -80,4 +80,41 @@ public class CraftZombie extends CraftMonster implements Zombie {
@@ -138,5 +138,5 @@ index 0429cf020e..c4320dbb67 100644
 +    // Paper end
  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0335-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0334-Prevent-rayTrace-from-loading-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0335-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0334-Prevent-rayTrace-from-loading-chunks.patch
index a11b4c863b..3fffd82689 100644
--- a/Spigot-Server-Patches/0335-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0334-Prevent-rayTrace-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 19946c7d62fd0ac3092ee6aea28b51e7651640e5 Mon Sep 17 00:00:00 2001
+From 4248f9dda8599dfbaba6698b82dd4dda172481ff Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Nov 2018 19:21:58 -0500
 Subject: [PATCH] Prevent rayTrace from loading chunks
@@ -28,5 +28,5 @@ index 0dff02352..29cdc0087 100644
              Vec3D vec3d = raytrace1.b();
              Vec3D vec3d1 = raytrace1.a();
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0336-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0335-Handle-Large-Packets-disconnecting-client.patch
similarity index 98%
rename from Spigot-Server-Patches/0336-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0335-Handle-Large-Packets-disconnecting-client.patch
index 114e8e6961..3a69579229 100644
--- a/Spigot-Server-Patches/0336-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0335-Handle-Large-Packets-disconnecting-client.patch
@@ -1,4 +1,4 @@
-From a3a1da7bb34c3864cf7153eb8aa544cfa5847f35 Mon Sep 17 00:00:00 2001
+From 25813453920b7238ec7173657d1bdd989006ce0a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Nov 2018 21:18:06 -0500
 Subject: [PATCH] Handle Large Packets disconnecting client
@@ -113,5 +113,5 @@ index f7c365567..631234324 100644
  
      public PacketPlayOutWindowItems(int i, NonNullList<ItemStack> nonnulllist) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0337-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0336-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
similarity index 97%
rename from Spigot-Server-Patches/0337-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
rename to Spigot-Server-Patches/0336-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
index b767a9e06c..a92bd59608 100644
--- a/Spigot-Server-Patches/0337-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0336-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@@ -1,4 +1,4 @@
-From 4afc291af96ba13e98030b2622aefe7e97a8e425 Mon Sep 17 00:00:00 2001
+From 056df6fc2c3ec97f7c45d3df310ca358e91387e0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 11 Dec 2018 22:25:07 -0500
 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer
@@ -61,5 +61,5 @@ index 6a448c02e..c1ef1c950 100644
  
      @Override
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0338-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0337-Add-PlayerConnectionCloseEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0338-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0337-Add-PlayerConnectionCloseEvent.patch
index c355c871ec..4206d2b15e 100644
--- a/Spigot-Server-Patches/0338-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0337-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From e0bdb755f23684a0d0a220f69157116f778e31e2 Mon Sep 17 00:00:00 2001
+From 2993f6b09ebba87d6dfe22cbbd01f5632d8ba2e5 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:28 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent
@@ -81,5 +81,5 @@ index d4aad8a5b..b1dededc1 100644
  
          }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0339-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0338-Prevent-Enderman-from-loading-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0339-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0338-Prevent-Enderman-from-loading-chunks.patch
index d04b30ecf4..dd638355cc 100644
--- a/Spigot-Server-Patches/0339-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0338-Prevent-Enderman-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From c4fba36fff9ad6592c8ccefe7b9b7f51338db9da Mon Sep 17 00:00:00 2001
+From 77bf776b67d4dc1ab7143973d3ffc8d27a04d56a Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 18 Dec 2018 02:15:08 +0000
 Subject: [PATCH] Prevent Enderman from loading chunks
@@ -29,5 +29,5 @@ index d86f76f30..212636dcb 100644
              IBlockData iblockdata1 = world.getType(blockposition1);
              IBlockData iblockdata2 = Block.getValidBlockForPosition(getEnderman().getCarried(), getEnderman().world, blockposition); // Paper - Fix MC-124320
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0340-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0339-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 96%
rename from Spigot-Server-Patches/0340-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0339-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 5e4b7e19da..021ca15494 100644
--- a/Spigot-Server-Patches/0340-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0339-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From 2affb5b1d31c0077ce56d879eb5181b45d147f90 Mon Sep 17 00:00:00 2001
+From 49076780ef46a0d6bc492de2a79ef628bbfd6302 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:35:43 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 35ea476014..4cff86b9a5 100644
+index 35ea47601..4cff86b9a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -76,6 +76,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -28,7 +28,7 @@ index 35ea476014..4cff86b9a5 100644
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e46436623c..659ce21818 100644
+index e46436623..659ce2181 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -94,6 +94,7 @@ public abstract class PlayerList {
@@ -40,7 +40,7 @@ index e46436623c..659ce21818 100644
          UserCache usercache = this.server.getUserCache();
          GameProfile gameprofile1 = usercache.getProfile(gameprofile.getId());
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index c1ef1c950d..3824180ee5 100644
+index c1ef1c950..3824180ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -256,6 +256,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -106,7 +106,7 @@ index c1ef1c950d..3824180ee5 100644
      public Location getBedSpawnLocation() {
          NBTTagCompound data = getData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 878287cf0d..2de233df35 100644
+index 878287cf0..2de233df3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -140,6 +140,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -163,5 +163,5 @@ index 878287cf0d..2de233df35 100644
  
      @Override
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0341-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0340-Fix-PlayerEditBookEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0341-Fix-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0340-Fix-PlayerEditBookEvent.patch
index 48fe3497e0..4491d3b1af 100644
--- a/Spigot-Server-Patches/0341-Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/0340-Fix-PlayerEditBookEvent.patch
@@ -1,4 +1,4 @@
-From f8d28cd4dd37cac6018bb748c41b9655bb1e7d02 Mon Sep 17 00:00:00 2001
+From e12abf92b401d1f8780775d955d7e25490deed0f Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 16 Dec 2018 13:07:33 +1100
 Subject: [PATCH] Fix PlayerEditBookEvent
@@ -29,5 +29,5 @@ index 784f0a3f2..4b3ddfd99 100644
                  }
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0342-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0341-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 89%
rename from Spigot-Server-Patches/0342-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0341-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 229ce3361e..af2331072a 100644
--- a/Spigot-Server-Patches/0342-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/0341-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -1,11 +1,11 @@
-From 1e07a3066cb1008b045de6ca119b6443e7251dc3 Mon Sep 17 00:00:00 2001
+From 314d6ed2dc875a55f9aa543efa1c320a9d1107a8 Mon Sep 17 00:00:00 2001
 From: connorhartley <vectrixu+gh@gmail.com>
 Date: Mon, 7 Jan 2019 14:43:48 -0600
 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4cff86b9a5..f788e7eff0 100644
+index 4cff86b9a..f788e7eff 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1296,6 +1296,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -23,5 +23,5 @@ index 4cff86b9a5..f788e7eff0 100644
              this.wakeup(true, false);
          }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0343-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0342-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 97%
rename from Spigot-Server-Patches/0343-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to Spigot-Server-Patches/0342-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
index 0e4fe1ec7a..4dbd40827d 100644
--- a/Spigot-Server-Patches/0343-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
+++ b/Spigot-Server-Patches/0342-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
@@ -1,4 +1,4 @@
-From 7f025f9a2047f99a28264d23b93d3a9b750939b4 Mon Sep 17 00:00:00 2001
+From b45490e7fde16d25dba70bd5cb84f70140dea0fb Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Thu, 31 Jan 2019 16:33:36 -0500
 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons
@@ -46,5 +46,5 @@ index 1170a2810..b29525c40 100644
              // CraftBukkit end
              world.playBlockAction(blockposition, this, b0, enumdirection.b());
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0344-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0343-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 92%
rename from Spigot-Server-Patches/0344-Block-Entity-remove-from-being-called-on-Players.patch
rename to Spigot-Server-Patches/0343-Block-Entity-remove-from-being-called-on-Players.patch
index 36a4b84010..2119cd2772 100644
--- a/Spigot-Server-Patches/0344-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/Spigot-Server-Patches/0343-Block-Entity-remove-from-being-called-on-Players.patch
@@ -1,4 +1,4 @@
-From b2a9a02d35fec7ec28ab7cf95df8d10bcf92f993 Mon Sep 17 00:00:00 2001
+From 201695f239bcc25aec86f4ed04e293e780983e00 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Feb 2019 23:33:24 -0500
 Subject: [PATCH] Block Entity#remove from being called on Players
@@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2de233df35..74a9e8f22e 100644
+index 2de233df3..74a9e8f22 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1985,6 +1985,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -32,5 +32,5 @@ index 2de233df35..74a9e8f22e 100644
  
      // Spigot start
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0345-BlockDestroyEvent.patch b/Spigot-Server-Patches/0344-BlockDestroyEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0345-BlockDestroyEvent.patch
rename to Spigot-Server-Patches/0344-BlockDestroyEvent.patch
index 0b12556ee5..675da7fb60 100644
--- a/Spigot-Server-Patches/0345-BlockDestroyEvent.patch
+++ b/Spigot-Server-Patches/0344-BlockDestroyEvent.patch
@@ -1,4 +1,4 @@
-From 144a8b4b62fd243e201880b7aa606cf56858865c Mon Sep 17 00:00:00 2001
+From d091b152b688cf67bdff1da8dbf86ab566048349 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent
@@ -37,5 +37,5 @@ index f54743a91..67a088f19 100644
                  TileEntity tileentity = iblockdata.getBlock().isTileEntity() ? this.getTileEntity(blockposition) : null;
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0346-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0345-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 97%
rename from Spigot-Server-Patches/0346-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to Spigot-Server-Patches/0345-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 5d4a5fcf41..196fe44795 100644
--- a/Spigot-Server-Patches/0346-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/Spigot-Server-Patches/0345-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
@@ -1,4 +1,4 @@
-From 74807d3a016b4c2d8c0d9adee8b17d0ace5afa78 Mon Sep 17 00:00:00 2001
+From 7a6cf1744fae0cdf1c73e252f3bc687f9a438443 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Jan 2019 00:08:15 -0500
 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes
@@ -64,5 +64,5 @@ index fe03a35cc..fb481e658 100644
  
      public ItemStack a(InventoryCrafting inventorycrafting) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0347-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0346-Fix-sign-edit-memory-leak.patch
similarity index 96%
rename from Spigot-Server-Patches/0347-Fix-sign-edit-memory-leak.patch
rename to Spigot-Server-Patches/0346-Fix-sign-edit-memory-leak.patch
index 07122fdd24..0b54a32ab8 100644
--- a/Spigot-Server-Patches/0347-Fix-sign-edit-memory-leak.patch
+++ b/Spigot-Server-Patches/0346-Fix-sign-edit-memory-leak.patch
@@ -1,4 +1,4 @@
-From 8033d3043d7ab058ea3b264c207e68288b40f786 Mon Sep 17 00:00:00 2001
+From 853e3159e767ca1a4891e0667e29facdea7d7c6d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Feb 2019 00:15:28 -0500
 Subject: [PATCH] Fix sign edit memory leak
@@ -43,5 +43,5 @@ index 03f6ddf00..a93402019 100644
  
      public EntityHuman f() {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0348-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0347-Limit-Client-Sign-length-more.patch
similarity index 97%
rename from Spigot-Server-Patches/0348-Limit-Client-Sign-length-more.patch
rename to Spigot-Server-Patches/0347-Limit-Client-Sign-length-more.patch
index 99ac1afc8a..ced90fc222 100644
--- a/Spigot-Server-Patches/0348-Limit-Client-Sign-length-more.patch
+++ b/Spigot-Server-Patches/0347-Limit-Client-Sign-length-more.patch
@@ -1,4 +1,4 @@
-From 7c5b507ebee799691ed56446b1a3379a37afffaf Mon Sep 17 00:00:00 2001
+From 55c5ebed011c753b9ae3709fe44b131973154b2b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Feb 2019 22:18:40 -0500
 Subject: [PATCH] Limit Client Sign length more
@@ -50,5 +50,5 @@ index 2c94ca6a8..94d3d602c 100644
              }
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0349-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0348-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 94%
rename from Spigot-Server-Patches/0349-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to Spigot-Server-Patches/0348-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 8e2dbc03bc..35175b30fb 100644
--- a/Spigot-Server-Patches/0349-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/Spigot-Server-Patches/0348-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@@ -1,4 +1,4 @@
-From 772930536a82a47d4a6dda82e42aca2a60c48f30 Mon Sep 17 00:00:00 2001
+From a6a46362f01a8bfd215c0f533f88fe4bb22eadcd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 11:11:29 -0500
 Subject: [PATCH] Don't check ConvertSigns boolean every sign save
@@ -28,5 +28,5 @@ index a93402019..0e9a90b70 100644
          }
          // CraftBukkit end
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0350-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0349-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
similarity index 98%
rename from Spigot-Server-Patches/0350-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
rename to Spigot-Server-Patches/0349-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
index 6d0a05aa58..7b7c0fc30d 100644
--- a/Spigot-Server-Patches/0350-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
+++ b/Spigot-Server-Patches/0349-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
@@ -1,4 +1,4 @@
-From fc7555197054cc6c7781cf4588abefd8c07baf09 Mon Sep 17 00:00:00 2001
+From 6ad4c8232466541a835a56d0f8bd9dbd9cea9c45 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 14:55:01 -0500
 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of
@@ -86,5 +86,5 @@ index a0b87f89d..47710067a 100644
                  if (tileentity instanceof TileEntitySkull) { TileEntitySkull.sanitizeTileEntityUUID(nbttagcompound); } // Paper
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0351-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0350-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 97%
rename from Spigot-Server-Patches/0351-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0350-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
index 66b734005f..f2601a7977 100644
--- a/Spigot-Server-Patches/0351-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/0350-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@@ -1,4 +1,4 @@
-From 767871c0aa479b831004fdd0c1f14c49a358805f Mon Sep 17 00:00:00 2001
+From 928067ebeaf0ff169a21ea2a566be5a9854de892 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 16:12:35 -0500
 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency
@@ -62,5 +62,5 @@ index 659ce2181..62d807597 100644
  
      public List<EntityPlayer> b(String s) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0352-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0351-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 92%
rename from Spigot-Server-Patches/0352-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0351-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index abf7387766..7202ba0046 100644
--- a/Spigot-Server-Patches/0352-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/Spigot-Server-Patches/0351-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -1,4 +1,4 @@
-From 164bc359bbeea1c88810d9d1c101ce7e800e1e63 Mon Sep 17 00:00:00 2001
+From 52fff59f5d752190604decc551b436c2cef9688d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Mar 2019 02:23:28 -0500
 Subject: [PATCH] Set Zombie last tick at start of drowning process
@@ -18,5 +18,5 @@ index 2d4f8aac8..8635d4f40 100644
                  } else {
                      this.bC = -1;
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0353-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0352-Allow-Saving-of-Oversized-Chunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0353-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0352-Allow-Saving-of-Oversized-Chunks.patch
index 93330cab5b..12cd4242d7 100644
--- a/Spigot-Server-Patches/0353-Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/0352-Allow-Saving-of-Oversized-Chunks.patch
@@ -1,4 +1,4 @@
-From a4fb267df68aecae17893dac15b94498f4a3671a Mon Sep 17 00:00:00 2001
+From b6e1b29bcd7823c0868ba32bb8e14a2f54f39f58 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Feb 2019 01:08:19 -0500
 Subject: [PATCH] Allow Saving of Oversized Chunks
@@ -253,5 +253,5 @@ index 57ce53cfd..b3d1bb5fd 100644
              throwable = throwable1;
              throw throwable1;
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0354-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0353-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 90%
rename from Spigot-Server-Patches/0354-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0353-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 10d6728c46..1071da4639 100644
--- a/Spigot-Server-Patches/0354-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/0353-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -1,4 +1,4 @@
-From bcf06c353bbf329f1b8b36cefbbb2b3da2005756 Mon Sep 17 00:00:00 2001
+From 5bf948b7dd7242482fcdd8f477ab37a768915835 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 13 Mar 2019 20:08:09 +0200
 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
@@ -17,5 +17,5 @@ index 62d807597..9d715d891 100644
      }
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0355-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0354-Add-LivingEntity-getTargetEntity.patch
similarity index 96%
rename from Spigot-Server-Patches/0355-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0354-Add-LivingEntity-getTargetEntity.patch
index 60ab6a022a..76461850f1 100644
--- a/Spigot-Server-Patches/0355-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0354-Add-LivingEntity-getTargetEntity.patch
@@ -1,11 +1,11 @@
-From a68a45cae725380fd68ee8a33e06f5abf22b249a Mon Sep 17 00:00:00 2001
+From 2b4e9b58255aad87d79212eda12aa1087efcf570 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:33:08 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index 4f60b931a1..c950139c0f 100644
+index 4f60b931a..c950139c0 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -108,6 +108,7 @@ public class AxisAlignedBB {
@@ -46,7 +46,7 @@ index 4f60b931a1..c950139c0f 100644
          double[] adouble = new double[]{1.0D};
          double d0 = vec3d1.x - vec3d.x;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f900c1a2a3..5b7cdd66e3 100644
+index f900c1a2a..5b7cdd66e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1475,6 +1475,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -66,7 +66,7 @@ index f900c1a2a3..5b7cdd66e3 100644
          return 0.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4e64a80a8a..af79b6e378 100644
+index 4e64a80a8..af79b6e37 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3307,6 +3307,37 @@ public abstract class EntityLiving extends Entity {
@@ -108,7 +108,7 @@ index 4e64a80a8a..af79b6e378 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index c1f462d9d3..498f381099 100644
+index c1f462d9d..498f38109 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -18,6 +18,7 @@ public final class IEntitySelector {
@@ -120,7 +120,7 @@ index c1f462d9d3..498f381099 100644
          return !entity.isSpectator();
      };
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d197094f54..6de01e4f0e 100644
+index d197094f5..6de01e4f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -216,6 +216,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -158,5 +158,5 @@ index d197094f54..6de01e4f0e 100644
  
      @Override
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0356-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0355-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 96%
rename from Spigot-Server-Patches/0356-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to Spigot-Server-Patches/0355-Use-proper-max-length-when-serialising-BungeeCord-te.patch
index dc19f1b347..adb06577cf 100644
--- a/Spigot-Server-Patches/0356-Use-proper-max-length-when-serialising-BungeeCord-te.patch
+++ b/Spigot-Server-Patches/0355-Use-proper-max-length-when-serialising-BungeeCord-te.patch
@@ -1,4 +1,4 @@
-From 45fa275c98843b29ed25bc19970dc4f4de202980 Mon Sep 17 00:00:00 2001
+From 4440c63b167cf2748361545a0f1b4ef376198331 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 20 Mar 2019 21:19:29 -0700
 Subject: [PATCH] Use proper max length when serialising BungeeCord text
@@ -31,5 +31,5 @@ index 0ab611564..f7b2095bb 100644
              // Paper end
          } else {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0357-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0356-Entity-getEntitySpawnReason.patch
similarity index 96%
rename from Spigot-Server-Patches/0357-Entity-getEntitySpawnReason.patch
rename to Spigot-Server-Patches/0356-Entity-getEntitySpawnReason.patch
index 2d9fcb6712..aafb2a4208 100644
--- a/Spigot-Server-Patches/0357-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0356-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From 53e5cf11382fb34e7530ea39d15a23ed8c38bdb1 Mon Sep 17 00:00:00 2001
+From bf0d7b0b102469ae08b359eb87d04dc6b1ffe93c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:24:52 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5b7cdd66e3..b45afbcde2 100644
+index 5b7cdd66e..b45afbcde 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -59,7 +59,7 @@ index 5b7cdd66e3..b45afbcde2 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 9d715d891d..49437f2124 100644
+index 9d715d891..49437f212 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -251,7 +251,7 @@ public abstract class PlayerList {
@@ -72,7 +72,7 @@ index 9d715d891d..49437f2124 100644
              });
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 49b1939d17..8074050b43 100644
+index 49b1939d1..8074050b4 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -997,6 +997,7 @@ public class WorldServer extends World {
@@ -84,7 +84,7 @@ index 49b1939d17..8074050b43 100644
          if (entity.valid) {
              MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 915ccb1807..dfa15372b8 100644
+index 915ccb180..dfa15372b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1051,5 +1051,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -99,5 +99,5 @@ index 915ccb1807..dfa15372b8 100644
      // Paper end
  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0358-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0357-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 96%
rename from Spigot-Server-Patches/0358-Update-entity-Metadata-for-all-tracked-players.patch
rename to Spigot-Server-Patches/0357-Update-entity-Metadata-for-all-tracked-players.patch
index f598a7de18..fccaff0dc3 100644
--- a/Spigot-Server-Patches/0358-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/Spigot-Server-Patches/0357-Update-entity-Metadata-for-all-tracked-players.patch
@@ -1,4 +1,4 @@
-From 2d9292d911e8a38b20a04360c0b47da90522c419 Mon Sep 17 00:00:00 2001
+From 09fd0185c98d369fd927818ec6b3823ab0b1e0b5 Mon Sep 17 00:00:00 2001
 From: AgentTroll <woodyc40@gmail.com>
 Date: Fri, 22 Mar 2019 22:24:03 -0700
 Subject: [PATCH] Update entity Metadata for all tracked players
@@ -35,5 +35,5 @@ index 94d3d602c..eee96c3a1 100644
  
                      if (event.isCancelled()) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0359-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0358-Fire-event-on-GS4-query.patch
similarity index 99%
rename from Spigot-Server-Patches/0359-Fire-event-on-GS4-query.patch
rename to Spigot-Server-Patches/0358-Fire-event-on-GS4-query.patch
index 780269b55e..45138154a7 100644
--- a/Spigot-Server-Patches/0359-Fire-event-on-GS4-query.patch
+++ b/Spigot-Server-Patches/0358-Fire-event-on-GS4-query.patch
@@ -1,4 +1,4 @@
-From 6f7f89cc4b63d3b080e3e6fc2ec84e2cc9d75aa6 Mon Sep 17 00:00:00 2001
+From b9ab4c1082deca70510920d53f396778dbecda5c Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 17 Mar 2019 21:46:56 +0200
 Subject: [PATCH] Fire event on GS4 query
@@ -216,5 +216,5 @@ index 848b5c3f0..73efea7e1 100644
          this.b.writeShort(Short.reverseBytes(short0));
      }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0360-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0359-Implement-PlayerPostRespawnEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0360-Implement-PlayerPostRespawnEvent.patch
rename to Spigot-Server-Patches/0359-Implement-PlayerPostRespawnEvent.patch
index 00a55ae892..5535125f08 100644
--- a/Spigot-Server-Patches/0360-Implement-PlayerPostRespawnEvent.patch
+++ b/Spigot-Server-Patches/0359-Implement-PlayerPostRespawnEvent.patch
@@ -1,4 +1,4 @@
-From 7088d519d03f25901ad72d447137e2baf88e4441 Mon Sep 17 00:00:00 2001
+From e5ca045e528e65fcee179517595428a7305c6eba Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Fri, 26 Oct 2018 21:31:00 -0700
 Subject: [PATCH] Implement PlayerPostRespawnEvent
@@ -47,5 +47,5 @@ index 49437f212..68e089a4b 100644
          return entityplayer1;
      }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0361-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0360-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 95%
rename from Spigot-Server-Patches/0361-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to Spigot-Server-Patches/0360-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 9c5b9a31a4..da3aaffd25 100644
--- a/Spigot-Server-Patches/0361-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/Spigot-Server-Patches/0360-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -1,4 +1,4 @@
-From 66a900f4eb5d4488519d2a133ecd2d4204697d03 Mon Sep 17 00:00:00 2001
+From 774a47c222a3586c16552cdb2cf59add17fb6a0f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 18:09:20 -0400
 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
@@ -26,5 +26,5 @@ index e5c9bac88..ef2cf6565 100644
          this.lastTick = MinecraftServer.currentTick;
          // CraftBukkit end
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0362-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0361-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 95%
rename from Spigot-Server-Patches/0362-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-Server-Patches/0361-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index 4e65f3fe6a..0670408bd1 100644
--- a/Spigot-Server-Patches/0362-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/0361-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From 7bb6f113e9d08ae26cd94c7a7f7dc8e9a985455e Mon Sep 17 00:00:00 2001
+From 672da9d28a3692369f6868967f88f12aa42ef128 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 20:54:23 -0500
 Subject: [PATCH] Implement getters and setters for EntityItem owner and
@@ -51,5 +51,5 @@ index 3f552b590..cb756b1ba 100644
  
      @Override
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0363-Server-Tick-Events.patch b/Spigot-Server-Patches/0362-Server-Tick-Events.patch
similarity index 95%
rename from Spigot-Server-Patches/0363-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0362-Server-Tick-Events.patch
index 80484d3a33..f38c481a50 100644
--- a/Spigot-Server-Patches/0363-Server-Tick-Events.patch
+++ b/Spigot-Server-Patches/0362-Server-Tick-Events.patch
@@ -1,4 +1,4 @@
-From 47ee636e3a1d609a30427568e3a3b4cfb41b9f5d Mon Sep 17 00:00:00 2001
+From 4e6377ff36d7ddf7bd38316944c2d7bb737c3da7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 22:48:45 -0400
 Subject: [PATCH] Server Tick Events
@@ -30,5 +30,5 @@ index 2a01e609c..2801a3ee6 100644
      }
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0364-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0363-PlayerDeathEvent-getItemsToKeep.patch
similarity index 96%
rename from Spigot-Server-Patches/0364-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0363-PlayerDeathEvent-getItemsToKeep.patch
index 4d1e945293..8863d52c72 100644
--- a/Spigot-Server-Patches/0364-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0363-PlayerDeathEvent-getItemsToKeep.patch
@@ -1,4 +1,4 @@
-From 2ae66cdb57a433f4cdc072ffe755090caedc9598 Mon Sep 17 00:00:00 2001
+From 490c7de3fe915a0191c56f792e4b5853bd834634 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 23:01:33 -0400
 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep
@@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f788e7eff0..d00b687d25 100644
+index f788e7eff..d00b687d2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -516,6 +516,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -73,5 +73,5 @@ index f788e7eff0..d00b687d25 100644
  
          this.setSpectatorTarget(this); // Remove spectated target
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0365-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0364-Optimize-Captured-TileEntity-Lookup.patch
similarity index 95%
rename from Spigot-Server-Patches/0365-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0364-Optimize-Captured-TileEntity-Lookup.patch
index 13d97174e4..3689a28e07 100644
--- a/Spigot-Server-Patches/0365-Optimize-Captured-TileEntity-Lookup.patch
+++ b/Spigot-Server-Patches/0364-Optimize-Captured-TileEntity-Lookup.patch
@@ -1,4 +1,4 @@
-From 6cbddfcfabc1070347797b56fe31c8ec9deaf793 Mon Sep 17 00:00:00 2001
+From 2c4a4a5bc9a3ca42785e1ed4a375f960efe14a32 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Apr 2019 10:16:48 -0400
 Subject: [PATCH] Optimize Captured TileEntity Lookup
@@ -31,5 +31,5 @@ index 67a088f19..4aca398f1 100644
              if (this.tickingTileEntities) {
                  tileentity = this.e(blockposition);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0366-Add-Heightmap-API.patch b/Spigot-Server-Patches/0365-Add-Heightmap-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0366-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0365-Add-Heightmap-API.patch
index 8e2477d89d..f0f200aff6 100644
--- a/Spigot-Server-Patches/0366-Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/0365-Add-Heightmap-API.patch
@@ -1,4 +1,4 @@
-From 764f34aa28a16bfcdf60719d2b7ee38bdff3be33 Mon Sep 17 00:00:00 2001
+From c469162763fcd7293f6c41be4a49f2bc4190ee16 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 1 Jan 2019 02:22:01 -0800
 Subject: [PATCH] Add Heightmap API
@@ -54,5 +54,5 @@ index b41404652..d4ccef12f 100644
      public Location getSpawnLocation() {
          BlockPosition spawn = world.getSpawn();
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0367-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0366-Mob-Spawner-API-Enhancements.patch
similarity index 97%
rename from Spigot-Server-Patches/0367-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0366-Mob-Spawner-API-Enhancements.patch
index b5bcaa2c33..6ce17f5775 100644
--- a/Spigot-Server-Patches/0367-Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-Server-Patches/0366-Mob-Spawner-API-Enhancements.patch
@@ -1,11 +1,11 @@
-From a2dc68532bf7368857fd232c64933c6c06b9692a Mon Sep 17 00:00:00 2001
+From e2d2f78aff2944fd5e38c2de61da4464b3875308 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 19 Apr 2019 12:41:13 -0500
 Subject: [PATCH] Mob Spawner API Enhancements
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index cb7cb789b8..41001b02a6 100644
+index cb7cb789b..41001b02a 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -47,6 +47,7 @@ public abstract class MobSpawnerAbstract {
@@ -82,7 +82,7 @@ index cb7cb789b8..41001b02a6 100644
              nbttagcompound.setShort("MaxNearbyEntities", (short) this.maxNearbyEntities);
              nbttagcompound.setShort("RequiredPlayerRange", (short) this.requiredPlayerRange);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
-index 5c4c3c70c7..e78e3804ba 100644
+index 5c4c3c70c..e78e3804b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 @@ -121,4 +121,16 @@ public class CraftCreatureSpawner extends CraftBlockEntityState<TileEntityMobSpa
@@ -103,5 +103,5 @@ index 5c4c3c70c7..e78e3804ba 100644
 +    // Paper end
  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0368-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0367-Per-Player-View-Distance-API-placeholders.patch
similarity index 95%
rename from Spigot-Server-Patches/0368-Per-Player-View-Distance-API-placeholders.patch
rename to Spigot-Server-Patches/0367-Per-Player-View-Distance-API-placeholders.patch
index 17bc805a2b..837c5b524f 100644
--- a/Spigot-Server-Patches/0368-Per-Player-View-Distance-API-placeholders.patch
+++ b/Spigot-Server-Patches/0367-Per-Player-View-Distance-API-placeholders.patch
@@ -1,4 +1,4 @@
-From 51a39af4446218c38576ee01e3cf457636d4e786 Mon Sep 17 00:00:00 2001
+From 619d98a94d0b1ad5d1967f1d67c4f4f50c7bb4de Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 6 May 2019 01:29:25 -0400
 Subject: [PATCH] Per-Player View Distance API placeholders
@@ -7,7 +7,7 @@ I hope to look at this more in-depth soon. It appears doable.
 However this should not block the update.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 6a4ccaeb0f..af10fc36e0 100644
+index 6a4ccaeb0..af10fc36e 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -579,9 +579,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -23,7 +23,7 @@ index 6a4ccaeb0f..af10fc36e0 100644
                      double deltaX = this.locX() - player.locX();
                      double deltaZ = this.locZ() - player.locZ();
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 2e95069c19..8977c3516b 100644
+index 2e95069c1..8977c3516 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -208,9 +208,9 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -39,7 +39,7 @@ index 2e95069c19..8977c3516b 100644
                      double deltaX = this.locX() - player.locX();
                      double deltaZ = this.locZ() - player.locZ();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 74a9e8f22e..60f62f19cb 100644
+index 74a9e8f22..60f62f19c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1994,6 +1994,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -60,5 +60,5 @@ index 74a9e8f22e..60f62f19cb 100644
  
      // Spigot start
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0369-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0368-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 91%
rename from Spigot-Server-Patches/0369-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to Spigot-Server-Patches/0368-Fix-CB-call-to-changed-postToMainThread-method.patch
index 2dd5879cd7..7140de1aaf 100644
--- a/Spigot-Server-Patches/0369-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/Spigot-Server-Patches/0368-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -1,4 +1,4 @@
-From ceb04cb2071470c709f3ee9525f4121779f4e94c Mon Sep 17 00:00:00 2001
+From 880f6d517145cf31908bfe78622cc56be1db41f6 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 10 May 2019 18:38:19 +0100
 Subject: [PATCH] Fix CB call to changed postToMainThread method
@@ -18,5 +18,5 @@ index eee96c3a1..691331217 100644
  
      @Override
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0370-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0369-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 95%
rename from Spigot-Server-Patches/0370-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to Spigot-Server-Patches/0369-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 79cfc9ceae..0bbef3f881 100644
--- a/Spigot-Server-Patches/0370-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/Spigot-Server-Patches/0369-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
@@ -1,4 +1,4 @@
-From 5ecf4291233bf0154b386b8556376317e54d2438 Mon Sep 17 00:00:00 2001
+From 0fc4126c1f3488816099232c353537dd50a5f7d7 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sat, 27 Apr 2019 20:00:43 +0100
 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
@@ -32,5 +32,5 @@ index 799036f26..9ad180d94 100644
          this.entity = frame;
      }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0370-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 96%
rename from Spigot-Server-Patches/0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to Spigot-Server-Patches/0370-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index a09ffac628..935d4689ba 100644
--- a/Spigot-Server-Patches/0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/Spigot-Server-Patches/0370-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@@ -1,4 +1,4 @@
-From 032b8101febd00ba44d33cbecf57e57fa0f9e2a9 Mon Sep 17 00:00:00 2001
+From 3ce68dd2077bfb0a4c2984ff0d300615083fe637 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 13 May 2019 21:10:59 -0700
 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer
@@ -42,5 +42,5 @@ index 30dd66b81..0df49581f 100644
  
      @Override
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0371-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0371-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
index 6f93b15513..e852b536df 100644
--- a/Spigot-Server-Patches/0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0371-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From 1c8d867560670f953c242359db4311ae0a1d44e7 Mon Sep 17 00:00:00 2001
+From 9f47b15cb6ed40c2599f8de7b85faef5cd710361 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 21:49:53 -0400
 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks
@@ -41,5 +41,5 @@ index 8074050b4..fd0edea78 100644
              if (!(ichunkaccess instanceof Chunk)) {
                  return false;
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0373-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0372-Duplicate-UUID-Resolve-Option.patch
similarity index 98%
rename from Spigot-Server-Patches/0373-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0372-Duplicate-UUID-Resolve-Option.patch
index d868236b13..7305691141 100644
--- a/Spigot-Server-Patches/0373-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0372-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From c4206682d8b4a07c89cd83ec4b915d06196c3dce Mon Sep 17 00:00:00 2001
+From ee3b5cb62838a7558620021703932a1190da2a66 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4ba72275b9..572679e4d1 100644
+index 4ba72275b..572679e4d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -442,4 +442,43 @@ public class PaperWorldConfig {
@@ -81,7 +81,7 @@ index 4ba72275b9..572679e4d1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index c464d69623..3882e5b2a6 100644
+index c464d6962..3882e5b2a 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -396,6 +396,7 @@ public class Chunk implements IChunkAccess {
@@ -93,7 +93,7 @@ index c464d69623..3882e5b2a6 100644
  
          int k = MathHelper.floor(entity.locY() / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b45afbcde2..4021bb5b88 100644
+index b45afbcde..4021bb5b8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2743,6 +2743,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -105,7 +105,7 @@ index b45afbcde2..4021bb5b88 100644
          this.uniqueID = uuid;
          this.am = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index fea28eec72..40f0b2deaa 100644
+index f640d2ac7..8c6cd4cd6 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,6 +1,7 @@
@@ -210,7 +210,7 @@ index fea28eec72..40f0b2deaa 100644
  
                      if (list != null) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index fd0edea78a..c969e90901 100644
+index fd0edea78..c969e9090 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -3,6 +3,8 @@ package net.minecraft.server;
@@ -258,5 +258,5 @@ index fd0edea78a..c969e90901 100644
                  logger.error("Overwrote an existing entity " + old + " with " + entity);
                  if (DEBUG_ENTITIES) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0374-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0373-improve-CraftWorld-isChunkLoaded.patch
similarity index 93%
rename from Spigot-Server-Patches/0374-improve-CraftWorld-isChunkLoaded.patch
rename to Spigot-Server-Patches/0373-improve-CraftWorld-isChunkLoaded.patch
index f43b83bf37..9a0954b778 100644
--- a/Spigot-Server-Patches/0374-improve-CraftWorld-isChunkLoaded.patch
+++ b/Spigot-Server-Patches/0373-improve-CraftWorld-isChunkLoaded.patch
@@ -1,4 +1,4 @@
-From 7d71e042926c9e3cfce531033ac04ca0c93221d8 Mon Sep 17 00:00:00 2001
+From b212266cc60a592987ff34b1f5c51793b52366d7 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 21 May 2019 02:34:04 +0100
 Subject: [PATCH] improve CraftWorld#isChunkLoaded
@@ -9,7 +9,7 @@ waiting for the execution queue to get to our request; We can just query
 the chunk status and get a response now, vs having to wait
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 27602824a..4fae7c849 100644
+index d4ccef12f..41d1c3bb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -399,14 +399,13 @@ public class CraftWorld implements World {
@@ -30,5 +30,5 @@ index 27602824a..4fae7c849 100644
              throw new RuntimeException(ex);
          }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0375-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0374-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 99%
rename from Spigot-Server-Patches/0375-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0374-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index e714377261..0aa6e51bcb 100644
--- a/Spigot-Server-Patches/0375-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0374-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From a073adb750b62b4c5dd24b8c3fa6dae6935011c7 Mon Sep 17 00:00:00 2001
+From e0df56cfcf7e9834813610e675e75951d390f8a2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -207,7 +207,7 @@ index c969e9090..5f9930447 100644
  
      public LongSet getForceLoadedChunks() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4fae7c849..67d51eeba 100644
+index 41d1c3bb6..ecc10a4f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1924,15 +1924,21 @@ public class CraftWorld implements World {
@@ -237,5 +237,5 @@ index 4fae7c849..67d51eeba 100644
  
      @Override
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0376-Fix-some-generation-concurrency-issues.patch b/Spigot-Server-Patches/0375-Fix-some-generation-concurrency-issues.patch
similarity index 99%
rename from Spigot-Server-Patches/0376-Fix-some-generation-concurrency-issues.patch
rename to Spigot-Server-Patches/0375-Fix-some-generation-concurrency-issues.patch
index 04fa9432bf..ae16a146ef 100644
--- a/Spigot-Server-Patches/0376-Fix-some-generation-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0375-Fix-some-generation-concurrency-issues.patch
@@ -1,4 +1,4 @@
-From 40a6743af3f62cee194013e598512f7237ce95fc Mon Sep 17 00:00:00 2001
+From 85d80bfd0297e90159aaae51179240084a62a27a Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 24 May 2019 07:53:16 +0100
 Subject: [PATCH] Fix some generation concurrency issues
@@ -222,5 +222,5 @@ index fc4348b60..44be7169f 100644
      }
  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0377-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0376-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
similarity index 92%
rename from Spigot-Server-Patches/0377-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
rename to Spigot-Server-Patches/0376-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
index 5a640b3789..0ffc5ef3bc 100644
--- a/Spigot-Server-Patches/0377-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
+++ b/Spigot-Server-Patches/0376-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
@@ -1,4 +1,4 @@
-From 17f07d64dcd6a1a1c9e2d6ead49e0f3b8108cdf0 Mon Sep 17 00:00:00 2001
+From 14cb921e48ce989d6b2ee72d8e89d0a5da1cb69f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 27 May 2019 17:35:39 -0500
 Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative
@@ -23,5 +23,5 @@ index e8f3e55fd..44289c230 100644
          if (this.world.isClientSide) {
              ParticleParam particleparam = this.getParticle();
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0378-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0377-ChunkMapDistance-CME.patch
similarity index 97%
rename from Spigot-Server-Patches/0378-ChunkMapDistance-CME.patch
rename to Spigot-Server-Patches/0377-ChunkMapDistance-CME.patch
index 2d47534de1..e5f3f4c4e8 100644
--- a/Spigot-Server-Patches/0378-ChunkMapDistance-CME.patch
+++ b/Spigot-Server-Patches/0377-ChunkMapDistance-CME.patch
@@ -1,4 +1,4 @@
-From 5cc2fb0379d37e87e370fdb424ea2c015d10b950 Mon Sep 17 00:00:00 2001
+From 5dc5395f858f62242b86303d0451962fe3fa7a65 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 29 May 2019 04:01:22 +0100
 Subject: [PATCH] ChunkMapDistance CME
@@ -50,5 +50,5 @@ index 8b3b1f9bd..73d157076 100644
          } else {
              if (!this.l.isEmpty()) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0379-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0378-Implement-CraftBlockSoundGroup.patch
similarity index 98%
rename from Spigot-Server-Patches/0379-Implement-CraftBlockSoundGroup.patch
rename to Spigot-Server-Patches/0378-Implement-CraftBlockSoundGroup.patch
index 6090f42d31..a78ddfa9e2 100644
--- a/Spigot-Server-Patches/0379-Implement-CraftBlockSoundGroup.patch
+++ b/Spigot-Server-Patches/0378-Implement-CraftBlockSoundGroup.patch
@@ -1,4 +1,4 @@
-From 820dbc426e560d638f18e038b39450974f07032f Mon Sep 17 00:00:00 2001
+From 2e4bd0b8aa76d8ef7e056632f40ff60ef06cfa46 Mon Sep 17 00:00:00 2001
 From: simpleauthority <jacob@algorithmjunkie.com>
 Date: Tue, 28 May 2019 03:48:51 -0700
 Subject: [PATCH] Implement CraftBlockSoundGroup
@@ -112,5 +112,5 @@ index fa840c3d3..a667e58ed 100644
 +    // Paper end
  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0380-Chunk-debug-command.patch b/Spigot-Server-Patches/0379-Chunk-debug-command.patch
similarity index 99%
rename from Spigot-Server-Patches/0380-Chunk-debug-command.patch
rename to Spigot-Server-Patches/0379-Chunk-debug-command.patch
index d7a7620529..2179631107 100644
--- a/Spigot-Server-Patches/0380-Chunk-debug-command.patch
+++ b/Spigot-Server-Patches/0379-Chunk-debug-command.patch
@@ -1,4 +1,4 @@
-From a3f2d76302dac538f98757f335ff10fb07ec1fc2 Mon Sep 17 00:00:00 2001
+From 7f0f866dcc2328087c840fda7b35f9e3622b45ff Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 1 Jun 2019 13:00:55 -0700
 Subject: [PATCH] Chunk debug command
@@ -185,7 +185,7 @@ index d704fc79c..09efbf725 100644
       * Ported from MinecraftForge - author: LexManos <LexManos@gmail.com> - License: LGPLv2.1
       */
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 242ff923a..bedf47b78 100644
+index 71db32bdd..b18d07b76 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -22,7 +22,7 @@ import org.apache.logging.log4j.Logger;
@@ -399,7 +399,7 @@ index 3a482466e..b6aeca05f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 3093154bb..3a0f0314b 100644
+index c4bbee7d6..b6d387006 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -26,7 +26,7 @@ public class PlayerChunk {
@@ -412,7 +412,7 @@ index 3093154bb..3a0f0314b 100644
      private int dirtyCount;
      private int r;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 40f0b2dea..999f0bb43 100644
+index 8c6cd4cd6..7033d3a91 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -58,7 +58,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -457,5 +457,5 @@ index 77bb6b092..7a8397815 100644
          return this.b;
      }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0381-incremental-chunk-saving.patch b/Spigot-Server-Patches/0380-incremental-chunk-saving.patch
similarity index 99%
rename from Spigot-Server-Patches/0381-incremental-chunk-saving.patch
rename to Spigot-Server-Patches/0380-incremental-chunk-saving.patch
index 323ce221e5..fa20bb6ba2 100644
--- a/Spigot-Server-Patches/0381-incremental-chunk-saving.patch
+++ b/Spigot-Server-Patches/0380-incremental-chunk-saving.patch
@@ -1,4 +1,4 @@
-From 69a4d617a38b343cbc9b135e60f6a68e7db8ccee Mon Sep 17 00:00:00 2001
+From fb2ea119cf6d948aeb18437265f21b42a8e4d4dd Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 9 Jun 2019 03:53:22 +0100
 Subject: [PATCH] incremental chunk saving
@@ -42,7 +42,7 @@ index 3882e5b2a..4d300699f 100644
      private long inhabitedTime;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 928e01c07..500e6289c 100644
+index b18d07b76..d2ec089e8 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -434,6 +434,15 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -319,5 +319,5 @@ index 5f9930447..729cf3ee5 100644
          this.checkSession();
          this.worldProvider.i();
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0382-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0381-Catch-exceptions-from-dispenser-entity-spawns.patch
similarity index 94%
rename from Spigot-Server-Patches/0382-Catch-exceptions-from-dispenser-entity-spawns.patch
rename to Spigot-Server-Patches/0381-Catch-exceptions-from-dispenser-entity-spawns.patch
index aa620e3a4e..f480b76ba2 100644
--- a/Spigot-Server-Patches/0382-Catch-exceptions-from-dispenser-entity-spawns.patch
+++ b/Spigot-Server-Patches/0381-Catch-exceptions-from-dispenser-entity-spawns.patch
@@ -1,4 +1,4 @@
-From f19a208c8222167e58786c61fe6ff52c0b0834e9 Mon Sep 17 00:00:00 2001
+From 7a00be23974375fb5adb215f7d002b5cf8ee220d Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 10 Jun 2019 09:36:40 +0100
 Subject: [PATCH] Catch exceptions from dispenser entity spawns
@@ -24,5 +24,5 @@ index 5a8c4dc6b..b6b7e3c6c 100644
                  // CraftBukkit end
                  return itemstack;
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0383-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0382-Fix-World-isChunkGenerated-calls.patch
similarity index 98%
rename from Spigot-Server-Patches/0383-Fix-World-isChunkGenerated-calls.patch
rename to Spigot-Server-Patches/0382-Fix-World-isChunkGenerated-calls.patch
index 8a40131a93..4e092416c1 100644
--- a/Spigot-Server-Patches/0383-Fix-World-isChunkGenerated-calls.patch
+++ b/Spigot-Server-Patches/0382-Fix-World-isChunkGenerated-calls.patch
@@ -1,4 +1,4 @@
-From 961d2303028863f5744c70ac65b60b785de4031a Mon Sep 17 00:00:00 2001
+From db9afa41e43fb9c26ff1ff68785845156669b213 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 15 Jun 2019 08:54:33 -0700
 Subject: [PATCH] Fix World#isChunkGenerated calls
@@ -8,7 +8,7 @@ This patch also adds a chunk status cache on region files (note that
 its only purpose is to cache the status on DISK)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 7bbcc8cd7..e7c9a969d 100644
+index d2ec089e8..21498da29 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -28,7 +28,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -108,7 +108,7 @@ index f0a052eec..2f95174fc 100644
      @Nullable
      private PersistentStructureLegacy c;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index c91312fac..5108d3ee9 100644
+index 66a389a67..027a6b0fd 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -114,6 +114,19 @@ public class PlayerChunk {
@@ -132,7 +132,7 @@ index c91312fac..5108d3ee9 100644
  
      public CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> getStatusFutureUnchecked(ChunkStatus chunkstatus) {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index a46d4661d..3dcd23a42 100644
+index 5c28ccc00..04728dca7 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -967,12 +967,62 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -280,7 +280,7 @@ index b3d1bb5fd..e07ae9854 100644
              throwable = throwable1;
              throw throwable1;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 67d51eeba..6204a2207 100644
+index ecc10a4f7..7ae9f8ab5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -18,6 +18,7 @@ import java.util.Objects;
@@ -376,5 +376,5 @@ index 67d51eeba..6204a2207 100644
  
      @Override
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0384-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0383-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 95%
rename from Spigot-Server-Patches/0384-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to Spigot-Server-Patches/0383-Show-blockstate-location-if-we-failed-to-read-it.patch
index 55249d2d18..1eafb9f21a 100644
--- a/Spigot-Server-Patches/0384-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/Spigot-Server-Patches/0383-Show-blockstate-location-if-we-failed-to-read-it.patch
@@ -1,4 +1,4 @@
-From ba1488ff26537c6c00dbb33feb07f158a705767f Mon Sep 17 00:00:00 2001
+From df5cb1dcc3109efd1acc8e83e944f9954a03d0bf Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 15 Jun 2019 10:28:25 -0700
 Subject: [PATCH] Show blockstate location if we failed to read it
@@ -33,5 +33,5 @@ index f6401e2cd..3e22d558e 100644
  
      public final boolean snapshotDisabled; // Paper
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0385-Log-other-thread-in-DataPaletteBlock-lock-failure.patch b/Spigot-Server-Patches/0384-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
similarity index 97%
rename from Spigot-Server-Patches/0385-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
rename to Spigot-Server-Patches/0384-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
index a99478fc65..18144a5cfa 100644
--- a/Spigot-Server-Patches/0385-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
+++ b/Spigot-Server-Patches/0384-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
@@ -1,4 +1,4 @@
-From 880da4579d9171604282c9f58353e09bd3890d2f Mon Sep 17 00:00:00 2001
+From 3913ac185140113d2fd545f6fcfb1131b4c28a0a Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 21 Jun 2019 14:42:48 -0700
 Subject: [PATCH] Log other thread in DataPaletteBlock lock failure
@@ -47,5 +47,5 @@ index d5f5a5187..2c1d1b1a5 100644
  
              crashreportsystemdetails.a("Thread dumps", (Object) s);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0386-Use-ChunkStatus-cache-when-saving-protochunks.patch b/Spigot-Server-Patches/0385-Use-ChunkStatus-cache-when-saving-protochunks.patch
similarity index 92%
rename from Spigot-Server-Patches/0386-Use-ChunkStatus-cache-when-saving-protochunks.patch
rename to Spigot-Server-Patches/0385-Use-ChunkStatus-cache-when-saving-protochunks.patch
index 326abf1eb9..ee4215ef69 100644
--- a/Spigot-Server-Patches/0386-Use-ChunkStatus-cache-when-saving-protochunks.patch
+++ b/Spigot-Server-Patches/0385-Use-ChunkStatus-cache-when-saving-protochunks.patch
@@ -1,4 +1,4 @@
-From cac8f47c478cbce14fadad072caee2187a27d8e8 Mon Sep 17 00:00:00 2001
+From ec3ea5e0e353c0e0da2ef3289d63048cff77b89d Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 22 Jun 2019 04:20:47 -0700
 Subject: [PATCH] Use ChunkStatus cache when saving protochunks
@@ -7,7 +7,7 @@ The cache should contain the chunk status when saving. If not it
 will load it.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 3dcd23a42..41a7b160c 100644
+index 04728dca7..72ae46eab 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -843,8 +843,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -24,5 +24,5 @@ index 3dcd23a42..41a7b160c 100644
                      }
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0387-Anti-Xray.patch b/Spigot-Server-Patches/0386-Anti-Xray.patch
similarity index 99%
rename from Spigot-Server-Patches/0387-Anti-Xray.patch
rename to Spigot-Server-Patches/0386-Anti-Xray.patch
index e8faabc027..f04860f2f7 100644
--- a/Spigot-Server-Patches/0387-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0386-Anti-Xray.patch
@@ -1,4 +1,4 @@
-From e71a54adb072177f2d29ecce8103d76fc78c90d7 Mon Sep 17 00:00:00 2001
+From c78e30a9f58d0a2a14f1b2ad02e0e87f1237cf9b Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Mon, 20 Aug 2018 03:03:58 +0200
 Subject: [PATCH] Anti-Xray
@@ -1710,5 +1710,5 @@ index 8191e7c34..969d548de 100644
          return section;
      }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0388-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0387-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 97%
rename from Spigot-Server-Patches/0388-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to Spigot-Server-Patches/0387-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index f1f135c74f..4cc8f777c4 100644
--- a/Spigot-Server-Patches/0388-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/Spigot-Server-Patches/0387-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -1,4 +1,4 @@
-From 2786926bdd0e906d2bfc1e6b56748a656fcc62fc Mon Sep 17 00:00:00 2001
+From e9e9c70fb82bae36164f3093a2d67ad742dca62d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 01:01:32 -0400
 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob
@@ -56,5 +56,5 @@ index 729cf3ee5..bc789fc29 100644
              }
          }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0389-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0388-Configurable-projectile-relative-velocity.patch
similarity index 98%
rename from Spigot-Server-Patches/0389-Configurable-projectile-relative-velocity.patch
rename to Spigot-Server-Patches/0388-Configurable-projectile-relative-velocity.patch
index 3b8ae71d31..67374cf4e1 100644
--- a/Spigot-Server-Patches/0389-Configurable-projectile-relative-velocity.patch
+++ b/Spigot-Server-Patches/0388-Configurable-projectile-relative-velocity.patch
@@ -1,4 +1,4 @@
-From c4209470f28071c68b64d5bf4cc030ff1a28256c Mon Sep 17 00:00:00 2001
+From 12f33fd8c401fb7919401bb8e08802dd3c3612da Mon Sep 17 00:00:00 2001
 From: Lucavon <lucavonlp@gmail.com>
 Date: Tue, 23 Jul 2019 20:29:20 -0500
 Subject: [PATCH] Configurable projectile relative velocity
@@ -65,5 +65,5 @@ index 6c091b680..f5c8074dc 100644
  
      @Override
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0390-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0389-Mark-entities-as-being-ticked-when-notifying-navigat.patch
similarity index 93%
rename from Spigot-Server-Patches/0390-Mark-entities-as-being-ticked-when-notifying-navigat.patch
rename to Spigot-Server-Patches/0389-Mark-entities-as-being-ticked-when-notifying-navigat.patch
index fa881afd24..dc7f0a74c4 100644
--- a/Spigot-Server-Patches/0390-Mark-entities-as-being-ticked-when-notifying-navigat.patch
+++ b/Spigot-Server-Patches/0389-Mark-entities-as-being-ticked-when-notifying-navigat.patch
@@ -1,4 +1,4 @@
-From f92c51087d3f8bf9ea9eeabe608b459a4e18e3a6 Mon Sep 17 00:00:00 2001
+From cbeed904f7e41afd6b9f380a2700cd60442c5dd1 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 28 Jul 2019 00:51:11 +0100
 Subject: [PATCH] Mark entities as being ticked when notifying navigation
@@ -25,5 +25,5 @@ index bc789fc29..27dcc2528 100644
      }
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0391-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0390-offset-item-frame-ticking.patch
similarity index 91%
rename from Spigot-Server-Patches/0391-offset-item-frame-ticking.patch
rename to Spigot-Server-Patches/0390-offset-item-frame-ticking.patch
index d6e148fae8..b7a4967796 100644
--- a/Spigot-Server-Patches/0391-offset-item-frame-ticking.patch
+++ b/Spigot-Server-Patches/0390-offset-item-frame-ticking.patch
@@ -1,4 +1,4 @@
-From fe224276b57344fd8e42986d10e76aaed780c055 Mon Sep 17 00:00:00 2001
+From 66eec83809d55a892497e3be551e67febd917569 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Tue, 30 Jul 2019 03:17:16 +0500
 Subject: [PATCH] offset item frame ticking
@@ -18,5 +18,5 @@ index 21dbc9b2a..ef9c4717c 100644
      protected EnumDirection direction;
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0392-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0391-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 97%
rename from Spigot-Server-Patches/0392-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0391-Avoid-hopper-searches-if-there-are-no-items.patch
index 25fb49f23b..b1cf16d2d0 100644
--- a/Spigot-Server-Patches/0392-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0391-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From 037d9e8939727c321737ade23ecb4f892eec3a80 Mon Sep 17 00:00:00 2001
+From 8eb689794cfdff5e32ffdb94055b5924daefee91 Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
@@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 06b4dc628..37b12daff 100644
+index 06b4dc628..fc01aa68e 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -84,6 +84,10 @@ public class Chunk implements IChunkAccess {
@@ -97,5 +97,5 @@ index 498f38109..a2d1ef360 100644
          return entity instanceof IInventory && entity.isAlive();
      };
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0393-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0392-Asynchronous-chunk-IO-and-loading.patch
similarity index 99%
rename from Spigot-Server-Patches/0393-Asynchronous-chunk-IO-and-loading.patch
rename to Spigot-Server-Patches/0392-Asynchronous-chunk-IO-and-loading.patch
index a20f3ca509..172bbdfb47 100644
--- a/Spigot-Server-Patches/0393-Asynchronous-chunk-IO-and-loading.patch
+++ b/Spigot-Server-Patches/0392-Asynchronous-chunk-IO-and-loading.patch
@@ -1,4 +1,4 @@
-From 789369e56ef95117901c9a73a4ccb28ef4f0d2a1 Mon Sep 17 00:00:00 2001
+From 9230461b781103d626bf071caa58adf12290f385 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 13 Jul 2019 09:23:10 -0700
 Subject: [PATCH] Asynchronous chunk IO and loading
@@ -4108,5 +4108,5 @@ index 07936eeba..5bdcdcf9e 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0394-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0393-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 98%
rename from Spigot-Server-Patches/0394-Use-getChunkIfLoadedImmediately-in-places.patch
rename to Spigot-Server-Patches/0393-Use-getChunkIfLoadedImmediately-in-places.patch
index 61113deab3..7c01c1bfba 100644
--- a/Spigot-Server-Patches/0394-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/Spigot-Server-Patches/0393-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -1,4 +1,4 @@
-From a080e0b4b69b7358ade2950ccd3638814e1d5095 Mon Sep 17 00:00:00 2001
+From e853c9a81e2edbb4750c52f7121b71fa7d1d1862 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 8 Jul 2019 00:13:36 -0700
 Subject: [PATCH] Use getChunkIfLoadedImmediately in places
@@ -90,5 +90,5 @@ index f86404f83..92601c581 100644
                  }
              }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0395-Reduce-sync-loads.patch b/Spigot-Server-Patches/0394-Reduce-sync-loads.patch
similarity index 99%
rename from Spigot-Server-Patches/0395-Reduce-sync-loads.patch
rename to Spigot-Server-Patches/0394-Reduce-sync-loads.patch
index 71ba960fab..046fa13202 100644
--- a/Spigot-Server-Patches/0395-Reduce-sync-loads.patch
+++ b/Spigot-Server-Patches/0394-Reduce-sync-loads.patch
@@ -1,4 +1,4 @@
-From 64ddb5b4e6486d01bde7a629a97030eb0935c979 Mon Sep 17 00:00:00 2001
+From 80c6f7c2556cf280ee87cb98f47ece177c65f681 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 19 Jul 2019 03:29:14 -0700
 Subject: [PATCH] Reduce sync loads
@@ -328,5 +328,5 @@ index 6506daeec..26d1303dd 100644
      // Add env and gen to constructor
      public WorldServer(MinecraftServer minecraftserver, Executor executor, WorldNBTStorage worldnbtstorage, WorldData worlddata, DimensionManager dimensionmanager, GameProfilerFiller gameprofilerfiller, WorldLoadListener worldloadlistener, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0396-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0395-Implement-alternative-item-despawn-rate.patch
similarity index 98%
rename from Spigot-Server-Patches/0396-Implement-alternative-item-despawn-rate.patch
rename to Spigot-Server-Patches/0395-Implement-alternative-item-despawn-rate.patch
index 694676a578..6a75a8c849 100644
--- a/Spigot-Server-Patches/0396-Implement-alternative-item-despawn-rate.patch
+++ b/Spigot-Server-Patches/0395-Implement-alternative-item-despawn-rate.patch
@@ -1,4 +1,4 @@
-From fc4be0daa199c8716a12c431312350cd316a1445 Mon Sep 17 00:00:00 2001
+From 3efaa15b531e2ec68342392b9eca081955e7d229 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Mon, 3 Jun 2019 02:02:39 -0400
 Subject: [PATCH] Implement alternative item-despawn-rate
@@ -128,5 +128,5 @@ index ef2cf6565..507627a29 100644
      public Packet<?> L() {
          return new PacketPlayOutSpawnEntity(this);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0397-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0396-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 97%
rename from Spigot-Server-Patches/0397-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to Spigot-Server-Patches/0396-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
index 887ccd8647..31822658be 100644
--- a/Spigot-Server-Patches/0397-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
+++ b/Spigot-Server-Patches/0396-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
@@ -1,4 +1,4 @@
-From 76940738c04aaddb4f5f34d72fef56bdfbecfe48 Mon Sep 17 00:00:00 2001
+From 85f83c65d51ec74fe7bad9b87a4e253825973e7e Mon Sep 17 00:00:00 2001
 From: Paul Sauve <paul@burngames.net>
 Date: Sun, 14 Jul 2019 21:05:03 -0500
 Subject: [PATCH] Do less work if we have a custom Bukkit generator
@@ -45,5 +45,5 @@ index 26d1303dd..edffae055 100644
                  WorldServer.LOGGER.warn("Unable to find spawn biome");
              }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0398-Fix-MC-158900.patch b/Spigot-Server-Patches/0397-Fix-MC-158900.patch
similarity index 95%
rename from Spigot-Server-Patches/0398-Fix-MC-158900.patch
rename to Spigot-Server-Patches/0397-Fix-MC-158900.patch
index 122f889e84..626f6890cd 100644
--- a/Spigot-Server-Patches/0398-Fix-MC-158900.patch
+++ b/Spigot-Server-Patches/0397-Fix-MC-158900.patch
@@ -1,4 +1,4 @@
-From 65130b9f04b275e5bb76f5ef26d24a78fa7a0655 Mon Sep 17 00:00:00 2001
+From 5dd6629241a531c0b75dd47db0226298e69e7be8 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 13 Aug 2019 06:35:17 -0700
 Subject: [PATCH] Fix MC-158900
@@ -24,5 +24,5 @@ index 68e089a4b..f702619aa 100644
              chatmessage = new ChatMessage("multiplayer.disconnect.banned.reason", new Object[]{gameprofilebanentry.getReason()});
              if (gameprofilebanentry.getExpires() != null) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0399-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0398-implement-optional-per-player-mob-spawns.patch
similarity index 99%
rename from Spigot-Server-Patches/0399-implement-optional-per-player-mob-spawns.patch
rename to Spigot-Server-Patches/0398-implement-optional-per-player-mob-spawns.patch
index ff51bb71f8..0df061455e 100644
--- a/Spigot-Server-Patches/0399-implement-optional-per-player-mob-spawns.patch
+++ b/Spigot-Server-Patches/0398-implement-optional-per-player-mob-spawns.patch
@@ -1,4 +1,4 @@
-From 949906ac8db24ae55d0032d299ba21224504ea88 Mon Sep 17 00:00:00 2001
+From 838a378b1ceba8ab08e0d54b02d312cc447acdc3 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Mon, 19 Aug 2019 01:27:58 +0500
 Subject: [PATCH] implement optional per player mob spawns
@@ -800,5 +800,5 @@ index edffae055..88cc8763f 100644
  
      @Override
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0400-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0399-Prevent-consuming-the-wrong-itemstack.patch
similarity index 96%
rename from Spigot-Server-Patches/0400-Prevent-consuming-the-wrong-itemstack.patch
rename to Spigot-Server-Patches/0399-Prevent-consuming-the-wrong-itemstack.patch
index a7c214c306..d3cc7b770d 100644
--- a/Spigot-Server-Patches/0400-Prevent-consuming-the-wrong-itemstack.patch
+++ b/Spigot-Server-Patches/0399-Prevent-consuming-the-wrong-itemstack.patch
@@ -1,4 +1,4 @@
-From 431512c2f38c3069b6e0bae7c5dbf76fd5709e31 Mon Sep 17 00:00:00 2001
+From e2730bf2ef41ac57940c626d2db7acd3007f0a42 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Mon, 19 Aug 2019 19:42:35 +0500
 Subject: [PATCH] Prevent consuming the wrong itemstack
@@ -44,5 +44,5 @@ index af79b6e37..b098cd6d7 100644
                  }
                  // Paper end
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0401-only-add-passanger-entities-once-from-spawners.patch b/Spigot-Server-Patches/0400-only-add-passanger-entities-once-from-spawners.patch
similarity index 89%
rename from Spigot-Server-Patches/0401-only-add-passanger-entities-once-from-spawners.patch
rename to Spigot-Server-Patches/0400-only-add-passanger-entities-once-from-spawners.patch
index 08a1eb7329..ac66a8fe6f 100644
--- a/Spigot-Server-Patches/0401-only-add-passanger-entities-once-from-spawners.patch
+++ b/Spigot-Server-Patches/0400-only-add-passanger-entities-once-from-spawners.patch
@@ -1,11 +1,11 @@
-From 83d95ae5e0411d44c2995528f937b0cff3eecee2 Mon Sep 17 00:00:00 2001
+From 27e07b128da5857600cdbe16f6c8275fc86cd91a Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Wed, 21 Aug 2019 23:57:32 +0500
 Subject: [PATCH] only add passanger entities once from spawners
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 41001b02a6..df494d37be 100644
+index 41001b02a..df494d37b 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -196,7 +196,7 @@ public abstract class MobSpawnerAbstract {
@@ -18,5 +18,5 @@ index 41001b02a6..df494d37be 100644
  
              while (iterator.hasNext()) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0402-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0401-Fix-nether-portal-creation.patch
similarity index 94%
rename from Spigot-Server-Patches/0402-Fix-nether-portal-creation.patch
rename to Spigot-Server-Patches/0401-Fix-nether-portal-creation.patch
index 9d5b93db18..3d6e12b0cc 100644
--- a/Spigot-Server-Patches/0402-Fix-nether-portal-creation.patch
+++ b/Spigot-Server-Patches/0401-Fix-nether-portal-creation.patch
@@ -1,4 +1,4 @@
-From c6369a11b64b98fcc5e817c9fc8d134e6030ce6f Mon Sep 17 00:00:00 2001
+From 4a38dc13b8c72b2415342056a1896281b5041c9e Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Mon, 9 Sep 2019 13:21:17 +1000
 Subject: [PATCH] Fix nether portal creation
@@ -21,5 +21,5 @@ index 60330f753..c22dbbfbe 100644
          state.setData(data);
          list.put(position, state);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0403-Generator-Settings.patch b/Spigot-Server-Patches/0402-Generator-Settings.patch
similarity index 97%
rename from Spigot-Server-Patches/0403-Generator-Settings.patch
rename to Spigot-Server-Patches/0402-Generator-Settings.patch
index 162409bd8c..1bfd52f02f 100644
--- a/Spigot-Server-Patches/0403-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0402-Generator-Settings.patch
@@ -1,4 +1,4 @@
-From f46c369395e917501cfe23302b200ed5bf2559ce Mon Sep 17 00:00:00 2001
+From 124265b64e81c925b22f080b951e34379b0f81a8 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
@@ -52,5 +52,5 @@ index af81a8414..2268fbdd8 100644
                      }
                  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0404-Fix-zero-tick-instant-grow-farms-MC-113809.patch b/Spigot-Server-Patches/0403-Fix-zero-tick-instant-grow-farms-MC-113809.patch
similarity index 98%
rename from Spigot-Server-Patches/0404-Fix-zero-tick-instant-grow-farms-MC-113809.patch
rename to Spigot-Server-Patches/0403-Fix-zero-tick-instant-grow-farms-MC-113809.patch
index 9cb5f27cec..07fe0bd641 100644
--- a/Spigot-Server-Patches/0404-Fix-zero-tick-instant-grow-farms-MC-113809.patch
+++ b/Spigot-Server-Patches/0403-Fix-zero-tick-instant-grow-farms-MC-113809.patch
@@ -1,4 +1,4 @@
-From 6057172216ab6a77aa85da8860d3112120659f79 Mon Sep 17 00:00:00 2001
+From 7280f634aaf43fa791bda5c3a37920be21447d8a Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sun, 15 Sep 2019 11:32:32 -0500
 Subject: [PATCH] Fix zero-tick instant grow farms MC-113809
@@ -95,5 +95,5 @@ index 88cc8763f..b2d8f7b9f 100644
  
                          Fluid fluid = iblockdata.getFluid();
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0405-Fix-MC-161754.patch b/Spigot-Server-Patches/0404-Fix-MC-161754.patch
similarity index 93%
rename from Spigot-Server-Patches/0405-Fix-MC-161754.patch
rename to Spigot-Server-Patches/0404-Fix-MC-161754.patch
index 05cacc89c6..09b6ee7c79 100644
--- a/Spigot-Server-Patches/0405-Fix-MC-161754.patch
+++ b/Spigot-Server-Patches/0404-Fix-MC-161754.patch
@@ -1,4 +1,4 @@
-From 07ccb9dcfccdf75d49ba6838862c2f8cdaa6dc69 Mon Sep 17 00:00:00 2001
+From f82bf0b1eb94718523fdc9e10a907e019191e99a Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 24 Sep 2019 16:03:00 -0700
 Subject: [PATCH] Fix MC-161754
@@ -22,5 +22,5 @@ index c95ce0124..18e1ae7f0 100644
  
      @Override
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0406-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0405-Performance-improvement-for-Chunk.getEntities.patch
similarity index 95%
rename from Spigot-Server-Patches/0406-Performance-improvement-for-Chunk.getEntities.patch
rename to Spigot-Server-Patches/0405-Performance-improvement-for-Chunk.getEntities.patch
index 68a4a6fa2a..9f4dd319e4 100644
--- a/Spigot-Server-Patches/0406-Performance-improvement-for-Chunk.getEntities.patch
+++ b/Spigot-Server-Patches/0405-Performance-improvement-for-Chunk.getEntities.patch
@@ -1,4 +1,4 @@
-From 9961ec0865c5a0e65986c223b7dfaf11aaa91f3c Mon Sep 17 00:00:00 2001
+From b799154bf7e4dc77d22a6f0c260b18261b36db75 Mon Sep 17 00:00:00 2001
 From: wea_ondara <wea_ondara@alpenblock.net>
 Date: Thu, 10 Oct 2019 11:29:42 +0200
 Subject: [PATCH] Performance improvement for Chunk.getEntities
@@ -34,5 +34,5 @@ index 91f2066b1..9cff8b88b 100644
  
          return entities;
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0407-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 93%
rename from Spigot-Server-Patches/0407-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to Spigot-Server-Patches/0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
index 812929f6f9..6dc2535473 100644
--- a/Spigot-Server-Patches/0407-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
+++ b/Spigot-Server-Patches/0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
@@ -1,4 +1,4 @@
-From 12ebbef1f536b9c55251bc6c4031f16bbdb24765 Mon Sep 17 00:00:00 2001
+From 049c199629e4cb8738280b1e3ac14d86afb2180d Mon Sep 17 00:00:00 2001
 From: MisterErwin <git@askarian.net>
 Date: Wed, 30 Oct 2019 16:57:54 +0100
 Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 95a29d1b2..a14b8cb98 100644
+index defee6722..1a5ee3410 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1842,7 +1842,12 @@ public class CraftWorld implements World {
@@ -24,5 +24,5 @@ index 95a29d1b2..a14b8cb98 100644
              for (BlockFace dir : faces) {
                  IBlockData nmsBlock = world.getType(pos.shift(CraftBlock.blockFaceToNotch(dir)));
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0408-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0407-Expose-the-internal-current-tick.patch
similarity index 91%
rename from Spigot-Server-Patches/0408-Expose-the-internal-current-tick.patch
rename to Spigot-Server-Patches/0407-Expose-the-internal-current-tick.patch
index 20c0ef8044..305d0acf22 100644
--- a/Spigot-Server-Patches/0408-Expose-the-internal-current-tick.patch
+++ b/Spigot-Server-Patches/0407-Expose-the-internal-current-tick.patch
@@ -1,4 +1,4 @@
-From f7efd2ca53a4ef65ddc52a39fc6307e3f4cc3cef Mon Sep 17 00:00:00 2001
+From 556965a2437fc96aa412272fe44c893e6e9ba411 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 20 Apr 2019 19:47:34 -0500
 Subject: [PATCH] Expose the internal current tick
@@ -20,5 +20,5 @@ index 0df49581f..b9a398bc5 100644
      // Paper end
  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0409-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0408-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 91%
rename from Spigot-Server-Patches/0409-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to Spigot-Server-Patches/0408-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
index 85db2ce51b..ccfe442247 100644
--- a/Spigot-Server-Patches/0409-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
+++ b/Spigot-Server-Patches/0408-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
@@ -1,11 +1,11 @@
-From d3d93a05728c92d839189478f6f31d069418f892 Mon Sep 17 00:00:00 2001
+From 9943514590953f7666e925497d56484fe9c8c377 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 9 Oct 2019 21:51:43 -0500
 Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657)
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 07a2310b18..cb795aa733 100644
+index 07a2310b1..cb795aa73 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -982,6 +982,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,7 +18,7 @@ index 07a2310b18..cb795aa733 100644
              PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld());
              this.world.getServer().getPluginManager().callEvent(changeEvent);
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f702619aa2..7b79ee4fe5 100644
+index f702619aa..7b79ee4fe 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -729,6 +729,8 @@ public abstract class PlayerList {
@@ -31,5 +31,5 @@ index f702619aa2..7b79ee4fe5 100644
          entityplayer.triggerDimensionAdvancements(((CraftWorld) fromWorld).getHandle());
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0410-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0409-Add-option-to-disable-pillager-patrols.patch
similarity index 95%
rename from Spigot-Server-Patches/0410-Add-option-to-disable-pillager-patrols.patch
rename to Spigot-Server-Patches/0409-Add-option-to-disable-pillager-patrols.patch
index 70b4c0efd1..5b8bc0254b 100644
--- a/Spigot-Server-Patches/0410-Add-option-to-disable-pillager-patrols.patch
+++ b/Spigot-Server-Patches/0409-Add-option-to-disable-pillager-patrols.patch
@@ -1,4 +1,4 @@
-From c38e8c64b07e32f52623d615f826b598f52173e9 Mon Sep 17 00:00:00 2001
+From e40f7304001ea67cdf92528a997ddedf747d9f31 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 9 Oct 2019 21:46:15 -0500
 Subject: [PATCH] Add option to disable pillager patrols
@@ -31,5 +31,5 @@ index 33488b37e..a0f582807 100644
              return 0;
          } else if (!worldserver.getGameRules().getBoolean(GameRules.DO_PATROL_SPAWNING)) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0411-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0410-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 96%
rename from Spigot-Server-Patches/0411-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to Spigot-Server-Patches/0410-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index f6bb0f6433..bce8f8d817 100644
--- a/Spigot-Server-Patches/0411-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/Spigot-Server-Patches/0410-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
@@ -1,4 +1,4 @@
-From 163f785cdd7cfe820fd49b464636a0143805ac4d Mon Sep 17 00:00:00 2001
+From 7ea8b1cf227b24937a9dd217110fc1fad1b5e0cd Mon Sep 17 00:00:00 2001
 From: Lukasz Derlatka <toranktto@gmail.com>
 Date: Mon, 11 Nov 2019 16:08:13 +0100
 Subject: [PATCH] Fix AssertionError when player hand set to empty type
@@ -34,5 +34,5 @@ index f88bcb29d..108377d76 100644
              }
              // CraftBukkit end
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0412-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0411-PlayerLaunchProjectileEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0412-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0411-PlayerLaunchProjectileEvent.patch
index 637736c8e3..f5586d2dae 100644
--- a/Spigot-Server-Patches/0412-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/0411-PlayerLaunchProjectileEvent.patch
@@ -1,4 +1,4 @@
-From 719ddf27e23783436bd14bc69ec944608ced30a6 Mon Sep 17 00:00:00 2001
+From d05f19a6ddbd9a7012a42a1da9ff2fffec84c61d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 03:11:03 -0500
 Subject: [PATCH] PlayerLaunchProjectileEvent
@@ -269,5 +269,5 @@ index 18bd846ce..e71e933ff 100644
      }
  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0413-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0412-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 92%
rename from Spigot-Server-Patches/0413-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to Spigot-Server-Patches/0412-Add-CraftMagicNumbers.isSupportedApiVersion.patch
index fed921cdd3..22c462d2a0 100644
--- a/Spigot-Server-Patches/0413-Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/Spigot-Server-Patches/0412-Add-CraftMagicNumbers.isSupportedApiVersion.patch
@@ -1,4 +1,4 @@
-From e682e63dd6c0e1fdb2038a09fa2af72c1b7b33fc Mon Sep 17 00:00:00 2001
+From 8cc5c96e8be94d4f619858a86e18ec7b15527a0e Mon Sep 17 00:00:00 2001
 From: BlackHole <black-hole@live.com>
 Date: Sun, 15 Dec 2019 19:12:39 +0100
 Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion()
@@ -21,5 +21,5 @@ index b1e1b59d4..770375ed4 100644
  
      /**
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0414-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0413-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 94%
rename from Spigot-Server-Patches/0414-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to Spigot-Server-Patches/0413-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index fa32c80d6d..0017e23430 100644
--- a/Spigot-Server-Patches/0414-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/Spigot-Server-Patches/0413-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
@@ -1,4 +1,4 @@
-From 480b09577ea0a64c67a7b18d6e2477db7c837ec2 Mon Sep 17 00:00:00 2001
+From 326a5f98339073c75535437c63691728a83c3630 Mon Sep 17 00:00:00 2001
 From: Callahan <mr.callahhh@gmail.com>
 Date: Mon, 13 Jan 2020 23:47:28 -0600
 Subject: [PATCH] Prevent sync chunk loads when villagers try to find beds
@@ -19,5 +19,5 @@ index fa575dde1..dfe0f6650 100644
                      return globalpos.getBlockPosition().a((IPosition) entityliving.getPositionVector(), 2.0D) && iblockdata.getBlock().a(TagsBlock.BEDS) && !(Boolean) iblockdata.get(BlockBed.OCCUPIED);
                  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0415-Fix-spawn-radius-being-treated-as-0.patch b/Spigot-Server-Patches/0414-Fix-spawn-radius-being-treated-as-0.patch
similarity index 90%
rename from Spigot-Server-Patches/0415-Fix-spawn-radius-being-treated-as-0.patch
rename to Spigot-Server-Patches/0414-Fix-spawn-radius-being-treated-as-0.patch
index 4390248eec..e4d76a0e97 100644
--- a/Spigot-Server-Patches/0415-Fix-spawn-radius-being-treated-as-0.patch
+++ b/Spigot-Server-Patches/0414-Fix-spawn-radius-being-treated-as-0.patch
@@ -1,11 +1,11 @@
-From 3aedf938f6532cabef5d0668d0166effa1a9de2b Mon Sep 17 00:00:00 2001
+From 13f92e5f465a38c37807942ea86010ebd141a13e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Dec 2019 19:41:28 +0000
 Subject: [PATCH] Fix spawn radius being treated as 0
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index cb795aa733..69a4228908 100644
+index cb795aa73..69a422890 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -129,7 +129,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,5 +18,5 @@ index cb795aa733..69a4228908 100644
              int j = MathHelper.floor(worldserver.getWorldBorder().b((double) blockposition.getX(), (double) blockposition.getZ()));
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0416-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0415-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 97%
rename from Spigot-Server-Patches/0416-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to Spigot-Server-Patches/0415-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 43efe3c140..b018b8cacf 100644
--- a/Spigot-Server-Patches/0416-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/Spigot-Server-Patches/0415-MC-145656-Fix-Follow-Range-Initial-Target.patch
@@ -1,4 +1,4 @@
-From 7519f49f7a660508c09304fb1f5e384562789d9f Mon Sep 17 00:00:00 2001
+From 3ad2d2634955c52214dac9fa92cd8e8bac8062a8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 18 Dec 2019 22:21:35 -0600
 Subject: [PATCH] MC-145656 Fix Follow Range Initial Target
@@ -63,5 +63,5 @@ index c76a43837..e35ec2db0 100644
 +    // Paper end
  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0417-Optimize-Hoppers.patch b/Spigot-Server-Patches/0416-Optimize-Hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0417-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0416-Optimize-Hoppers.patch
index 44ddc1e61e..b58d54eaff 100644
--- a/Spigot-Server-Patches/0417-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0416-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From 7fb4a2248613ae2e5e9247b4baf08dab78d71cd3 Mon Sep 17 00:00:00 2001
+From 33c72229b3f3a008267c5a74f800962395c77cb7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
@@ -307,5 +307,5 @@ index 907d088c8..4afd33a49 100644
                  flag = true;
              } else if (a(itemstack1, itemstack)) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0418-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0417-PlayerDeathEvent-shouldDropExperience.patch
similarity index 89%
rename from Spigot-Server-Patches/0418-PlayerDeathEvent-shouldDropExperience.patch
rename to Spigot-Server-Patches/0417-PlayerDeathEvent-shouldDropExperience.patch
index 903dc0b650..d0c4031f86 100644
--- a/Spigot-Server-Patches/0418-PlayerDeathEvent-shouldDropExperience.patch
+++ b/Spigot-Server-Patches/0417-PlayerDeathEvent-shouldDropExperience.patch
@@ -1,11 +1,11 @@
-From 2efa2a5e795f3c1b2afbf18a83eca96fd89324b2 Mon Sep 17 00:00:00 2001
+From 38a8f92216b4bce9bd7f01290af138cb0e76aae2 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 24 Dec 2019 00:35:42 +0000
 Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 69a4228908..e7bfbc3307 100644
+index 69a422890..e7bfbc330 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -645,7 +645,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,5 +18,5 @@ index 69a4228908..e7bfbc3307 100644
          if (!event.getKeepInventory()) {
              // Paper start - replace logic
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0419-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0418-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 93%
rename from Spigot-Server-Patches/0419-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to Spigot-Server-Patches/0418-Prevent-bees-loading-chunks-checking-hive-position.patch
index 35fabf8397..3be44dbf57 100644
--- a/Spigot-Server-Patches/0419-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/Spigot-Server-Patches/0418-Prevent-bees-loading-chunks-checking-hive-position.patch
@@ -1,4 +1,4 @@
-From d24accc49be4c8a1eadc38b95ceb3b02edad77f2 Mon Sep 17 00:00:00 2001
+From 8b7fed9a4ba0d46370730fdaa2ef544f0aacc83b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 5 Jan 2020 17:24:34 -0600
 Subject: [PATCH] Prevent bees loading chunks checking hive position
@@ -17,5 +17,5 @@ index b39599654..73e016257 100644
  
              return tileentity != null && tileentity.getTileType() == TileEntityTypes.BEEHIVE;
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0420-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0419-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 96%
rename from Spigot-Server-Patches/0420-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0419-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 9edf68af9e..e3686346f2 100644
--- a/Spigot-Server-Patches/0420-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0419-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From d8a248beb167d610ebf3f63b997db5bd3796bd3d Mon Sep 17 00:00:00 2001
+From 7776a06028d95b1840c7008f1545de7bbcd62b0f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
@@ -32,5 +32,5 @@ index 3cb6e6089..7a16a3e0e 100644
                      DoubleBlockFinder.BlockType doubleblockfinder_blocktype1 = (DoubleBlockFinder.BlockType) function.apply(iblockdata1);
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0421-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0420-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 98%
rename from Spigot-Server-Patches/0421-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to Spigot-Server-Patches/0420-Guard-against-serializing-mismatching-chunk-coordina.patch
index 9a123e8caa..606f0e37e9 100644
--- a/Spigot-Server-Patches/0421-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/Spigot-Server-Patches/0420-Guard-against-serializing-mismatching-chunk-coordina.patch
@@ -1,4 +1,4 @@
-From d14f9813bbe32d554e92189e8173ba2ec0858bd7 Mon Sep 17 00:00:00 2001
+From a5b28d5c17c8261410ccf253c9509a84ed400502 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 27 Dec 2019 09:42:26 -0800
 Subject: [PATCH] Guard against serializing mismatching chunk coordinate
@@ -53,5 +53,5 @@ index 134c76065..25c8b131f 100644
          if (this.c != null) {
              synchronized (this.persistentDataLock) { // Paper - Async chunk loading
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0422-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0421-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 96%
rename from Spigot-Server-Patches/0422-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to Spigot-Server-Patches/0421-Optimise-IEntityAccess-getPlayerByUUID.patch
index 5e127d1ba6..fc10c4ff70 100644
--- a/Spigot-Server-Patches/0422-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/Spigot-Server-Patches/0421-Optimise-IEntityAccess-getPlayerByUUID.patch
@@ -1,4 +1,4 @@
-From e2239878575f16aa302f52d2067c69b04957ebac Mon Sep 17 00:00:00 2001
+From 89cf96a0b2e672a0a03b0194767d3f87c2ef8b17 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 11 Jan 2020 21:50:56 -0800
 Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID
@@ -43,5 +43,5 @@ index b2d8f7b9f..0fed33713 100644
      public final com.destroystokyo.paper.io.PaperFileIOThread.ChunkDataController poiDataController = new com.destroystokyo.paper.io.PaperFileIOThread.ChunkDataController() {
          @Override
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0423-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0422-Fix-items-not-falling-correctly.patch
similarity index 95%
rename from Spigot-Server-Patches/0423-Fix-items-not-falling-correctly.patch
rename to Spigot-Server-Patches/0422-Fix-items-not-falling-correctly.patch
index 99e0c6e221..836a9cf227 100644
--- a/Spigot-Server-Patches/0423-Fix-items-not-falling-correctly.patch
+++ b/Spigot-Server-Patches/0422-Fix-items-not-falling-correctly.patch
@@ -1,4 +1,4 @@
-From 8c46eba042db53113e73979dabd61b85c76a751d Mon Sep 17 00:00:00 2001
+From be4ae53f34352e1e43cd74b924cb79a276652e73 Mon Sep 17 00:00:00 2001
 From: AJMFactsheets <AJMFactsheets@gmail.com>
 Date: Fri, 17 Jan 2020 17:17:54 -0600
 Subject: [PATCH] Fix items not falling correctly
@@ -28,5 +28,5 @@ index 507627a29..2926fbb95 100644
                  float f = 0.98F;
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0424-Lag-compensate-eating.patch b/Spigot-Server-Patches/0423-Lag-compensate-eating.patch
similarity index 98%
rename from Spigot-Server-Patches/0424-Lag-compensate-eating.patch
rename to Spigot-Server-Patches/0423-Lag-compensate-eating.patch
index 77f1a654ba..74c91bbc64 100644
--- a/Spigot-Server-Patches/0424-Lag-compensate-eating.patch
+++ b/Spigot-Server-Patches/0423-Lag-compensate-eating.patch
@@ -1,4 +1,4 @@
-From ac8562fe51ed88f00e955863bf3d8cb4c6f0c5c3 Mon Sep 17 00:00:00 2001
+From f9e21470e37ce717df51aee457bbcb35731509f9 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 14 Jan 2020 15:28:28 -0800
 Subject: [PATCH] Lag compensate eating
@@ -83,5 +83,5 @@ index 6184cced7..1b9551ae0 100644
  
      public boolean isBlocking() {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0425-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0424-Optimize-call-to-getFluid-for-explosions.patch
similarity index 93%
rename from Spigot-Server-Patches/0425-Optimize-call-to-getFluid-for-explosions.patch
rename to Spigot-Server-Patches/0424-Optimize-call-to-getFluid-for-explosions.patch
index 7bbc5ce01e..054c764753 100644
--- a/Spigot-Server-Patches/0425-Optimize-call-to-getFluid-for-explosions.patch
+++ b/Spigot-Server-Patches/0424-Optimize-call-to-getFluid-for-explosions.patch
@@ -1,4 +1,4 @@
-From 264745e23b68ce3618a16a909031196fc0c83f0e Mon Sep 17 00:00:00 2001
+From 8b28733dc835cdfaf86d0064c0a76bc65983c398 Mon Sep 17 00:00:00 2001
 From: BrodyBeckwith <brody@beckwith.dev>
 Date: Tue, 14 Jan 2020 17:49:03 -0500
 Subject: [PATCH] Optimize call to getFluid for explosions
@@ -18,5 +18,5 @@ index d99d2defe..a353f3d5f 100644
                              if (!iblockdata.isAir() || !fluid.isEmpty()) {
                                  float f2 = Math.max(iblockdata.getBlock().getDurability(), fluid.k());
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0426-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0425-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 94%
rename from Spigot-Server-Patches/0426-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to Spigot-Server-Patches/0425-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index 0b2d63b12c..83bdbcfce9 100644
--- a/Spigot-Server-Patches/0426-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/Spigot-Server-Patches/0425-Fix-last-firework-in-stack-not-having-effects-when-d.patch
@@ -1,4 +1,4 @@
-From d001ebbfc24d1432185a7e9f60fdcd337a9b2f7c Mon Sep 17 00:00:00 2001
+From 07135f5c49e15c2e5e6307b9905f30a0331d0c46 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 17 Jan 2020 18:44:55 -0800
 Subject: [PATCH] Fix last firework in stack not having effects when dispensed
@@ -22,5 +22,5 @@ index b6b7e3c6c..3af686c7f 100644
                  entityfireworks.shoot(d0, d1, d2, 0.5F, 1.0F);
                  isourceblock.getWorld().addEntity(entityfireworks);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0427-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0426-Activation-Range-Improvements.patch
similarity index 97%
rename from Spigot-Server-Patches/0427-Activation-Range-Improvements.patch
rename to Spigot-Server-Patches/0426-Activation-Range-Improvements.patch
index 31f8e29728..ba912a7d0d 100644
--- a/Spigot-Server-Patches/0427-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0426-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From 9cff84dfbe2d85247d2fef7d73a6b65816b24586 Mon Sep 17 00:00:00 2001
+From d50043feff731801bb51d0f14b5fe3654c2c9c63 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Activation Range Improvements
@@ -10,7 +10,7 @@ Fixes and adds new Immunities to improve gameplay behavior
 Adds water Mobs to activation range config and nerfs fish
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2c8603e2fc..659591e028 100644
+index 2c8603e2f..659591e02 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -553,6 +553,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -22,7 +22,7 @@ index 2c8603e2fc..659591e028 100644
                  if (vec3d.equals(Vec3D.a)) {
                      return;
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index b40c8d2f83..4eda130750 100644
+index b40c8d2f8..4eda13075 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -7,6 +7,7 @@ import org.bukkit.event.entity.EntityUnleashEvent;
@@ -34,7 +34,7 @@ index b40c8d2f83..4eda130750 100644
      protected EntityCreature(EntityTypes<? extends EntityCreature> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 6d53254f83..1991cee43d 100644
+index 6d53254f8..1991cee43 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -114,6 +114,17 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -56,7 +56,7 @@ index 6d53254f83..1991cee43d 100644
          if (this.isPassenger() && this.getVehicle() instanceof EntityInsentient) {
              EntityInsentient entityinsentient = (EntityInsentient) this.getVehicle();
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 6d4d41c88c..193dbfc5f6 100644
+index 6d4d41c88..193dbfc5f 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -382,6 +382,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -68,7 +68,7 @@ index 6d4d41c88c..193dbfc5f6 100644
          return this.bJ != null;
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index f22f12eeb0..bdb90a3466 100644
+index f22f12eeb..bdb90a346 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -20,7 +20,10 @@ public abstract class PathfinderGoal {
@@ -84,7 +84,7 @@ index f22f12eeb0..bdb90a3466 100644
      public void e() {}
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
-index 41fb166ce0..e93129f0b2 100644
+index 41fb166ce..e93129f0b 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 @@ -4,12 +4,12 @@ import java.util.EnumSet;
@@ -125,7 +125,7 @@ index 41fb166ce0..e93129f0b2 100644
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-index 44bb18c594..935136771e 100644
+index 44bb18c59..935136771 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 @@ -24,10 +24,11 @@ public class PathfinderGoalSelector {
@@ -169,7 +169,7 @@ index 44bb18c594..935136771e 100644
          this.d.stream().filter((pathfindergoalwrapped) -> {
              return pathfindergoalwrapped.j() == pathfindergoal;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
-index 5a8c60ad90..29657fed75 100644
+index 5a8c60ad9..29657fed7 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 @@ -64,6 +64,7 @@ public class PathfinderGoalWrapped extends PathfinderGoal {
@@ -181,7 +181,7 @@ index 5a8c60ad90..29657fed75 100644
          return this.c;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 92601c581c..6e165a1649 100644
+index 92601c581..6e165a164 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -33,12 +33,18 @@ import net.minecraft.server.MathHelper;
@@ -274,7 +274,7 @@ index 92601c581c..6e165a1649 100644
              isActive = false;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 58767972a3..3ceeed3f99 100644
+index 58767972a..3ceeed3f9 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -180,6 +180,7 @@ public class SpigotWorldConfig
@@ -294,5 +294,5 @@ index 58767972a3..3ceeed3f99 100644
          log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Ra " + raiderActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers );
      }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0428-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0427-Add-effect-to-block-break-naturally.patch
similarity index 95%
rename from Spigot-Server-Patches/0428-Add-effect-to-block-break-naturally.patch
rename to Spigot-Server-Patches/0427-Add-effect-to-block-break-naturally.patch
index d884e71df5..00f538fee7 100644
--- a/Spigot-Server-Patches/0428-Add-effect-to-block-break-naturally.patch
+++ b/Spigot-Server-Patches/0427-Add-effect-to-block-break-naturally.patch
@@ -1,4 +1,4 @@
-From e5a71750091b3cecc98572d14469bf5a9e45b8c4 Mon Sep 17 00:00:00 2001
+From 2492dc8648451a318f00a3d39923648251c56848 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Jan 2020 12:25:07 -0600
 Subject: [PATCH] Add effect to block break naturally
@@ -30,5 +30,5 @@ index a667e58ed..78e84c3d6 100644
          }
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0429-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0428-Tracking-Range-Improvements.patch
similarity index 97%
rename from Spigot-Server-Patches/0429-Tracking-Range-Improvements.patch
rename to Spigot-Server-Patches/0428-Tracking-Range-Improvements.patch
index cba11fa37a..e01a167815 100644
--- a/Spigot-Server-Patches/0429-Tracking-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0428-Tracking-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From f7736da3f129e86ad5703c6e56ea94ed07893f15 Mon Sep 17 00:00:00 2001
+From 991ad54591ca2f33bce79c82194b81f57f16860c Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Sat, 21 Dec 2019 15:22:09 -0500
 Subject: [PATCH] Tracking Range Improvements
@@ -60,5 +60,5 @@ index 6f8e6c1d0..46c33e691 100644
          }
      }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0430-Fix-comparator-behavior-for-EntityPhanton-goal.patch b/Spigot-Server-Patches/0429-Fix-comparator-behavior-for-EntityPhanton-goal.patch
similarity index 92%
rename from Spigot-Server-Patches/0430-Fix-comparator-behavior-for-EntityPhanton-goal.patch
rename to Spigot-Server-Patches/0429-Fix-comparator-behavior-for-EntityPhanton-goal.patch
index 7bc4693437..bebd9722ab 100644
--- a/Spigot-Server-Patches/0430-Fix-comparator-behavior-for-EntityPhanton-goal.patch
+++ b/Spigot-Server-Patches/0429-Fix-comparator-behavior-for-EntityPhanton-goal.patch
@@ -1,4 +1,4 @@
-From 0c3789b1011ec7c2c68bac60ab20db21db5c9782 Mon Sep 17 00:00:00 2001
+From 2d3b7ee6137519c4b4f5d5360ea8d88b021caf1f Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 22 Jan 2020 21:00:21 +0000
 Subject: [PATCH] Fix comparator behavior for EntityPhanton goal
@@ -18,5 +18,5 @@ index 82323bf4a..90eeddb1a 100644
                      Iterator iterator = list.iterator();
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0431-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0430-Fix-items-vanishing-through-end-portal.patch
similarity index 93%
rename from Spigot-Server-Patches/0431-Fix-items-vanishing-through-end-portal.patch
rename to Spigot-Server-Patches/0430-Fix-items-vanishing-through-end-portal.patch
index 2d0e0fb7d9..f72705b115 100644
--- a/Spigot-Server-Patches/0431-Fix-items-vanishing-through-end-portal.patch
+++ b/Spigot-Server-Patches/0430-Fix-items-vanishing-through-end-portal.patch
@@ -1,4 +1,4 @@
-From 2b30fb352322421afc2a38a0db9985631a17d6f4 Mon Sep 17 00:00:00 2001
+From 2c49f9e2d16a6ba0c20a99acf259cb84e575d607 Mon Sep 17 00:00:00 2001
 From: AJMFactsheets <AJMFactsheets@gmail.com>
 Date: Wed, 22 Jan 2020 19:52:28 -0600
 Subject: [PATCH] Fix items vanishing through end portal
@@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 659591e028..6e41a55065 100644
+index 659591e02..6e41a5506 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2599,6 +2599,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -29,5 +29,5 @@ index 659591e028..6e41a55065 100644
                  EntityPortalEvent event = CraftEventFactory.callEntityPortalEvent(this, worldserver1, worldserver1.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, worldserver1.getSpawn()), 0);
                  if (event == null) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0432-Seed-based-feature-search.patch b/Spigot-Server-Patches/0431-Seed-based-feature-search.patch
similarity index 98%
rename from Spigot-Server-Patches/0432-Seed-based-feature-search.patch
rename to Spigot-Server-Patches/0431-Seed-based-feature-search.patch
index f4067667de..a4055a3541 100644
--- a/Spigot-Server-Patches/0432-Seed-based-feature-search.patch
+++ b/Spigot-Server-Patches/0431-Seed-based-feature-search.patch
@@ -1,4 +1,4 @@
-From 21baa0110b562162f91c4a88b11fdd7a487a58df Mon Sep 17 00:00:00 2001
+From 5f1637cf6b34737c5c2b7ffe97811faa2052ddee Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Mon, 13 Jan 2020 15:40:32 +0100
 Subject: [PATCH] Seed based feature search
@@ -109,5 +109,5 @@ index 1cbd50450..803fe43be 100644
      }
  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0433-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0432-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 97%
rename from Spigot-Server-Patches/0433-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to Spigot-Server-Patches/0432-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index b985305e80..83df2dcfee 100644
--- a/Spigot-Server-Patches/0433-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/Spigot-Server-Patches/0432-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
@@ -1,4 +1,4 @@
-From 082e7095b0d8be07d4649ecda8c285eb67edb146 Mon Sep 17 00:00:00 2001
+From 4671fa40c4fdc58f83b1a58b65fdcb18d2b27844 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 26 Jan 2020 16:30:19 -0600
 Subject: [PATCH] Bees get gravity in void. Fixes MC-167279
@@ -54,5 +54,5 @@ index 73e016257..c7d79efdf 100644
          this.a(PathType.WATER, -1.0F);
          this.a(PathType.COCOA, -1.0F);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0433-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 98%
rename from Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to Spigot-Server-Patches/0433-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index dee72e00f2..59576ae1ad 100644
--- a/Spigot-Server-Patches/0434-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/Spigot-Server-Patches/0433-Optimise-getChunkAt-calls-for-loaded-chunks.patch
@@ -1,4 +1,4 @@
-From 4e3ff53ab84fc803bbbaefde075aed4be4ccf209 Mon Sep 17 00:00:00 2001
+From 22176ec2e3131756cb912685f72fc4cd88af8dd2 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 25 Jan 2020 17:04:35 -0800
 Subject: [PATCH] Optimise getChunkAt calls for loaded chunks
@@ -84,5 +84,5 @@ index 803fe43be..601a68ad6 100644
      }
  
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0435-Be-more-tolerant-of-invalid-attributes.patch b/Spigot-Server-Patches/0434-Be-more-tolerant-of-invalid-attributes.patch
similarity index 95%
rename from Spigot-Server-Patches/0435-Be-more-tolerant-of-invalid-attributes.patch
rename to Spigot-Server-Patches/0434-Be-more-tolerant-of-invalid-attributes.patch
index ce01e73a07..b3372f9b83 100644
--- a/Spigot-Server-Patches/0435-Be-more-tolerant-of-invalid-attributes.patch
+++ b/Spigot-Server-Patches/0434-Be-more-tolerant-of-invalid-attributes.patch
@@ -1,4 +1,4 @@
-From a60336b74418974ecc49ff0759161157205ea962 Mon Sep 17 00:00:00 2001
+From d6bf11981f42a9ce30d7ffd037e9ec4468a82524 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Thu, 6 Feb 2020 19:20:27 -0600
 Subject: [PATCH] Be more tolerant of invalid attributes
@@ -28,5 +28,5 @@ index 77e584b12..007d28b16 100644
          String descriptor = CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, split[1]); // movementSpeed -> MOVEMENT_SPEED
          String fin = generic + "_" + descriptor;
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0436-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0435-Allow-overriding-the-java-version-check.patch
similarity index 88%
rename from Spigot-Server-Patches/0436-Allow-overriding-the-java-version-check.patch
rename to Spigot-Server-Patches/0435-Allow-overriding-the-java-version-check.patch
index cafc2e1ba7..988a21ba5a 100644
--- a/Spigot-Server-Patches/0436-Allow-overriding-the-java-version-check.patch
+++ b/Spigot-Server-Patches/0435-Allow-overriding-the-java-version-check.patch
@@ -1,4 +1,4 @@
-From 32dd7a3f9a10d5944835812141c61e6506efd693 Mon Sep 17 00:00:00 2001
+From 617d4ce92856333bf542f50f90bee785f4f9cfa7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Sat, 8 Feb 2020 18:02:24 -0600
 Subject: [PATCH] Allow overriding the java version check
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow overriding the java version check
 -DPaper.IgnoreJavaVersion=true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 444a6a608b..cb60310e63 100644
+index 444a6a608..cb60310e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -175,7 +175,7 @@ public class Main {
@@ -19,5 +19,5 @@ index 444a6a608b..cb60310e63 100644
  
              try {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0437-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0436-Add-ThrownEggHatchEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0437-Add-ThrownEggHatchEvent.patch
rename to Spigot-Server-Patches/0436-Add-ThrownEggHatchEvent.patch
index 146c8d0d7d..64ea7fa70f 100644
--- a/Spigot-Server-Patches/0437-Add-ThrownEggHatchEvent.patch
+++ b/Spigot-Server-Patches/0436-Add-ThrownEggHatchEvent.patch
@@ -1,4 +1,4 @@
-From bd7ca93f5cd8917fc00f2e24885df6ecb672acf5 Mon Sep 17 00:00:00 2001
+From e55f039800a07c855ef0498f4c4a4299279e2e84 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 9 Feb 2020 00:19:05 -0600
 Subject: [PATCH] Add ThrownEggHatchEvent
@@ -28,5 +28,5 @@ index 970f9109d..bdd82d052 100644
                      for (int i = 0; i < b0; ++i) {
                          Entity entity = world.getWorld().createEntity(new org.bukkit.Location(world.getWorld(), this.locX(), this.locY(), this.locZ(), this.yaw, 0.0F), hatchingType.getEntityClass());
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0438-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0437-Optimise-random-block-ticking.patch
similarity index 99%
rename from Spigot-Server-Patches/0438-Optimise-random-block-ticking.patch
rename to Spigot-Server-Patches/0437-Optimise-random-block-ticking.patch
index 84971b99c7..bff2dbd3cd 100644
--- a/Spigot-Server-Patches/0438-Optimise-random-block-ticking.patch
+++ b/Spigot-Server-Patches/0437-Optimise-random-block-ticking.patch
@@ -1,4 +1,4 @@
-From f6c9f7b1ec8b16d0cf55d0356a0ebee43db4a50f Mon Sep 17 00:00:00 2001
+From e2326c6f026f2247ffadd665bf5df039d6213426 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 27 Jan 2020 21:28:00 -0800
 Subject: [PATCH] Optimise random block ticking
@@ -568,5 +568,5 @@ index 0fed33713..c74b85917 100644
  
      protected BlockPosition a(BlockPosition blockposition) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0439-Entity-Jump-API.patch b/Spigot-Server-Patches/0438-Entity-Jump-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0439-Entity-Jump-API.patch
rename to Spigot-Server-Patches/0438-Entity-Jump-API.patch
index b29255eed6..08aadc7972 100644
--- a/Spigot-Server-Patches/0439-Entity-Jump-API.patch
+++ b/Spigot-Server-Patches/0438-Entity-Jump-API.patch
@@ -1,11 +1,11 @@
-From db100098e2af3e75dc11a4202f7f1c6d1313d780 Mon Sep 17 00:00:00 2001
+From b95a66a94ffd1b25986280e041ba725fe962ba54 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Feb 2020 23:26:11 -0600
 Subject: [PATCH] Entity Jump API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1b9551ae09..ad474500e2 100644
+index 1b9551ae0..ad474500e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -91,7 +91,7 @@ public abstract class EntityLiving extends Entity {
@@ -29,7 +29,7 @@ index 1b9551ae09..ad474500e2 100644
          } else {
              this.jumpTicks = 0;
 diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
-index cd41c80f19..f50ed19080 100644
+index cd41c80f1..f50ed1908 100644
 --- a/src/main/java/net/minecraft/server/EntityPanda.java
 +++ b/src/main/java/net/minecraft/server/EntityPanda.java
 @@ -438,7 +438,9 @@ public class EntityPanda extends EntityAnimal {
@@ -43,7 +43,7 @@ index cd41c80f19..f50ed19080 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 6de01e4f0e..8ffa3cb059 100644
+index 6de01e4f0..8ffa3cb05 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -723,5 +723,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -68,5 +68,5 @@ index 6de01e4f0e..8ffa3cb059 100644
      // Paper end
  }
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0440-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0439-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 95%
rename from Spigot-Server-Patches/0440-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to Spigot-Server-Patches/0439-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 36ae37c299..5fd4ef6508 100644
--- a/Spigot-Server-Patches/0440-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/Spigot-Server-Patches/0439-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -1,11 +1,11 @@
-From 70fb304ade7af87eea921577b824bf5b9cb4ccdc Mon Sep 17 00:00:00 2001
+From 4ad34092852803562a53371352be2ac229171f87 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 7 Feb 2020 14:36:56 -0600
 Subject: [PATCH] Add option to nerf pigmen from nether portals
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bce502181f..7d408542e7 100644
+index bce502181..7d408542e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -653,4 +653,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index bce502181f..7d408542e7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
-index 2dc3ab4cfa..09c7c13183 100644
+index 2dc3ab4cf..09c7c1318 100644
 --- a/src/main/java/net/minecraft/server/BlockPortal.java
 +++ b/src/main/java/net/minecraft/server/BlockPortal.java
 @@ -45,6 +45,8 @@ public class BlockPortal extends Block {
@@ -32,7 +32,7 @@ index 2dc3ab4cfa..09c7c13183 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6e41a55065..8974c16bf9 100644
+index 6e41a5506..8974c16bf 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -193,6 +193,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -62,5 +62,5 @@ index 6e41a55065..8974c16bf9 100644
                  String spawnReasonName = nbttagcompound.getString("Paper.SpawnReason");
                  try {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0441-fix-blockstate-capture-undoing.patch b/Spigot-Server-Patches/0440-fix-blockstate-capture-undoing.patch
similarity index 95%
rename from Spigot-Server-Patches/0441-fix-blockstate-capture-undoing.patch
rename to Spigot-Server-Patches/0440-fix-blockstate-capture-undoing.patch
index 84ad0b35bb..d222ffe59b 100644
--- a/Spigot-Server-Patches/0441-fix-blockstate-capture-undoing.patch
+++ b/Spigot-Server-Patches/0440-fix-blockstate-capture-undoing.patch
@@ -1,4 +1,4 @@
-From a9fe517d8e5a270edcdcde47831bd6afac35b995 Mon Sep 17 00:00:00 2001
+From 4a01f268cb89bb4c08bddef7bd8e03edcb987f47 Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Mon, 17 Feb 2020 22:53:33 +0100
 Subject: [PATCH] fix blockstate capture undoing
@@ -28,5 +28,5 @@ index bb34486a3..5117dafbc 100644
                  }
                  // CraftBukkit end
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0442-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0441-Make-the-GUI-graph-fancier.patch
similarity index 99%
rename from Spigot-Server-Patches/0442-Make-the-GUI-graph-fancier.patch
rename to Spigot-Server-Patches/0441-Make-the-GUI-graph-fancier.patch
index 1127a84e25..d64b770b1c 100644
--- a/Spigot-Server-Patches/0442-Make-the-GUI-graph-fancier.patch
+++ b/Spigot-Server-Patches/0441-Make-the-GUI-graph-fancier.patch
@@ -1,4 +1,4 @@
-From 6b75fff901ccd8a8126a98f8a7fc6fd98f57edee Mon Sep 17 00:00:00 2001
+From acb8b4829d3f5080de2aaa913180729945bf140d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 2 Feb 2020 04:00:40 -0600
 Subject: [PATCH] Make the GUI graph fancier
@@ -424,5 +424,5 @@ index 95561d9db..470009fe4 100644
          this.e.add(guistatscomponent::a);
          jpanel.add(guistatscomponent, "North");
 -- 
-2.24.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0443-Backport-fix-for-MC-167561.patch b/Spigot-Server-Patches/0442-Backport-fix-for-MC-167561.patch
similarity index 95%
rename from Spigot-Server-Patches/0443-Backport-fix-for-MC-167561.patch
rename to Spigot-Server-Patches/0442-Backport-fix-for-MC-167561.patch
index dc24fbd529..d55bc0d7b7 100644
--- a/Spigot-Server-Patches/0443-Backport-fix-for-MC-167561.patch
+++ b/Spigot-Server-Patches/0442-Backport-fix-for-MC-167561.patch
@@ -1,11 +1,11 @@
-From 43174d822f93288b9e3a288ccef8b10cc218712b Mon Sep 17 00:00:00 2001
+From f9307d0d85050726940c586c0e2c6a50787ffc21 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 21 Feb 2020 18:44:28 +0000
 Subject: [PATCH] Backport fix for MC-167561
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index db15d5e0a2..eec1e26b6e 100644
+index db15d5e0a..eec1e26b6 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -296,7 +296,14 @@ public class EntityWolf extends EntityTameableAnimal {
@@ -40,5 +40,5 @@ index db15d5e0a2..eec1e26b6e 100644
                  if (!entityhuman.abilities.canInstantlyBuild) {
                      itemstack.subtract(1);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0444-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0443-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0444-add-hand-to-BlockMultiPlaceEvent.patch
rename to Spigot-Server-Patches/0443-add-hand-to-BlockMultiPlaceEvent.patch
index 9961cbc792..a9e507598f 100644
--- a/Spigot-Server-Patches/0444-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/Spigot-Server-Patches/0443-add-hand-to-BlockMultiPlaceEvent.patch
@@ -1,4 +1,4 @@
-From c314f5a599f6d42e936911ab1bd72d0885d056fe Mon Sep 17 00:00:00 2001
+From 883d0f9fd8dd2ef2e16af07723acd3c5b3295419 Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Sun, 1 Mar 2020 22:43:24 +0100
 Subject: [PATCH] add hand to BlockMultiPlaceEvent
@@ -29,5 +29,5 @@ index 39ce40bd5..1f5d15bb4 100644
  
          return event;
 -- 
-2.16.1.windows.4
+2.25.1
 
diff --git a/Spigot-Server-Patches/0445-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0444-Prevent-teleporting-dead-entities.patch
similarity index 92%
rename from Spigot-Server-Patches/0445-Prevent-teleporting-dead-entities.patch
rename to Spigot-Server-Patches/0444-Prevent-teleporting-dead-entities.patch
index 64d5b5685c..de02bfb41c 100644
--- a/Spigot-Server-Patches/0445-Prevent-teleporting-dead-entities.patch
+++ b/Spigot-Server-Patches/0444-Prevent-teleporting-dead-entities.patch
@@ -1,4 +1,4 @@
-From f28f3c02c20302c71004e285dcce8b4fb567c512 Mon Sep 17 00:00:00 2001
+From f0461b91e85db450812eac347d37c71d95d29738 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 3 Mar 2020 05:26:40 +0000
 Subject: [PATCH] Prevent teleporting dead entities
@@ -20,5 +20,5 @@ index 108377d76..7929fcc80 100644
          if (Float.isNaN(f)) {
              f = 0;
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0446-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0445-Validate-tripwire-hook-placement-before-update.patch
similarity index 92%
rename from Spigot-Server-Patches/0446-Validate-tripwire-hook-placement-before-update.patch
rename to Spigot-Server-Patches/0445-Validate-tripwire-hook-placement-before-update.patch
index 40b73d7bec..174d45e20f 100644
--- a/Spigot-Server-Patches/0446-Validate-tripwire-hook-placement-before-update.patch
+++ b/Spigot-Server-Patches/0445-Validate-tripwire-hook-placement-before-update.patch
@@ -1,4 +1,4 @@
-From c1584ce207e7ae55546647f5a4436c475f95c42a Mon Sep 17 00:00:00 2001
+From 9bdb7295ce6b3b2376502e001978df49ac31c7de Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 7 Mar 2020 00:07:51 +0000
 Subject: [PATCH] Validate tripwire hook placement before update
@@ -17,5 +17,5 @@ index 1b9d889af..a5e6e94fe 100644
              if (flag1) {
                  this.a(world, blockposition, enumdirection);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0447-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0446-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 96%
rename from Spigot-Server-Patches/0447-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to Spigot-Server-Patches/0446-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index d6d2c88e59..3950581240 100644
--- a/Spigot-Server-Patches/0447-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/Spigot-Server-Patches/0446-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
@@ -1,4 +1,4 @@
-From 1a07d33dd52337ae02f97e5add9c62150bf32990 Mon Sep 17 00:00:00 2001
+From eb930f97967edb19d0a494c7ed443f7bb76b882e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 13 Apr 2019 16:50:58 -0500
 Subject: [PATCH] Add option to allow iron golems to spawn in air
@@ -34,5 +34,5 @@ index 2f764776b..7f6a56776 100644
          } else {
              for (int i = 1; i < 3; ++i) {
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0448-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0447-Configurable-chance-of-villager-zombie-infection.patch
similarity index 97%
rename from Spigot-Server-Patches/0448-Configurable-chance-of-villager-zombie-infection.patch
rename to Spigot-Server-Patches/0447-Configurable-chance-of-villager-zombie-infection.patch
index 455eae8006..8aab0ac16f 100644
--- a/Spigot-Server-Patches/0448-Configurable-chance-of-villager-zombie-infection.patch
+++ b/Spigot-Server-Patches/0447-Configurable-chance-of-villager-zombie-infection.patch
@@ -1,4 +1,4 @@
-From 42b2190328951c2c8ff40905e30f6d79293a7a14 Mon Sep 17 00:00:00 2001
+From d572eec96c1bbcfd76021524de3524527650cc46 Mon Sep 17 00:00:00 2001
 From: Zero <zero@cock.li>
 Date: Sat, 22 Feb 2020 16:10:31 -0500
 Subject: [PATCH] Configurable chance of villager zombie infection
@@ -44,5 +44,5 @@ index 8635d4f40..07ebc1d81 100644
              EntityVillager entityvillager = (EntityVillager) entityliving;
              EntityZombieVillager entityzombievillager = (EntityZombieVillager) EntityTypes.ZOMBIE_VILLAGER.a(this.world);
 -- 
-2.25.0
+2.25.1
 
diff --git a/Spigot-Server-Patches/0449-Call-BlockRedstoneEvent-for-fence-gates.patch b/Spigot-Server-Patches/0448-Call-BlockRedstoneEvent-for-fence-gates.patch
similarity index 93%
rename from Spigot-Server-Patches/0449-Call-BlockRedstoneEvent-for-fence-gates.patch
rename to Spigot-Server-Patches/0448-Call-BlockRedstoneEvent-for-fence-gates.patch
index 3c44cc641c..1a9e83d680 100644
--- a/Spigot-Server-Patches/0449-Call-BlockRedstoneEvent-for-fence-gates.patch
+++ b/Spigot-Server-Patches/0448-Call-BlockRedstoneEvent-for-fence-gates.patch
@@ -1,11 +1,11 @@
-From 916bcb6ec2a4b12f0e11095eacd09a56aaa0dfe1 Mon Sep 17 00:00:00 2001
+From 67d2b841f8deca1a3a786cdbedc4ba4ffdaee08c Mon Sep 17 00:00:00 2001
 From: Jan Boerman <Janboerman95@gmail.com>
 Date: Sat, 14 Mar 2020 14:17:35 +0100
 Subject: [PATCH] Call BlockRedstoneEvent for fence gates
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFenceGate.java b/src/main/java/net/minecraft/server/BlockFenceGate.java
-index 432e47bb..583eb688 100644
+index 432e47bb9..583eb6883 100644
 --- a/src/main/java/net/minecraft/server/BlockFenceGate.java
 +++ b/src/main/java/net/minecraft/server/BlockFenceGate.java
 @@ -103,6 +103,17 @@ public class BlockFenceGate extends BlockFacingHorizontal {
@@ -27,5 +27,5 @@ index 432e47bb..583eb688 100644
              if ((Boolean) iblockdata.get(BlockFenceGate.POWERED) != flag1) {
                  world.setTypeAndData(blockposition, (IBlockData) ((IBlockData) iblockdata.set(BlockFenceGate.POWERED, flag1)).set(BlockFenceGate.OPEN, flag1), 2);
 -- 
-2.14.1.windows.1
+2.25.1