From bf698865f7ff5a069c284ca650a7e5db80cfc31a Mon Sep 17 00:00:00 2001
From: Ytnoos <aleytnoos12@gmail.com>
Date: Wed, 22 Apr 2020 00:06:30 +0200
Subject: [PATCH] Revert "Re-track players that dismount from other players"

---
 ...etting-for-proxy-online-mode-status.patch} | 10 +--
 ...ers-that-dismount-from-other-players.patch | 36 -----------
 ...timise-BlockState-s-hashCode-equals.patch} | 12 ++--
 ...nfigurable-packet-in-spam-threshold.patch} |  8 +--
 ...4-Configurable-flying-kick-messages.patch} |  8 +--
 ...ch => 0115-Chunk-registration-fixes.patch} |  6 +-
 ...k-reference-on-Craft-Entity-removal.patch} |  6 +-
 ...to-fix-bad-Y-levels-on-player-login.patch} |  6 +-
 ...ion-to-remove-corrupt-tile-entities.patch} |  8 +--
 ...nt.patch => 0119-Add-EntityZapEvent.patch} | 10 +--
 ...-from-ArmorStand-and-SpawnEgg-items.patch} |  8 +--
 ...21-Cache-user-authenticator-threads.patch} |  8 +--
 ....patch => 0122-Optimise-removeQueue.patch} |  6 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |  6 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  8 +--
 ...-Don-t-let-fishinghooks-use-portals.patch} |  8 +--
 ... => 0126-Add-ProjectileCollideEvent.patch} | 14 ++--
 ...ent-Pathfinding-out-of-World-Border.patch} |  6 +-
 ...mize-World.isLoaded-BlockPosition-Z.patch} |  6 +-
 ...Bound-Treasure-Maps-to-World-Border.patch} |  8 +--
 ...igurable-Cartographer-Treasure-Maps.patch} |  8 +--
 ... => 0131-Optimize-ItemStack.isEmpty.patch} |  6 +-
 ...o-control-if-armour-stands-can-move.patch} |  8 +--
 ...3-Properly-fix-item-duplication-bug.patch} | 10 +--
 ...=> 0134-String-based-Action-Bar-API.patch} |  8 +--
 ...-API-s.patch => 0135-Firework-API-s.patch} | 14 ++--
 ... 0136-PlayerTeleportEndGatewayEvent.patch} |  6 +-
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  6 +-
 ...h => 0138-Enforce-Sync-Player-Saves.patch} |  6 +-
 ...low-entities-to-ride-themselves-572.patch} |  6 +-
 ...I-for-Reason-Source-Triggering-play.patch} | 36 +++++------
 ...patch => 0141-Cap-Entity-Collisions.patch} | 10 +--
 ...-CraftScheduler-Async-Task-Debugger.patch} |  6 +-
 ...ore-aggressive-in-the-chunk-unload-.patch} |  6 +-
 ...> 0144-Do-not-let-armorstands-drown.patch} |  8 +--
 ...e-async-calls-to-restart-the-server.patch} | 10 +--
 ...roperty-to-disable-book-size-limits.patch} |  6 +-
 ...e-parrots-stay-on-shoulders-despite.patch} | 10 +--
 ...-option-to-prevent-player-names-fro.patch} |  8 +--
 ...leAppender-for-console-improvements.patch} | 32 +++++-----
 ...rable-option-to-disable-creeper-lin.patch} |  8 +--
 ....patch => 0151-Item-canEntityPickup.patch} | 10 +--
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  6 +-
 ...> 0153-PlayerAttemptPickupItemEvent.patch} |  6 +-
 ...tch => 0154-Add-UnknownCommandEvent.patch} |  6 +-
 ...tch => 0155-Basic-PlayerProfile-API.patch} | 22 +++----
 ... 0156-Shoulder-Entities-Release-API.patch} |  8 +--
 ...patch => 0157-Profile-Lookup-Events.patch} |  6 +-
 ...layer-logins-during-server-shutdown.patch} |  6 +-
 ...patch => 0159-Entity-fromMobSpawner.patch} | 10 +--
 ...0-Improve-the-Saddle-API-for-Horses.patch} | 10 +--
 ...plement-ensureServerConversions-API.patch} |  6 +-
 ...> 0162-Implement-getI18NDisplayName.patch} |  8 +--
 ...=> 0163-ProfileWhitelistVerifyEvent.patch} |  6 +-
 ...ch => 0164-Fix-this-stupid-bullshit.patch} |  6 +-
 ...wns-should-honor-nametags-and-leash.patch} |  6 +-
 ...mer-when-spawner-event-is-cancelled.patch} |  6 +-
 ...7-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |  6 +-
 ...a-custom-authentication-servers-dow.patch} |  8 +--
 ...atch => 0169-LivingEntity-setKiller.patch} |  8 +--
 ...ms-to-redirect-System.out-err-to-lo.patch} |  8 +--
 ...-prefixes-using-Log4J-configuration.patch} | 10 +--
 ...Include-Log4J2-SLF4J-implementation.patch} |  6 +-
 ...efix-for-various-plugins-bypassing-.patch} |  6 +-
 ...t.patch => 0174-Add-PlayerJumpEvent.patch} |  6 +-
 ...-handle-PacketPlayInKeepAlive-async.patch} |  6 +-
 ...t-protocol-version-and-virtual-host.patch} | 14 ++--
 ...t-serverside-behavior-of-keepalives.patch} |  6 +-
 ...Effects-only-to-players-who-can-see.patch} |  8 +--
 ...maximum-exp-value-when-merging-orbs.patch} |  8 +--
 ... => 0180-Add-PlayerArmorChangeEvent.patch} |  8 +--
 ...om-being-processed-when-the-player-.patch} |  6 +-
 ...-implementations-for-captured-block.patch} |  6 +-
 ...get-a-BlockState-without-a-snapshot.patch} | 12 ++--
 ...patch => 0184-AsyncTabCompleteEvent.patch} | 10 +--
 ...85-Avoid-NPE-in-PathfinderGoalTempt.patch} |  6 +-
 ...=> 0186-PlayerPickupExperienceEvent.patch} |  6 +-
 ...tch => 0187-ExperienceOrbMergeEvent.patch} |  6 +-
 ...-Ability-to-apply-mending-to-XP-API.patch} | 10 +--
 ...max-squid-spawn-height-configurable.patch} |  8 +--
 ...patch => 0190-PreCreatureSpawnEvent.patch} |  8 +--
 ...-PlayerNaturallySpawnCreaturesEvent.patch} | 10 +--
 ...Add-setPlayerProfile-API-for-Skulls.patch} |  8 +--
 ...> 0193-Fill-Profile-Property-Events.patch} |  6 +-
 ...layerAdvancementCriterionGrantEvent.patch} |  6 +-
 ...ch => 0195-Add-ArmorStand-Item-Meta.patch} | 10 +--
 ...Extend-Player-Interact-cancellation.patch} |  6 +-
 ... 0197-Tameable-getOwnerUniqueId-API.patch} |  8 +--
 ...-crits-helps-mitigate-hacked-client.patch} |  8 +--
 ...ing-location-from-InventoryEnderChe.patch} |  6 +-
 ...ted-Ice-from-loading-holding-chunks.patch} |  6 +-
 ...e-Explicit-Network-Manager-Flushing.patch} |  6 +-
 ...t-extended-PaperServerListPingEvent.patch} | 18 +++---
 ... 0203-Improved-Async-Task-Scheduler.patch} |  8 +--
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  6 +-
 ...=> 0205-Player.setPlayerProfile-API.patch} | 10 +--
 ...h => 0206-Fix-Dragon-Server-Crashes.patch} |  6 +-
 ...patch => 0207-getPlayerUniqueId-API.patch} |  6 +-
 ...ake-player-data-saving-configurable.patch} |  8 +--
 ...e-legacy-ping-handler-more-reliable.patch} |  6 +-
 ...erverListPingEvent-for-legacy-pings.patch} |  8 +--
 ...1-Flag-to-disable-the-channel-limit.patch} |  6 +-
 ...-method-to-open-already-placed-sign.patch} |  6 +-
 ...rable-sprint-interruption-on-attack.patch} |  8 +--
 ...allowed-colored-signs-to-be-created.patch} |  6 +-
 ...t.patch => 0215-EndermanEscapeEvent.patch} |  6 +-
 ...h => 0216-Enderman.teleportRandomly.patch} |  8 +--
 ...217-Block-Enderpearl-Travel-Exploit.patch} |  8 +--
 ...d.spawnParticle-API-and-add-Builder.patch} |  8 +--
 ...h => 0219-EndermanAttackPlayerEvent.patch} |  6 +-
 ...tch => 0220-WitchConsumePotionEvent.patch} |  6 +-
 ...patch => 0221-WitchThrowPotionEvent.patch} |  6 +-
 ...tem-entities-with-World.spawnEntity.patch} |  6 +-
 ...patch => 0223-WitchReadyPotionEvent.patch} |  6 +-
 ...224-ItemStack-getMaxItemUseDuration.patch} |  8 +--
 ...ement-EntityTeleportEndGatewayEvent.patch} |  6 +-
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  6 +-
 ...ch => 0227-Fix-CraftEntity-hashCode.patch} |  6 +-
 ...e-Alternative-LootPool-Luck-Formula.patch} |  8 +--
 ...ls-when-failing-to-save-player-data.patch} |  6 +-
 ...-shield-blocking-delay-configurable.patch} | 10 +--
 ...nt-consumeArrow-and-getArrowItem-AP.patch} | 12 ++--
 ...patch => 0232-PlayerReadyArrowEvent.patch} |  6 +-
 ...-EntityShootBowEvent-for-Illusioner.patch} |  6 +-
 ...lement-EntityKnockbackByEntityEvent.patch} |  6 +-
 ...patch => 0235-Expand-Explosions-API.patch} |  6 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  8 +--
 ...-API.patch => 0237-RangedEntity-API.patch} | 22 +++----
 ...o-disable-ender-dragon-legacy-check.patch} |  8 +--
 ...-Implement-World.getEntity-UUID-API.patch} |  6 +-
 ...0240-InventoryCloseEvent-Reason-API.patch} | 26 ++++----
 ...0241-Configurable-Bed-Search-Radius.patch} |  8 +--
 ...I.patch => 0242-Vex-getSummoner-API.patch} |  8 +--
 ...ventory-when-cancelling-PlayerInter.patch} |  6 +-
 ...e-the-Entity-Random-seed-for-squids.patch} |  6 +-
 ...illa-entity-warnings-for-duplicates.patch} |  6 +-
 ...-if-stack-size-above-max-stack-size.patch} |  6 +-
 ...47-Use-asynchronous-Log4j-2-loggers.patch} | 10 +--
 ...more-information-to-Entity.toString.patch} |  6 +-
 ...es-option-to-debug-dupe-uuid-issues.patch} | 12 ++--
 ...ts.patch => 0250-EnderDragon-Events.patch} | 10 +--
 ...atch => 0251-PlayerElytraBoostEvent.patch} |  6 +-
 ...Speedup-BlockPos-by-fixing-inlining.patch} |  8 +--
 ...patch => 0253-Optimize-RegistryID.c.patch} |  6 +-
 ...-armor-stands-from-doing-entity-loo.patch} |  8 +--
 ...-Vanished-players-don-t-have-rights.patch} | 20 +++---
 ...anytime-entities-change-to-guarante.patch} |  6 +-
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |  8 +--
 ...atch => 0258-EntityTransformedEvent.patch} | 12 ++--
 ...tch => 0259-SkeletonHorse-Additions.patch} | 10 +--
 ...event-Saving-Bad-entities-to-chunks.patch} |  8 +--
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  8 +--
 ...ad-Entities-in-entityList-iteration.patch} | 14 ++--
 ...3-Implement-Expanded-ArmorStand-API.patch} |  8 +--
 ...vent.patch => 0264-AnvilDamageEvent.patch} |  6 +-
 ...ent.patch => 0265-Add-TNTPrimeEvent.patch} | 10 +--
 ...d-make-tab-spam-limits-configurable.patch} |  8 +--
 ...h => 0267-Add-hand-to-bucket-events.patch} | 10 +--
 ...-Experience-should-save-as-Integers.patch} |  6 +-
 ...ent-rendering-skulls-from-same-user.patch} | 12 ++--
 ...d-Early-Warning-Feature-to-WatchDog.patch} | 14 ++--
 ...0271-Make-EnderDragon-implement-Mob.patch} |  6 +-
 ...2-Use-ConcurrentHashMap-in-JsonList.patch} |  6 +-
 ...3-Use-a-Queue-for-Queueing-Commands.patch} |  6 +-
 ...le-Entities-from-a-chunk-without-sn.patch} |  6 +-
 ...llow-disabling-armour-stand-ticking.patch} | 12 ++--
 ...timize-BlockPosition-helper-methods.patch} |  6 +-
 ...ts-from-world-player-list-not-serve.patch} | 10 +--
 ...tore-vanlla-default-mob-spawn-range.patch} |  6 +-
 ...79-Optimize-CraftBlockData-Creation.patch} |  8 +--
 ...-124320.patch => 0280-Fix-MC-124320.patch} |  8 +--
 ...tch => 0281-Slime-Pathfinder-Events.patch} |  8 +--
 ...e-speed-for-water-flowing-over-lava.patch} |  8 +--
 ... => 0283-Optimize-RegistryMaterials.patch} |  6 +-
 ...ch => 0284-Add-PhantomPreSpawnEvent.patch} | 10 +--
 ....patch => 0285-Add-More-Creeper-API.patch} |  8 +--
 ...=> 0286-Inventory-removeItemAnySlot.patch} |  6 +-
 ...oadChunk-int-int-false-load-unconve.patch} |  6 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |  8 +--
 ...-attack-cooldown-methods-for-Player.patch} |  8 +--
 ....patch => 0290-Improve-death-events.patch} | 24 +++----
 ...w-chests-to-be-placed-with-NBT-data.patch} |  8 +--
 ...I.patch => 0292-Mob-Pathfinding-API.patch} | 14 ++--
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |  6 +-
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |  8 +--
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |  8 +--
 ...ning-from-loading-generating-chunks.patch} |  6 +-
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  6 +-
 ...t-furnace-cook-speed-multiplier-API.patch} |  8 +--
 ...0299-Support-Overriding-World-Seeds.patch} | 12 ++--
 ...h => 0300-Optimize-Server-World-Map.patch} |  8 +--
 ....patch => 0301-PreSpawnerSpawnEvent.patch} |  6 +-
 ...rseException-in-Entity-and-TE-names.patch} | 14 ++--
 ... 0303-Avoid-dimension-id-collisions.patch} |  6 +-
 ...=> 0304-Honor-EntityAgeable.ageLock.patch} |  6 +-
 ...le-connection-throttle-kick-message.patch} |  8 +--
 ...> 0306-Hook-into-CB-plugin-rewrites.patch} |  6 +-
 ...07-Allow-setting-the-vex-s-summoner.patch} |  8 +--
 ...I.patch => 0308-Add-sun-related-API.patch} | 10 +--
 ...wned-for-Villager-Aggression-Config.patch} |  6 +-
 ...-Johnny.patch => 0310-Here-s-Johnny.patch} |  8 +--
 ...Turtle-API.patch => 0311-Turtle-API.patch} |  8 +--
 ...it-lightning-strike-effect-distance.patch} | 10 +--
 ...her-worlds-for-shooter-of-projectil.patch} |  6 +-
 ...Call-player-spectator-target-events.patch} | 10 +--
 ...-Add-Velocity-IP-Forwarding-Support.patch} | 20 +++---
 ...PI.patch => 0316-Add-more-Witch-API.patch} |  8 +--
 ...MC-93764.patch => 0317-Fix-MC-93764.patch} |  6 +-
 ...vent-players-from-moving-into-unloa.patch} |  8 +--
 ...9-Reset-players-airTicks-on-respawn.patch} | 10 +--
 ...after-profile-lookups-if-not-needed.patch} |  6 +-
 ...le-thread-count-default-for-bootstr.patch} |  6 +-
 ...=> 0322-Optimize-World-Time-Updates.patch} |  6 +-
 ...tore-custom-InventoryHolder-support.patch} |  6 +-
 ...=> 0324-Use-Vanilla-Minecart-Speeds.patch} |  6 +-
 ...0325-Fix-SpongeAbsortEvent-handling.patch} |  8 +--
 ...-allow-digging-into-unloaded-chunks.patch} |  8 +--
 ...=> 0327-Optimize-redstone-algorithm.patch} | 12 ++--
 ...ntity-dismount-during-teleportation.patch} | 12 ++--
 ...mits.patch => 0329-Book-Size-Limits.patch} |  8 +--
 ...ult-permission-message-configurable.patch} |  8 +--
 ...I.patch => 0331-Add-more-Zombie-API.patch} | 10 +--
 ...revent-rayTrace-from-loading-chunks.patch} |  6 +-
 ...-Large-Packets-disconnecting-client.patch} | 14 ++--
 ...world-storage-in-CraftOfflinePlayer.patch} |  6 +-
 ...0335-Add-PlayerConnectionCloseEvent.patch} |  8 +--
 ...revent-Enderman-from-loading-chunks.patch} |  6 +-
 ...replace-OfflinePlayer-getLastPlayed.patch} | 12 ++--
 ...tch => 0338-Fix-PlayerEditBookEvent.patch} |  6 +-
 ...ehicle-tracking-issue-on-disconnect.patch} |  8 +--
 ...nRetractEvent-for-all-empty-pistons.patch} |  6 +-
 ...remove-from-being-called-on-Players.patch} |  6 +-
 ...ent.patch => 0342-BlockDestroyEvent.patch} |  6 +-
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |  6 +-
 ...h => 0344-Fix-sign-edit-memory-leak.patch} |  8 +--
 ... 0345-Limit-Client-Sign-length-more.patch} |  6 +-
 ...onvertSigns-boolean-every-sign-save.patch} |  6 +-
 ...Signs-in-Chunks-creating-too-large-.patch} | 10 +--
 ...-Fix-Whitelist-On-Off-inconsistency.patch} |  8 +--
 ...t-tick-at-start-of-drowning-process.patch} |  6 +-
 ...50-Allow-Saving-of-Oversized-Chunks.patch} | 10 +--
 ...ggleEvent-when-whitelist-is-toggled.patch} |  6 +-
 ...52-Add-LivingEntity-getTargetEntity.patch} | 14 ++--
 ...ngth-when-serialising-BungeeCord-te.patch} |  6 +-
 ...=> 0354-Entity-getEntitySpawnReason.patch} | 12 ++--
 ...ty-Metadata-for-all-tracked-players.patch} |  8 +--
 ...tch => 0356-Fire-event-on-GS4-query.patch} | 10 +--
 ...57-Implement-PlayerPostRespawnEvent.patch} |  6 +-
 ...for-pickupDelay-breaks-picking-up-i.patch} |  6 +-
 ...-and-setters-for-EntityItem-owner-a.patch} |  6 +-
 ...ts.patch => 0360-Server-Tick-Events.patch} |  6 +-
 ...361-PlayerDeathEvent-getItemsToKeep.patch} |  6 +-
 ...Optimize-Captured-TileEntity-Lookup.patch} |  6 +-
 ...API.patch => 0363-Add-Heightmap-API.patch} |  8 +--
 ...> 0364-Mob-Spawner-API-Enhancements.patch} |  8 +--
 ...ayer-View-Distance-API-placeholders.patch} | 10 +--
 ...-to-changed-postToMainThread-method.patch} |  6 +-
 ...-item-frames-are-modified-MC-123450.patch} |  8 +--
 ...sPrimaryThread-and-MinecraftServer-.patch} |  8 +--
 ...-entity-loss-due-to-unloaded-chunks.patch} |  6 +-
 ... 0370-Duplicate-UUID-Resolve-Option.patch} | 14 ++--
 ...71-improve-CraftWorld-isChunkLoaded.patch} |  6 +-
 ...e-Keep-Spawn-Loaded-range-per-world.patch} | 16 ++---
 ...-some-generation-concurrency-issues.patch} | 10 +--
 ...ityAreaEffectCloud-from-going-negat.patch} |  6 +-
 ....patch => 0375-ChunkMapDistance-CME.patch} |  6 +-
 ...0376-Implement-CraftBlockSoundGroup.patch} | 12 ++--
 ...d.patch => 0377-Chunk-debug-command.patch} | 16 ++---
 ...ch => 0378-incremental-chunk-saving.patch} | 18 +++---
 ...ptions-from-dispenser-entity-spawns.patch} |  6 +-
 ...80-Fix-World-isChunkGenerated-calls.patch} | 22 +++----
 ...te-location-if-we-failed-to-read-it.patch} |  6 +-
 ...ad-in-DataPaletteBlock-lock-failure.patch} |  8 +--
 ...tatus-cache-when-saving-protochunks.patch} |  6 +-
 ...5-Anti-Xray.patch => 0384-Anti-Xray.patch} | 44 ++++++-------
 ...l-Spawned-mobs-towards-natural-spaw.patch} |  8 +--
 ...urable-projectile-relative-velocity.patch} | 10 +--
 ...being-ticked-when-notifying-navigat.patch} |  6 +-
 ...h => 0388-offset-item-frame-ticking.patch} |  6 +-
 ...pper-searches-if-there-are-no-items.patch} |  8 +--
 ...0-Asynchronous-chunk-IO-and-loading.patch} | 64 +++++++++----------
 ...tChunkIfLoadedImmediately-in-places.patch} | 10 +--
 ...ads.patch => 0392-Reduce-sync-loads.patch} | 14 ++--
 ...ement-alternative-item-despawn-rate.patch} |  8 +--
 ...f-we-have-a-custom-Bukkit-generator.patch} |  6 +-
 ...-158900.patch => 0395-Fix-MC-158900.patch} |  6 +-
 ...ment-optional-per-player-mob-spawns.patch} | 26 ++++----
 ...event-consuming-the-wrong-itemstack.patch} |  6 +-
 ...ssanger-entities-once-from-spawners.patch} |  6 +-
 ... => 0399-Fix-nether-portal-creation.patch} |  6 +-
 ...gs.patch => 0400-Generator-Settings.patch} |  8 +--
 ...o-tick-instant-grow-farms-MC-113809.patch} | 18 +++---
 ...-161754.patch => 0402-Fix-MC-161754.patch} |  6 +-
 ...e-improvement-for-Chunk.getEntities.patch} |  6 +-
 ...anging-entities-that-are-not-ItemFr.patch} |  6 +-
 ...05-Expose-the-internal-current-tick.patch} |  6 +-
 ...sneak-when-changing-worlds-MC-10657.patch} |  8 +--
 ...-option-to-disable-pillager-patrols.patch} |  8 +--
 ...r-when-player-hand-set-to-empty-typ.patch} |  8 +--
 ...=> 0409-PlayerLaunchProjectileEvent.patch} | 20 +++---
 ...tMagicNumbers.isSupportedApiVersion.patch} |  6 +-
 ...k-loads-when-villagers-try-to-find-.patch} |  6 +-
 ...Fix-spawn-radius-being-treated-as-0.patch} |  6 +-
 ...656-Fix-Follow-Range-Initial-Target.patch} | 10 +--
 ...pers.patch => 0414-Optimize-Hoppers.patch} | 14 ++--
 ...ayerDeathEvent-shouldDropExperience.patch} |  6 +-
 ...ading-chunks-checking-hive-position.patch} |  6 +-
 ...hunks-from-Hoppers-and-other-things.patch} |  6 +-
 ...ializing-mismatching-chunk-coordina.patch} |  8 +--
 ...imise-IEntityAccess-getPlayerByUUID.patch} |  8 +--
 ...420-Fix-items-not-falling-correctly.patch} |  6 +-
 ...patch => 0421-Lag-compensate-eating.patch} |  6 +-
 ...ize-call-to-getFluid-for-explosions.patch} |  6 +-
 ...-in-stack-not-having-effects-when-d.patch} |  6 +-
 ... 0424-Activation-Range-Improvements.patch} |  4 +-
 ...Add-effect-to-block-break-naturally.patch} |  6 +-
 ...=> 0426-Tracking-Range-Improvements.patch} |  6 +-
 ...tor-behavior-for-EntityPhanton-goal.patch} |  6 +-
 ...-items-vanishing-through-end-portal.patch} |  4 +-
 ...h => 0429-Seed-based-feature-search.patch} | 14 ++--
 ...et-gravity-in-void.-Fixes-MC-167279.patch} | 10 +--
 ...-getChunkAt-calls-for-loaded-chunks.patch} |  8 +--
 ...more-tolerant-of-invalid-attributes.patch} |  6 +-
 ...w-overriding-the-java-version-check.patch} |  6 +-
 ...tch => 0434-Add-ThrownEggHatchEvent.patch} |  6 +-
 ... 0435-Optimise-random-block-ticking.patch} | 28 ++++----
 ...p-API.patch => 0436-Entity-Jump-API.patch} | 10 +--
 ...-to-nerf-pigmen-from-nether-portals.patch} |  4 +-
 ... => 0438-Make-the-GUI-graph-fancier.patch} | 20 +++---
 ... => 0439-Backport-fix-for-MC-167561.patch} |  6 +-
 ...40-add-hand-to-BlockMultiPlaceEvent.patch} |  6 +-
 ...1-Prevent-teleporting-dead-entities.patch} |  6 +-
 ...ipwire-hook-placement-before-update.patch} |  6 +-
 ...o-allow-iron-golems-to-spawn-in-air.patch} |  8 +--
 ...chance-of-villager-zombie-infection.patch} |  8 +--
 ...tch => 0445-Optimise-Chunk-getFluid.patch} |  8 +--
 ...mise-TickListServer-by-rewriting-it.patch} | 24 +++----
 ...duce-entity-tracker-updates-on-move.patch} | 10 +--
 ...pawn-settings-and-per-player-option.patch} | 12 ++--
 ...e-Entity-is-never-double-registered.patch} |  8 +--
 ...ring-entities-from-unloading-chunks.patch} |  6 +-
 ...nections-shouldn-t-hold-up-shutdown.patch} |  6 +-
 ...ow-bees-to-load-chunks-for-beehives.patch} |  6 +-
 ...PlayerChunkMap-adds-crashing-server.patch} |  8 +--
 ...n-Chunk-lookup-and-avoid-loading-fa.patch} |  6 +-
 ...tch => 0455-Don-t-tick-dead-players.patch} |  6 +-
 ...-Player-s-shouldn-t-be-able-to-move.patch} |  6 +-
 ...unkMap-memory-use-for-visibleChunks.patch} | 14 ++--
 ...s-when-attempting-to-unload-a-chunk.patch} |  6 +-
 ...h => 0459-Increase-Light-Queue-Size.patch} |  8 +--
 ...ssing-of-chunk-loads-and-generation.patch} | 14 ++--
 ...ove-existing-players-to-world-spawn.patch} |  8 +--
 ...Add-tick-times-API-and-mspt-command.patch} | 12 ++--
 ...63-Expose-MinecraftServer-isRunning.patch} |  6 +-
 ...riority-Urgency-System-for-World-Ge.patch} | 10 +--
 ...5-Remove-streams-from-Mob-AI-System.patch} | 10 +--
 ...ons-until-after-entity-ticking-is-d.patch} |  8 +--
 ... => 0467-Async-command-map-building.patch} |  6 +-
 ...rash-support-and-Improve-Async-Shut.patch} | 24 +++----
 ....patch => 0469-Optimize-Pathfinding.patch} |  6 +-
 ...Villager-AI-optimizations-DROP-1.16.patch} |  6 +-
 ...1-Reduce-Either-Optional-allocation.patch} |  6 +-
 ...472-Remove-streams-from-PairedQueue.patch} |  6 +-
 ...73-Remove-streams-from-MinecraftKey.patch} |  6 +-
 ...-memory-footprint-of-NBTTagCompound.patch} |  6 +-
 ...ent-opening-inventories-when-frozen.patch} | 10 +--
 ...76-Optimise-ArraySetSorted-removeIf.patch} |  6 +-
 ...entity-collision-code-if-not-needed.patch} |  6 +-
 ...mise-entity-hard-collision-checking.patch} | 14 ++--
 ...viderServer-s-chunk-level-checking-.patch} |  6 +-
 ...teleport-command-to-valid-locations.patch} |  6 +-
 ...Implement-Player-Client-Options-API.patch} | 16 ++---
 ...Chunk-Post-Processing-deadlock-risk.patch} |  8 +--
 ...ayer-is-attempted-to-be-removed-fro.patch} |  6 +-
 ...4-Broadcast-join-message-to-console.patch} |  6 +-
 ...-Broken-behavior-of-PlayerJoinEvent.patch} | 10 +--
 ...oad-Chunks-for-Login-Asynchronously.patch} |  2 +-
 ...awn-point-if-spawn-in-unloaded-worl.patch} |  6 +-
 ...488-Allow-sleeping-players-to-float.patch} |  2 +-
 ...layerAttackEntityCooldownResetEvent.patch} |  6 +-
 ...llbacks-to-schedule-for-Callback-Ex.patch} |  6 +-
 381 files changed, 1645 insertions(+), 1681 deletions(-)
 rename Spigot-Server-Patches/{0112-Add-setting-for-proxy-online-mode-status.patch => 0111-Add-setting-for-proxy-online-mode-status.patch} (94%)
 delete mode 100644 Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch
 rename Spigot-Server-Patches/{0113-Optimise-BlockState-s-hashCode-equals.patch => 0112-Optimise-BlockState-s-hashCode-equals.patch} (94%)
 rename Spigot-Server-Patches/{0114-Configurable-packet-in-spam-threshold.patch => 0113-Configurable-packet-in-spam-threshold.patch} (93%)
 rename Spigot-Server-Patches/{0115-Configurable-flying-kick-messages.patch => 0114-Configurable-flying-kick-messages.patch} (94%)
 rename Spigot-Server-Patches/{0116-Chunk-registration-fixes.patch => 0115-Chunk-registration-fixes.patch} (90%)
 rename Spigot-Server-Patches/{0117-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (88%)
 rename Spigot-Server-Patches/{0118-Auto-fix-bad-Y-levels-on-player-login.patch => 0117-Auto-fix-bad-Y-levels-on-player-login.patch} (89%)
 rename Spigot-Server-Patches/{0119-Option-to-remove-corrupt-tile-entities.patch => 0118-Option-to-remove-corrupt-tile-entities.patch} (91%)
 rename Spigot-Server-Patches/{0120-Add-EntityZapEvent.patch => 0119-Add-EntityZapEvent.patch} (94%)
 rename Spigot-Server-Patches/{0121-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (94%)
 rename Spigot-Server-Patches/{0122-Cache-user-authenticator-threads.patch => 0121-Cache-user-authenticator-threads.patch} (94%)
 rename Spigot-Server-Patches/{0123-Optimise-removeQueue.patch => 0122-Optimise-removeQueue.patch} (96%)
 rename Spigot-Server-Patches/{0124-Allow-Reloading-of-Command-Aliases.patch => 0123-Allow-Reloading-of-Command-Aliases.patch} (92%)
 rename Spigot-Server-Patches/{0125-Add-source-to-PlayerExpChangeEvent.patch => 0124-Add-source-to-PlayerExpChangeEvent.patch} (94%)
 rename Spigot-Server-Patches/{0126-Don-t-let-fishinghooks-use-portals.patch => 0125-Don-t-let-fishinghooks-use-portals.patch} (90%)
 rename Spigot-Server-Patches/{0127-Add-ProjectileCollideEvent.patch => 0126-Add-ProjectileCollideEvent.patch} (96%)
 rename Spigot-Server-Patches/{0128-Prevent-Pathfinding-out-of-World-Border.patch => 0127-Prevent-Pathfinding-out-of-World-Border.patch} (91%)
 rename Spigot-Server-Patches/{0129-Optimize-World.isLoaded-BlockPosition-Z.patch => 0128-Optimize-World.isLoaded-BlockPosition-Z.patch} (89%)
 rename Spigot-Server-Patches/{0130-Bound-Treasure-Maps-to-World-Border.patch => 0129-Bound-Treasure-Maps-to-World-Border.patch} (94%)
 rename Spigot-Server-Patches/{0131-Configurable-Cartographer-Treasure-Maps.patch => 0130-Configurable-Cartographer-Treasure-Maps.patch} (93%)
 rename Spigot-Server-Patches/{0132-Optimize-ItemStack.isEmpty.patch => 0131-Optimize-ItemStack.isEmpty.patch} (87%)
 rename Spigot-Server-Patches/{0133-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0132-Add-API-methods-to-control-if-armour-stands-can-move.patch} (92%)
 rename Spigot-Server-Patches/{0134-Properly-fix-item-duplication-bug.patch => 0133-Properly-fix-item-duplication-bug.patch} (86%)
 rename Spigot-Server-Patches/{0135-String-based-Action-Bar-API.patch => 0134-String-based-Action-Bar-API.patch} (94%)
 rename Spigot-Server-Patches/{0136-Firework-API-s.patch => 0135-Firework-API-s.patch} (96%)
 rename Spigot-Server-Patches/{0137-PlayerTeleportEndGatewayEvent.patch => 0136-PlayerTeleportEndGatewayEvent.patch} (92%)
 rename Spigot-Server-Patches/{0138-Provide-E-TE-Chunk-count-stat-methods.patch => 0137-Provide-E-TE-Chunk-count-stat-methods.patch} (95%)
 rename Spigot-Server-Patches/{0139-Enforce-Sync-Player-Saves.patch => 0138-Enforce-Sync-Player-Saves.patch} (89%)
 rename Spigot-Server-Patches/{0140-Don-t-allow-entities-to-ride-themselves-572.patch => 0139-Don-t-allow-entities-to-ride-themselves-572.patch} (88%)
 rename Spigot-Server-Patches/{0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (96%)
 rename Spigot-Server-Patches/{0142-Cap-Entity-Collisions.patch => 0141-Cap-Entity-Collisions.patch} (93%)
 rename Spigot-Server-Patches/{0143-Remove-CraftScheduler-Async-Task-Debugger.patch => 0142-Remove-CraftScheduler-Async-Task-Debugger.patch} (95%)
 rename Spigot-Server-Patches/{0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (95%)
 rename Spigot-Server-Patches/{0145-Do-not-let-armorstands-drown.patch => 0144-Do-not-let-armorstands-drown.patch} (92%)
 rename Spigot-Server-Patches/{0146-Properly-handle-async-calls-to-restart-the-server.patch => 0145-Properly-handle-async-calls-to-restart-the-server.patch} (98%)
 rename Spigot-Server-Patches/{0147-Add-system-property-to-disable-book-size-limits.patch => 0146-Add-system-property-to-disable-book-size-limits.patch} (96%)
 rename Spigot-Server-Patches/{0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (94%)
 rename Spigot-Server-Patches/{0149-Add-configuration-option-to-prevent-player-names-fro.patch => 0148-Add-configuration-option-to-prevent-player-names-fro.patch} (91%)
 rename Spigot-Server-Patches/{0150-Use-TerminalConsoleAppender-for-console-improvements.patch => 0149-Use-TerminalConsoleAppender-for-console-improvements.patch} (98%)
 rename Spigot-Server-Patches/{0151-provide-a-configurable-option-to-disable-creeper-lin.patch => 0150-provide-a-configurable-option-to-disable-creeper-lin.patch} (92%)
 rename Spigot-Server-Patches/{0152-Item-canEntityPickup.patch => 0151-Item-canEntityPickup.patch} (92%)
 rename Spigot-Server-Patches/{0153-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0152-PlayerPickupItemEvent-setFlyAtPlayer.patch} (95%)
 rename Spigot-Server-Patches/{0154-PlayerAttemptPickupItemEvent.patch => 0153-PlayerAttemptPickupItemEvent.patch} (93%)
 rename Spigot-Server-Patches/{0155-Add-UnknownCommandEvent.patch => 0154-Add-UnknownCommandEvent.patch} (94%)
 rename Spigot-Server-Patches/{0156-Basic-PlayerProfile-API.patch => 0155-Basic-PlayerProfile-API.patch} (98%)
 rename Spigot-Server-Patches/{0157-Shoulder-Entities-Release-API.patch => 0156-Shoulder-Entities-Release-API.patch} (96%)
 rename Spigot-Server-Patches/{0158-Profile-Lookup-Events.patch => 0157-Profile-Lookup-Events.patch} (96%)
 rename Spigot-Server-Patches/{0159-Block-player-logins-during-server-shutdown.patch => 0158-Block-player-logins-during-server-shutdown.patch} (89%)
 rename Spigot-Server-Patches/{0160-Entity-fromMobSpawner.patch => 0159-Entity-fromMobSpawner.patch} (94%)
 rename Spigot-Server-Patches/{0161-Improve-the-Saddle-API-for-Horses.patch => 0160-Improve-the-Saddle-API-for-Horses.patch} (94%)
 rename Spigot-Server-Patches/{0162-Implement-ensureServerConversions-API.patch => 0161-Implement-ensureServerConversions-API.patch} (90%)
 rename Spigot-Server-Patches/{0163-Implement-getI18NDisplayName.patch => 0162-Implement-getI18NDisplayName.patch} (93%)
 rename Spigot-Server-Patches/{0164-ProfileWhitelistVerifyEvent.patch => 0163-ProfileWhitelistVerifyEvent.patch} (96%)
 rename Spigot-Server-Patches/{0165-Fix-this-stupid-bullshit.patch => 0164-Fix-this-stupid-bullshit.patch} (93%)
 rename Spigot-Server-Patches/{0166-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0165-Ocelot-despawns-should-honor-nametags-and-leash.patch} (87%)
 rename Spigot-Server-Patches/{0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (91%)
 rename Spigot-Server-Patches/{0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (91%)
 rename Spigot-Server-Patches/{0169-Allow-specifying-a-custom-authentication-servers-dow.patch => 0168-Allow-specifying-a-custom-authentication-servers-dow.patch} (94%)
 rename Spigot-Server-Patches/{0170-LivingEntity-setKiller.patch => 0169-LivingEntity-setKiller.patch} (92%)
 rename Spigot-Server-Patches/{0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (93%)
 rename Spigot-Server-Patches/{0172-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0171-Handle-plugin-prefixes-using-Log4J-configuration.patch} (95%)
 rename Spigot-Server-Patches/{0173-Include-Log4J2-SLF4J-implementation.patch => 0172-Include-Log4J2-SLF4J-implementation.patch} (85%)
 rename Spigot-Server-Patches/{0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch => 0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch} (94%)
 rename Spigot-Server-Patches/{0175-Add-PlayerJumpEvent.patch => 0174-Add-PlayerJumpEvent.patch} (96%)
 rename Spigot-Server-Patches/{0176-handle-PacketPlayInKeepAlive-async.patch => 0175-handle-PacketPlayInKeepAlive-async.patch} (94%)
 rename Spigot-Server-Patches/{0177-Expose-client-protocol-version-and-virtual-host.patch => 0176-Expose-client-protocol-version-and-virtual-host.patch} (95%)
 rename Spigot-Server-Patches/{0178-revert-serverside-behavior-of-keepalives.patch => 0177-revert-serverside-behavior-of-keepalives.patch} (97%)
 rename Spigot-Server-Patches/{0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (97%)
 rename Spigot-Server-Patches/{0180-Option-for-maximum-exp-value-when-merging-orbs.patch => 0179-Option-for-maximum-exp-value-when-merging-orbs.patch} (95%)
 rename Spigot-Server-Patches/{0181-Add-PlayerArmorChangeEvent.patch => 0180-Add-PlayerArmorChangeEvent.patch} (93%)
 rename Spigot-Server-Patches/{0182-Prevent-logins-from-being-processed-when-the-player-.patch => 0181-Prevent-logins-from-being-processed-when-the-player-.patch} (89%)
 rename Spigot-Server-Patches/{0183-use-CB-BlockState-implementations-for-captured-block.patch => 0182-use-CB-BlockState-implementations-for-captured-block.patch} (96%)
 rename Spigot-Server-Patches/{0184-API-to-get-a-BlockState-without-a-snapshot.patch => 0183-API-to-get-a-BlockState-without-a-snapshot.patch} (96%)
 rename Spigot-Server-Patches/{0185-AsyncTabCompleteEvent.patch => 0184-AsyncTabCompleteEvent.patch} (97%)
 rename Spigot-Server-Patches/{0186-Avoid-NPE-in-PathfinderGoalTempt.patch => 0185-Avoid-NPE-in-PathfinderGoalTempt.patch} (87%)
 rename Spigot-Server-Patches/{0187-PlayerPickupExperienceEvent.patch => 0186-PlayerPickupExperienceEvent.patch} (91%)
 rename Spigot-Server-Patches/{0188-ExperienceOrbMergeEvent.patch => 0187-ExperienceOrbMergeEvent.patch} (93%)
 rename Spigot-Server-Patches/{0189-Ability-to-apply-mending-to-XP-API.patch => 0188-Ability-to-apply-mending-to-XP-API.patch} (95%)
 rename Spigot-Server-Patches/{0190-Make-max-squid-spawn-height-configurable.patch => 0189-Make-max-squid-spawn-height-configurable.patch} (93%)
 rename Spigot-Server-Patches/{0191-PreCreatureSpawnEvent.patch => 0190-PreCreatureSpawnEvent.patch} (97%)
 rename Spigot-Server-Patches/{0192-PlayerNaturallySpawnCreaturesEvent.patch => 0191-PlayerNaturallySpawnCreaturesEvent.patch} (96%)
 rename Spigot-Server-Patches/{0193-Add-setPlayerProfile-API-for-Skulls.patch => 0192-Add-setPlayerProfile-API-for-Skulls.patch} (96%)
 rename Spigot-Server-Patches/{0194-Fill-Profile-Property-Events.patch => 0193-Fill-Profile-Property-Events.patch} (94%)
 rename Spigot-Server-Patches/{0195-PlayerAdvancementCriterionGrantEvent.patch => 0194-PlayerAdvancementCriterionGrantEvent.patch} (89%)
 rename Spigot-Server-Patches/{0196-Add-ArmorStand-Item-Meta.patch => 0195-Add-ArmorStand-Item-Meta.patch} (98%)
 rename Spigot-Server-Patches/{0197-Extend-Player-Interact-cancellation.patch => 0196-Extend-Player-Interact-cancellation.patch} (97%)
 rename Spigot-Server-Patches/{0198-Tameable-getOwnerUniqueId-API.patch => 0197-Tameable-getOwnerUniqueId-API.patch} (90%)
 rename Spigot-Server-Patches/{0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (92%)
 rename Spigot-Server-Patches/{0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch => 0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch} (91%)
 rename Spigot-Server-Patches/{0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (94%)
 rename Spigot-Server-Patches/{0202-Disable-Explicit-Network-Manager-Flushing.patch => 0201-Disable-Explicit-Network-Manager-Flushing.patch} (93%)
 rename Spigot-Server-Patches/{0203-Implement-extended-PaperServerListPingEvent.patch => 0202-Implement-extended-PaperServerListPingEvent.patch} (97%)
 rename Spigot-Server-Patches/{0204-Improved-Async-Task-Scheduler.patch => 0203-Improved-Async-Task-Scheduler.patch} (99%)
 rename Spigot-Server-Patches/{0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (95%)
 rename Spigot-Server-Patches/{0206-Player.setPlayerProfile-API.patch => 0205-Player.setPlayerProfile-API.patch} (97%)
 rename Spigot-Server-Patches/{0207-Fix-Dragon-Server-Crashes.patch => 0206-Fix-Dragon-Server-Crashes.patch} (90%)
 rename Spigot-Server-Patches/{0208-getPlayerUniqueId-API.patch => 0207-getPlayerUniqueId-API.patch} (93%)
 rename Spigot-Server-Patches/{0209-Make-player-data-saving-configurable.patch => 0208-Make-player-data-saving-configurable.patch} (92%)
 rename Spigot-Server-Patches/{0210-Make-legacy-ping-handler-more-reliable.patch => 0209-Make-legacy-ping-handler-more-reliable.patch} (98%)
 rename Spigot-Server-Patches/{0211-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0210-Call-PaperServerListPingEvent-for-legacy-pings.patch} (98%)
 rename Spigot-Server-Patches/{0212-Flag-to-disable-the-channel-limit.patch => 0211-Flag-to-disable-the-channel-limit.patch} (94%)
 rename Spigot-Server-Patches/{0213-Add-method-to-open-already-placed-sign.patch => 0212-Add-method-to-open-already-placed-sign.patch} (91%)
 rename Spigot-Server-Patches/{0214-Configurable-sprint-interruption-on-attack.patch => 0213-Configurable-sprint-interruption-on-attack.patch} (92%)
 rename Spigot-Server-Patches/{0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (90%)
 rename Spigot-Server-Patches/{0216-EndermanEscapeEvent.patch => 0215-EndermanEscapeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0217-Enderman.teleportRandomly.patch => 0216-Enderman.teleportRandomly.patch} (90%)
 rename Spigot-Server-Patches/{0218-Block-Enderpearl-Travel-Exploit.patch => 0217-Block-Enderpearl-Travel-Exploit.patch} (93%)
 rename Spigot-Server-Patches/{0219-Expand-World.spawnParticle-API-and-add-Builder.patch => 0218-Expand-World.spawnParticle-API-and-add-Builder.patch} (96%)
 rename Spigot-Server-Patches/{0220-EndermanAttackPlayerEvent.patch => 0219-EndermanAttackPlayerEvent.patch} (92%)
 rename Spigot-Server-Patches/{0221-WitchConsumePotionEvent.patch => 0220-WitchConsumePotionEvent.patch} (92%)
 rename Spigot-Server-Patches/{0222-WitchThrowPotionEvent.patch => 0221-WitchThrowPotionEvent.patch} (93%)
 rename Spigot-Server-Patches/{0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (91%)
 rename Spigot-Server-Patches/{0224-WitchReadyPotionEvent.patch => 0223-WitchReadyPotionEvent.patch} (92%)
 rename Spigot-Server-Patches/{0225-ItemStack-getMaxItemUseDuration.patch => 0224-ItemStack-getMaxItemUseDuration.patch} (91%)
 rename Spigot-Server-Patches/{0226-Implement-EntityTeleportEndGatewayEvent.patch => 0225-Implement-EntityTeleportEndGatewayEvent.patch} (94%)
 rename Spigot-Server-Patches/{0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (92%)
 rename Spigot-Server-Patches/{0228-Fix-CraftEntity-hashCode.patch => 0227-Fix-CraftEntity-hashCode.patch} (93%)
 rename Spigot-Server-Patches/{0229-Configurable-Alternative-LootPool-Luck-Formula.patch => 0228-Configurable-Alternative-LootPool-Luck-Formula.patch} (97%)
 rename Spigot-Server-Patches/{0230-Print-Error-details-when-failing-to-save-player-data.patch => 0229-Print-Error-details-when-failing-to-save-player-data.patch} (87%)
 rename Spigot-Server-Patches/{0231-Make-shield-blocking-delay-configurable.patch => 0230-Make-shield-blocking-delay-configurable.patch} (94%)
 rename Spigot-Server-Patches/{0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (97%)
 rename Spigot-Server-Patches/{0233-PlayerReadyArrowEvent.patch => 0232-PlayerReadyArrowEvent.patch} (94%)
 rename Spigot-Server-Patches/{0234-Fire-EntityShootBowEvent-for-Illusioner.patch => 0233-Fire-EntityShootBowEvent-for-Illusioner.patch} (92%)
 rename Spigot-Server-Patches/{0235-Implement-EntityKnockbackByEntityEvent.patch => 0234-Implement-EntityKnockbackByEntityEvent.patch} (92%)
 rename Spigot-Server-Patches/{0236-Expand-Explosions-API.patch => 0235-Expand-Explosions-API.patch} (92%)
 rename Spigot-Server-Patches/{0237-LivingEntity-Hand-Raised-Item-Use-API.patch => 0236-LivingEntity-Hand-Raised-Item-Use-API.patch} (93%)
 rename Spigot-Server-Patches/{0238-RangedEntity-API.patch => 0237-RangedEntity-API.patch} (95%)
 rename Spigot-Server-Patches/{0239-Add-config-to-disable-ender-dragon-legacy-check.patch => 0238-Add-config-to-disable-ender-dragon-legacy-check.patch} (94%)
 rename Spigot-Server-Patches/{0240-Implement-World.getEntity-UUID-API.patch => 0239-Implement-World.getEntity-UUID-API.patch} (88%)
 rename Spigot-Server-Patches/{0241-InventoryCloseEvent-Reason-API.patch => 0240-InventoryCloseEvent-Reason-API.patch} (94%)
 rename Spigot-Server-Patches/{0242-Configurable-Bed-Search-Radius.patch => 0241-Configurable-Bed-Search-Radius.patch} (98%)
 rename Spigot-Server-Patches/{0243-Vex-getSummoner-API.patch => 0242-Vex-getSummoner-API.patch} (91%)
 rename Spigot-Server-Patches/{0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0243-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (92%)
 rename Spigot-Server-Patches/{0245-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0244-Don-t-change-the-Entity-Random-seed-for-squids.patch} (87%)
 rename Spigot-Server-Patches/{0246-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0245-Re-add-vanilla-entity-warnings-for-duplicates.patch} (91%)
 rename Spigot-Server-Patches/{0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0246-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (89%)
 rename Spigot-Server-Patches/{0248-Use-asynchronous-Log4j-2-loggers.patch => 0247-Use-asynchronous-Log4j-2-loggers.patch} (91%)
 rename Spigot-Server-Patches/{0249-add-more-information-to-Entity.toString.patch => 0248-add-more-information-to-Entity.toString.patch} (92%)
 rename Spigot-Server-Patches/{0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0249-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (96%)
 rename Spigot-Server-Patches/{0251-EnderDragon-Events.patch => 0250-EnderDragon-Events.patch} (95%)
 rename Spigot-Server-Patches/{0252-PlayerElytraBoostEvent.patch => 0251-PlayerElytraBoostEvent.patch} (94%)
 rename Spigot-Server-Patches/{0253-Speedup-BlockPos-by-fixing-inlining.patch => 0252-Speedup-BlockPos-by-fixing-inlining.patch} (98%)
 rename Spigot-Server-Patches/{0254-Optimize-RegistryID.c.patch => 0253-Optimize-RegistryID.c.patch} (94%)
 rename Spigot-Server-Patches/{0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0254-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (91%)
 rename Spigot-Server-Patches/{0256-Vanished-players-don-t-have-rights.patch => 0255-Vanished-players-don-t-have-rights.patch} (96%)
 rename Spigot-Server-Patches/{0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0256-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (89%)
 rename Spigot-Server-Patches/{0258-Add-some-Debug-to-Chunk-Entity-slices.patch => 0257-Add-some-Debug-to-Chunk-Entity-slices.patch} (95%)
 rename Spigot-Server-Patches/{0259-EntityTransformedEvent.patch => 0258-EntityTransformedEvent.patch} (95%)
 rename Spigot-Server-Patches/{0260-SkeletonHorse-Additions.patch => 0259-SkeletonHorse-Additions.patch} (94%)
 rename Spigot-Server-Patches/{0261-Prevent-Saving-Bad-entities-to-chunks.patch => 0260-Prevent-Saving-Bad-entities-to-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0262-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0261-Don-t-call-getItemMeta-on-hasItemMeta.patch} (96%)
 rename Spigot-Server-Patches/{0263-Ignore-Dead-Entities-in-entityList-iteration.patch => 0262-Ignore-Dead-Entities-in-entityList-iteration.patch} (96%)
 rename Spigot-Server-Patches/{0264-Implement-Expanded-ArmorStand-API.patch => 0263-Implement-Expanded-ArmorStand-API.patch} (97%)
 rename Spigot-Server-Patches/{0265-AnvilDamageEvent.patch => 0264-AnvilDamageEvent.patch} (93%)
 rename Spigot-Server-Patches/{0266-Add-TNTPrimeEvent.patch => 0265-Add-TNTPrimeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0267-Break-up-and-make-tab-spam-limits-configurable.patch => 0266-Break-up-and-make-tab-spam-limits-configurable.patch} (96%)
 rename Spigot-Server-Patches/{0268-Add-hand-to-bucket-events.patch => 0267-Add-hand-to-bucket-events.patch} (98%)
 rename Spigot-Server-Patches/{0269-MC-135506-Experience-should-save-as-Integers.patch => 0268-MC-135506-Experience-should-save-as-Integers.patch} (91%)
 rename Spigot-Server-Patches/{0270-Fix-client-rendering-skulls-from-same-user.patch => 0269-Fix-client-rendering-skulls-from-same-user.patch} (96%)
 rename Spigot-Server-Patches/{0271-Add-Early-Warning-Feature-to-WatchDog.patch => 0270-Add-Early-Warning-Feature-to-WatchDog.patch} (97%)
 rename Spigot-Server-Patches/{0272-Make-EnderDragon-implement-Mob.patch => 0271-Make-EnderDragon-implement-Mob.patch} (92%)
 rename Spigot-Server-Patches/{0273-Use-ConcurrentHashMap-in-JsonList.patch => 0272-Use-ConcurrentHashMap-in-JsonList.patch} (97%)
 rename Spigot-Server-Patches/{0274-Use-a-Queue-for-Queueing-Commands.patch => 0273-Use-a-Queue-for-Queueing-Commands.patch} (94%)
 rename Spigot-Server-Patches/{0275-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (92%)
 rename Spigot-Server-Patches/{0276-Allow-disabling-armour-stand-ticking.patch => 0275-Allow-disabling-armour-stand-ticking.patch} (98%)
 rename Spigot-Server-Patches/{0277-Optimize-BlockPosition-helper-methods.patch => 0276-Optimize-BlockPosition-helper-methods.patch} (97%)
 rename Spigot-Server-Patches/{0278-Send-nearby-packets-from-world-player-list-not-serve.patch => 0277-Send-nearby-packets-from-world-player-list-not-serve.patch} (96%)
 rename Spigot-Server-Patches/{0279-Restore-vanlla-default-mob-spawn-range.patch => 0278-Restore-vanlla-default-mob-spawn-range.patch} (86%)
 rename Spigot-Server-Patches/{0280-Optimize-CraftBlockData-Creation.patch => 0279-Optimize-CraftBlockData-Creation.patch} (94%)
 rename Spigot-Server-Patches/{0281-Fix-MC-124320.patch => 0280-Fix-MC-124320.patch} (95%)
 rename Spigot-Server-Patches/{0282-Slime-Pathfinder-Events.patch => 0281-Slime-Pathfinder-Events.patch} (98%)
 rename Spigot-Server-Patches/{0283-Configurable-speed-for-water-flowing-over-lava.patch => 0282-Configurable-speed-for-water-flowing-over-lava.patch} (95%)
 rename Spigot-Server-Patches/{0284-Optimize-RegistryMaterials.patch => 0283-Optimize-RegistryMaterials.patch} (92%)
 rename Spigot-Server-Patches/{0285-Add-PhantomPreSpawnEvent.patch => 0284-Add-PhantomPreSpawnEvent.patch} (95%)
 rename Spigot-Server-Patches/{0286-Add-More-Creeper-API.patch => 0285-Add-More-Creeper-API.patch} (94%)
 rename Spigot-Server-Patches/{0287-Inventory-removeItemAnySlot.patch => 0286-Inventory-removeItemAnySlot.patch} (95%)
 rename Spigot-Server-Patches/{0288-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (90%)
 rename Spigot-Server-Patches/{0289-Add-ray-tracing-methods-to-LivingEntity.patch => 0288-Add-ray-tracing-methods-to-LivingEntity.patch} (96%)
 rename Spigot-Server-Patches/{0290-Expose-attack-cooldown-methods-for-Player.patch => 0289-Expose-attack-cooldown-methods-for-Player.patch} (93%)
 rename Spigot-Server-Patches/{0291-Improve-death-events.patch => 0290-Improve-death-events.patch} (98%)
 rename Spigot-Server-Patches/{0292-Allow-chests-to-be-placed-with-NBT-data.patch => 0291-Allow-chests-to-be-placed-with-NBT-data.patch} (91%)
 rename Spigot-Server-Patches/{0293-Mob-Pathfinding-API.patch => 0292-Mob-Pathfinding-API.patch} (97%)
 rename Spigot-Server-Patches/{0294-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0293-Prevent-chunk-loading-from-Fluid-Flowing.patch} (97%)
 rename Spigot-Server-Patches/{0295-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0294-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (99%)
 rename Spigot-Server-Patches/{0296-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (96%)
 rename Spigot-Server-Patches/{0297-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0296-Prevent-mob-spawning-from-loading-generating-chunks.patch} (94%)
 rename Spigot-Server-Patches/{0298-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0297-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (96%)
 rename Spigot-Server-Patches/{0299-Implement-furnace-cook-speed-multiplier-API.patch => 0298-Implement-furnace-cook-speed-multiplier-API.patch} (96%)
 rename Spigot-Server-Patches/{0300-Support-Overriding-World-Seeds.patch => 0299-Support-Overriding-World-Seeds.patch} (95%)
 rename Spigot-Server-Patches/{0301-Optimize-Server-World-Map.patch => 0300-Optimize-Server-World-Map.patch} (98%)
 rename Spigot-Server-Patches/{0302-PreSpawnerSpawnEvent.patch => 0301-PreSpawnerSpawnEvent.patch} (93%)
 rename Spigot-Server-Patches/{0303-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0302-Catch-JsonParseException-in-Entity-and-TE-names.patch} (94%)
 rename Spigot-Server-Patches/{0304-Avoid-dimension-id-collisions.patch => 0303-Avoid-dimension-id-collisions.patch} (90%)
 rename Spigot-Server-Patches/{0305-Honor-EntityAgeable.ageLock.patch => 0304-Honor-EntityAgeable.ageLock.patch} (84%)
 rename Spigot-Server-Patches/{0306-Configurable-connection-throttle-kick-message.patch => 0305-Configurable-connection-throttle-kick-message.patch} (93%)
 rename Spigot-Server-Patches/{0307-Hook-into-CB-plugin-rewrites.patch => 0306-Hook-into-CB-plugin-rewrites.patch} (98%)
 rename Spigot-Server-Patches/{0308-Allow-setting-the-vex-s-summoner.patch => 0307-Allow-setting-the-vex-s-summoner.patch} (90%)
 rename Spigot-Server-Patches/{0309-Add-sun-related-API.patch => 0308-Add-sun-related-API.patch} (91%)
 rename Spigot-Server-Patches/{0310-Check-Drowned-for-Villager-Aggression-Config.patch => 0309-Check-Drowned-for-Villager-Aggression-Config.patch} (92%)
 rename Spigot-Server-Patches/{0311-Here-s-Johnny.patch => 0310-Here-s-Johnny.patch} (91%)
 rename Spigot-Server-Patches/{0312-Turtle-API.patch => 0311-Turtle-API.patch} (97%)
 rename Spigot-Server-Patches/{0313-Limit-lightning-strike-effect-distance.patch => 0312-Limit-lightning-strike-effect-distance.patch} (96%)
 rename Spigot-Server-Patches/{0314-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0313-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (93%)
 rename Spigot-Server-Patches/{0315-Call-player-spectator-target-events.patch => 0314-Call-player-spectator-target-events.patch} (93%)
 rename Spigot-Server-Patches/{0316-Add-Velocity-IP-Forwarding-Support.patch => 0315-Add-Velocity-IP-Forwarding-Support.patch} (97%)
 rename Spigot-Server-Patches/{0317-Add-more-Witch-API.patch => 0316-Add-more-Witch-API.patch} (98%)
 rename Spigot-Server-Patches/{0318-Fix-MC-93764.patch => 0317-Fix-MC-93764.patch} (84%)
 rename Spigot-Server-Patches/{0319-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0318-Add-option-to-prevent-players-from-moving-into-unloa.patch} (96%)
 rename Spigot-Server-Patches/{0320-Reset-players-airTicks-on-respawn.patch => 0319-Reset-players-airTicks-on-respawn.patch} (83%)
 rename Spigot-Server-Patches/{0321-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0320-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (93%)
 rename Spigot-Server-Patches/{0322-Use-more-reasonable-thread-count-default-for-bootstr.patch => 0321-Use-more-reasonable-thread-count-default-for-bootstr.patch} (87%)
 rename Spigot-Server-Patches/{0323-Optimize-World-Time-Updates.patch => 0322-Optimize-World-Time-Updates.patch} (95%)
 rename Spigot-Server-Patches/{0324-Restore-custom-InventoryHolder-support.patch => 0323-Restore-custom-InventoryHolder-support.patch} (94%)
 rename Spigot-Server-Patches/{0325-Use-Vanilla-Minecart-Speeds.patch => 0324-Use-Vanilla-Minecart-Speeds.patch} (90%)
 rename Spigot-Server-Patches/{0326-Fix-SpongeAbsortEvent-handling.patch => 0325-Fix-SpongeAbsortEvent-handling.patch} (93%)
 rename Spigot-Server-Patches/{0327-Don-t-allow-digging-into-unloaded-chunks.patch => 0326-Don-t-allow-digging-into-unloaded-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0328-Optimize-redstone-algorithm.patch => 0327-Optimize-redstone-algorithm.patch} (99%)
 rename Spigot-Server-Patches/{0329-force-entity-dismount-during-teleportation.patch => 0328-force-entity-dismount-during-teleportation.patch} (96%)
 rename Spigot-Server-Patches/{0330-Book-Size-Limits.patch => 0329-Book-Size-Limits.patch} (96%)
 rename Spigot-Server-Patches/{0331-Make-the-default-permission-message-configurable.patch => 0330-Make-the-default-permission-message-configurable.patch} (93%)
 rename Spigot-Server-Patches/{0332-Add-more-Zombie-API.patch => 0331-Add-more-Zombie-API.patch} (96%)
 rename Spigot-Server-Patches/{0333-Prevent-rayTrace-from-loading-chunks.patch => 0332-Prevent-rayTrace-from-loading-chunks.patch} (92%)
 rename Spigot-Server-Patches/{0334-Handle-Large-Packets-disconnecting-client.patch => 0333-Handle-Large-Packets-disconnecting-client.patch} (94%)
 rename Spigot-Server-Patches/{0335-Lazy-init-world-storage-in-CraftOfflinePlayer.patch => 0334-Lazy-init-world-storage-in-CraftOfflinePlayer.patch} (95%)
 rename Spigot-Server-Patches/{0336-Add-PlayerConnectionCloseEvent.patch => 0335-Add-PlayerConnectionCloseEvent.patch} (97%)
 rename Spigot-Server-Patches/{0337-Prevent-Enderman-from-loading-chunks.patch => 0336-Prevent-Enderman-from-loading-chunks.patch} (94%)
 rename Spigot-Server-Patches/{0338-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0337-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (96%)
 rename Spigot-Server-Patches/{0339-Fix-PlayerEditBookEvent.patch => 0338-Fix-PlayerEditBookEvent.patch} (93%)
 rename Spigot-Server-Patches/{0340-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (82%)
 rename Spigot-Server-Patches/{0341-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0340-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (95%)
 rename Spigot-Server-Patches/{0342-Block-Entity-remove-from-being-called-on-Players.patch => 0341-Block-Entity-remove-from-being-called-on-Players.patch} (92%)
 rename Spigot-Server-Patches/{0343-BlockDestroyEvent.patch => 0342-BlockDestroyEvent.patch} (94%)
 rename Spigot-Server-Patches/{0344-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0343-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (96%)
 rename Spigot-Server-Patches/{0345-Fix-sign-edit-memory-leak.patch => 0344-Fix-sign-edit-memory-leak.patch} (93%)
 rename Spigot-Server-Patches/{0346-Limit-Client-Sign-length-more.patch => 0345-Limit-Client-Sign-length-more.patch} (96%)
 rename Spigot-Server-Patches/{0347-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0346-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (91%)
 rename Spigot-Server-Patches/{0348-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch => 0347-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch} (95%)
 rename Spigot-Server-Patches/{0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0348-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (95%)
 rename Spigot-Server-Patches/{0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0349-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (87%)
 rename Spigot-Server-Patches/{0351-Allow-Saving-of-Oversized-Chunks.patch => 0350-Allow-Saving-of-Oversized-Chunks.patch} (98%)
 rename Spigot-Server-Patches/{0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0351-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (85%)
 rename Spigot-Server-Patches/{0353-Add-LivingEntity-getTargetEntity.patch => 0352-Add-LivingEntity-getTargetEntity.patch} (96%)
 rename Spigot-Server-Patches/{0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0353-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (94%)
 rename Spigot-Server-Patches/{0355-Entity-getEntitySpawnReason.patch => 0354-Entity-getEntitySpawnReason.patch} (96%)
 rename Spigot-Server-Patches/{0356-Update-entity-Metadata-for-all-tracked-players.patch => 0355-Update-entity-Metadata-for-all-tracked-players.patch} (92%)
 rename Spigot-Server-Patches/{0357-Fire-event-on-GS4-query.patch => 0356-Fire-event-on-GS4-query.patch} (98%)
 rename Spigot-Server-Patches/{0358-Implement-PlayerPostRespawnEvent.patch => 0357-Implement-PlayerPostRespawnEvent.patch} (94%)
 rename Spigot-Server-Patches/{0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0358-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (92%)
 rename Spigot-Server-Patches/{0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0359-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (92%)
 rename Spigot-Server-Patches/{0361-Server-Tick-Events.patch => 0360-Server-Tick-Events.patch} (92%)
 rename Spigot-Server-Patches/{0362-PlayerDeathEvent-getItemsToKeep.patch => 0361-PlayerDeathEvent-getItemsToKeep.patch} (96%)
 rename Spigot-Server-Patches/{0363-Optimize-Captured-TileEntity-Lookup.patch => 0362-Optimize-Captured-TileEntity-Lookup.patch} (92%)
 rename Spigot-Server-Patches/{0364-Add-Heightmap-API.patch => 0363-Add-Heightmap-API.patch} (94%)
 rename Spigot-Server-Patches/{0365-Mob-Spawner-API-Enhancements.patch => 0364-Mob-Spawner-API-Enhancements.patch} (97%)
 rename Spigot-Server-Patches/{0366-Per-Player-View-Distance-API-placeholders.patch => 0365-Per-Player-View-Distance-API-placeholders.patch} (95%)
 rename Spigot-Server-Patches/{0367-Fix-CB-call-to-changed-postToMainThread-method.patch => 0366-Fix-CB-call-to-changed-postToMainThread-method.patch} (87%)
 rename Spigot-Server-Patches/{0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (91%)
 rename Spigot-Server-Patches/{0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (93%)
 rename Spigot-Server-Patches/{0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (94%)
 rename Spigot-Server-Patches/{0371-Duplicate-UUID-Resolve-Option.patch => 0370-Duplicate-UUID-Resolve-Option.patch} (98%)
 rename Spigot-Server-Patches/{0372-improve-CraftWorld-isChunkLoaded.patch => 0371-improve-CraftWorld-isChunkLoaded.patch} (93%)
 rename Spigot-Server-Patches/{0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0372-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (97%)
 rename Spigot-Server-Patches/{0374-Fix-some-generation-concurrency-issues.patch => 0373-Fix-some-generation-concurrency-issues.patch} (98%)
 rename Spigot-Server-Patches/{0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch => 0374-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch} (88%)
 rename Spigot-Server-Patches/{0376-ChunkMapDistance-CME.patch => 0375-ChunkMapDistance-CME.patch} (95%)
 rename Spigot-Server-Patches/{0377-Implement-CraftBlockSoundGroup.patch => 0376-Implement-CraftBlockSoundGroup.patch} (95%)
 rename Spigot-Server-Patches/{0378-Chunk-debug-command.patch => 0377-Chunk-debug-command.patch} (98%)
 rename Spigot-Server-Patches/{0379-incremental-chunk-saving.patch => 0378-incremental-chunk-saving.patch} (97%)
 rename Spigot-Server-Patches/{0380-Catch-exceptions-from-dispenser-entity-spawns.patch => 0379-Catch-exceptions-from-dispenser-entity-spawns.patch} (91%)
 rename Spigot-Server-Patches/{0381-Fix-World-isChunkGenerated-calls.patch => 0380-Fix-World-isChunkGenerated-calls.patch} (97%)
 rename Spigot-Server-Patches/{0382-Show-blockstate-location-if-we-failed-to-read-it.patch => 0381-Show-blockstate-location-if-we-failed-to-read-it.patch} (92%)
 rename Spigot-Server-Patches/{0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch => 0382-Log-other-thread-in-DataPaletteBlock-lock-failure.patch} (95%)
 rename Spigot-Server-Patches/{0384-Use-ChunkStatus-cache-when-saving-protochunks.patch => 0383-Use-ChunkStatus-cache-when-saving-protochunks.patch} (91%)
 rename Spigot-Server-Patches/{0385-Anti-Xray.patch => 0384-Anti-Xray.patch} (99%)
 rename Spigot-Server-Patches/{0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0385-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (94%)
 rename Spigot-Server-Patches/{0387-Configurable-projectile-relative-velocity.patch => 0386-Configurable-projectile-relative-velocity.patch} (95%)
 rename Spigot-Server-Patches/{0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch => 0387-Mark-entities-as-being-ticked-when-notifying-navigat.patch} (89%)
 rename Spigot-Server-Patches/{0389-offset-item-frame-ticking.patch => 0388-offset-item-frame-ticking.patch} (87%)
 rename Spigot-Server-Patches/{0390-Avoid-hopper-searches-if-there-are-no-items.patch => 0389-Avoid-hopper-searches-if-there-are-no-items.patch} (96%)
 rename Spigot-Server-Patches/{0391-Asynchronous-chunk-IO-and-loading.patch => 0390-Asynchronous-chunk-IO-and-loading.patch} (99%)
 rename Spigot-Server-Patches/{0392-Use-getChunkIfLoadedImmediately-in-places.patch => 0391-Use-getChunkIfLoadedImmediately-in-places.patch} (96%)
 rename Spigot-Server-Patches/{0393-Reduce-sync-loads.patch => 0392-Reduce-sync-loads.patch} (98%)
 rename Spigot-Server-Patches/{0394-Implement-alternative-item-despawn-rate.patch => 0393-Implement-alternative-item-despawn-rate.patch} (97%)
 rename Spigot-Server-Patches/{0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch => 0394-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch} (96%)
 rename Spigot-Server-Patches/{0396-Fix-MC-158900.patch => 0395-Fix-MC-158900.patch} (92%)
 rename Spigot-Server-Patches/{0397-implement-optional-per-player-mob-spawns.patch => 0396-implement-optional-per-player-mob-spawns.patch} (98%)
 rename Spigot-Server-Patches/{0398-Prevent-consuming-the-wrong-itemstack.patch => 0397-Prevent-consuming-the-wrong-itemstack.patch} (95%)
 rename Spigot-Server-Patches/{0399-only-add-passanger-entities-once-from-spawners.patch => 0398-only-add-passanger-entities-once-from-spawners.patch} (88%)
 rename Spigot-Server-Patches/{0400-Fix-nether-portal-creation.patch => 0399-Fix-nether-portal-creation.patch} (90%)
 rename Spigot-Server-Patches/{0401-Generator-Settings.patch => 0400-Generator-Settings.patch} (95%)
 rename Spigot-Server-Patches/{0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch => 0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch} (94%)
 rename Spigot-Server-Patches/{0403-Fix-MC-161754.patch => 0402-Fix-MC-161754.patch} (89%)
 rename Spigot-Server-Patches/{0404-Performance-improvement-for-Chunk.getEntities.patch => 0403-Performance-improvement-for-Chunk.getEntities.patch} (93%)
 rename Spigot-Server-Patches/{0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch => 0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} (93%)
 rename Spigot-Server-Patches/{0406-Expose-the-internal-current-tick.patch => 0405-Expose-the-internal-current-tick.patch} (86%)
 rename Spigot-Server-Patches/{0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch => 0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} (91%)
 rename Spigot-Server-Patches/{0408-Add-option-to-disable-pillager-patrols.patch => 0407-Add-option-to-disable-pillager-patrols.patch} (90%)
 rename Spigot-Server-Patches/{0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (92%)
 rename Spigot-Server-Patches/{0410-PlayerLaunchProjectileEvent.patch => 0409-PlayerLaunchProjectileEvent.patch} (97%)
 rename Spigot-Server-Patches/{0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0410-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (88%)
 rename Spigot-Server-Patches/{0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0411-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (91%)
 rename Spigot-Server-Patches/{0413-Fix-spawn-radius-being-treated-as-0.patch => 0412-Fix-spawn-radius-being-treated-as-0.patch} (90%)
 rename Spigot-Server-Patches/{0414-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0413-MC-145656-Fix-Follow-Range-Initial-Target.patch} (94%)
 rename Spigot-Server-Patches/{0415-Optimize-Hoppers.patch => 0414-Optimize-Hoppers.patch} (98%)
 rename Spigot-Server-Patches/{0416-PlayerDeathEvent-shouldDropExperience.patch => 0415-PlayerDeathEvent-shouldDropExperience.patch} (89%)
 rename Spigot-Server-Patches/{0417-Prevent-bees-loading-chunks-checking-hive-position.patch => 0416-Prevent-bees-loading-chunks-checking-hive-position.patch} (89%)
 rename Spigot-Server-Patches/{0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0417-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (93%)
 rename Spigot-Server-Patches/{0419-Guard-against-serializing-mismatching-chunk-coordina.patch => 0418-Guard-against-serializing-mismatching-chunk-coordina.patch} (96%)
 rename Spigot-Server-Patches/{0420-Optimise-IEntityAccess-getPlayerByUUID.patch => 0419-Optimise-IEntityAccess-getPlayerByUUID.patch} (92%)
 rename Spigot-Server-Patches/{0421-Fix-items-not-falling-correctly.patch => 0420-Fix-items-not-falling-correctly.patch} (92%)
 rename Spigot-Server-Patches/{0422-Lag-compensate-eating.patch => 0421-Lag-compensate-eating.patch} (97%)
 rename Spigot-Server-Patches/{0423-Optimize-call-to-getFluid-for-explosions.patch => 0422-Optimize-call-to-getFluid-for-explosions.patch} (89%)
 rename Spigot-Server-Patches/{0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0423-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (91%)
 rename Spigot-Server-Patches/{0425-Activation-Range-Improvements.patch => 0424-Activation-Range-Improvements.patch} (99%)
 rename Spigot-Server-Patches/{0426-Add-effect-to-block-break-naturally.patch => 0425-Add-effect-to-block-break-naturally.patch} (92%)
 rename Spigot-Server-Patches/{0427-Tracking-Range-Improvements.patch => 0426-Tracking-Range-Improvements.patch} (95%)
 rename Spigot-Server-Patches/{0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch => 0427-Fix-comparator-behavior-for-EntityPhanton-goal.patch} (88%)
 rename Spigot-Server-Patches/{0429-Fix-items-vanishing-through-end-portal.patch => 0428-Fix-items-vanishing-through-end-portal.patch} (95%)
 rename Spigot-Server-Patches/{0430-Seed-based-feature-search.patch => 0429-Seed-based-feature-search.patch} (95%)
 rename Spigot-Server-Patches/{0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0430-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (93%)
 rename Spigot-Server-Patches/{0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0431-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0433-Be-more-tolerant-of-invalid-attributes.patch => 0432-Be-more-tolerant-of-invalid-attributes.patch} (93%)
 rename Spigot-Server-Patches/{0434-Allow-overriding-the-java-version-check.patch => 0433-Allow-overriding-the-java-version-check.patch} (88%)
 rename Spigot-Server-Patches/{0435-Add-ThrownEggHatchEvent.patch => 0434-Add-ThrownEggHatchEvent.patch} (92%)
 rename Spigot-Server-Patches/{0436-Optimise-random-block-ticking.patch => 0435-Optimise-random-block-ticking.patch} (98%)
 rename Spigot-Server-Patches/{0437-Entity-Jump-API.patch => 0436-Entity-Jump-API.patch} (94%)
 rename Spigot-Server-Patches/{0438-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0437-Add-option-to-nerf-pigmen-from-nether-portals.patch} (97%)
 rename Spigot-Server-Patches/{0439-Make-the-GUI-graph-fancier.patch => 0438-Make-the-GUI-graph-fancier.patch} (97%)
 rename Spigot-Server-Patches/{0440-Backport-fix-for-MC-167561.patch => 0439-Backport-fix-for-MC-167561.patch} (94%)
 rename Spigot-Server-Patches/{0441-add-hand-to-BlockMultiPlaceEvent.patch => 0440-add-hand-to-BlockMultiPlaceEvent.patch} (91%)
 rename Spigot-Server-Patches/{0442-Prevent-teleporting-dead-entities.patch => 0441-Prevent-teleporting-dead-entities.patch} (88%)
 rename Spigot-Server-Patches/{0443-Validate-tripwire-hook-placement-before-update.patch => 0442-Validate-tripwire-hook-placement-before-update.patch} (88%)
 rename Spigot-Server-Patches/{0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0443-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (92%)
 rename Spigot-Server-Patches/{0445-Configurable-chance-of-villager-zombie-infection.patch => 0444-Configurable-chance-of-villager-zombie-infection.patch} (94%)
 rename Spigot-Server-Patches/{0446-Optimise-Chunk-getFluid.patch => 0445-Optimise-Chunk-getFluid.patch} (94%)
 rename Spigot-Server-Patches/{0447-Optimise-TickListServer-by-rewriting-it.patch => 0446-Optimise-TickListServer-by-rewriting-it.patch} (99%)
 rename Spigot-Server-Patches/{0448-Reduce-entity-tracker-updates-on-move.patch => 0447-Reduce-entity-tracker-updates-on-move.patch} (98%)
 rename Spigot-Server-Patches/{0449-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0448-Pillager-patrol-spawn-settings-and-per-player-option.patch} (97%)
 rename Spigot-Server-Patches/{0450-Ensure-Entity-is-never-double-registered.patch => 0449-Ensure-Entity-is-never-double-registered.patch} (96%)
 rename Spigot-Server-Patches/{0451-Fix-unregistering-entities-from-unloading-chunks.patch => 0450-Fix-unregistering-entities-from-unloading-chunks.patch} (92%)
 rename Spigot-Server-Patches/{0452-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (90%)
 rename Spigot-Server-Patches/{0453-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (95%)
 rename Spigot-Server-Patches/{0454-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (94%)
 rename Spigot-Server-Patches/{0455-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch => 0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch} (94%)
 rename Spigot-Server-Patches/{0456-Don-t-tick-dead-players.patch => 0455-Don-t-tick-dead-players.patch} (89%)
 rename Spigot-Server-Patches/{0457-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0456-Dead-Player-s-shouldn-t-be-able-to-move.patch} (88%)
 rename Spigot-Server-Patches/{0458-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch => 0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} (98%)
 rename Spigot-Server-Patches/{0459-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch => 0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch} (93%)
 rename Spigot-Server-Patches/{0460-Increase-Light-Queue-Size.patch => 0459-Increase-Light-Queue-Size.patch} (92%)
 rename Spigot-Server-Patches/{0461-Speed-up-processing-of-chunk-loads-and-generation.patch => 0460-Speed-up-processing-of-chunk-loads-and-generation.patch} (97%)
 rename Spigot-Server-Patches/{0462-Don-t-move-existing-players-to-world-spawn.patch => 0461-Don-t-move-existing-players-to-world-spawn.patch} (95%)
 rename Spigot-Server-Patches/{0463-Add-tick-times-API-and-mspt-command.patch => 0462-Add-tick-times-API-and-mspt-command.patch} (96%)
 rename Spigot-Server-Patches/{0464-Expose-MinecraftServer-isRunning.patch => 0463-Expose-MinecraftServer-isRunning.patch} (88%)
 rename Spigot-Server-Patches/{0465-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch => 0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch} (98%)
 rename Spigot-Server-Patches/{0466-Remove-streams-from-Mob-AI-System.patch => 0465-Remove-streams-from-Mob-AI-System.patch} (98%)
 rename Spigot-Server-Patches/{0467-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch => 0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch} (94%)
 rename Spigot-Server-Patches/{0468-Async-command-map-building.patch => 0467-Async-command-map-building.patch} (94%)
 rename Spigot-Server-Patches/{0469-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch => 0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch} (97%)
 rename Spigot-Server-Patches/{0470-Optimize-Pathfinding.patch => 0469-Optimize-Pathfinding.patch} (94%)
 rename Spigot-Server-Patches/{0471-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch => 0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch} (98%)
 rename Spigot-Server-Patches/{0472-Reduce-Either-Optional-allocation.patch => 0471-Reduce-Either-Optional-allocation.patch} (94%)
 rename Spigot-Server-Patches/{0473-Remove-streams-from-PairedQueue.patch => 0472-Remove-streams-from-PairedQueue.patch} (96%)
 rename Spigot-Server-Patches/{0474-Remove-streams-from-MinecraftKey.patch => 0473-Remove-streams-from-MinecraftKey.patch} (94%)
 rename Spigot-Server-Patches/{0475-Reduce-memory-footprint-of-NBTTagCompound.patch => 0474-Reduce-memory-footprint-of-NBTTagCompound.patch} (95%)
 rename Spigot-Server-Patches/{0476-Prevent-opening-inventories-when-frozen.patch => 0475-Prevent-opening-inventories-when-frozen.patch} (87%)
 rename Spigot-Server-Patches/{0477-Optimise-ArraySetSorted-removeIf.patch => 0476-Optimise-ArraySetSorted-removeIf.patch} (95%)
 rename Spigot-Server-Patches/{0478-Don-t-run-entity-collision-code-if-not-needed.patch => 0477-Don-t-run-entity-collision-code-if-not-needed.patch} (92%)
 rename Spigot-Server-Patches/{0479-Optimise-entity-hard-collision-checking.patch => 0478-Optimise-entity-hard-collision-checking.patch} (97%)
 rename Spigot-Server-Patches/{0480-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch => 0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch} (96%)
 rename Spigot-Server-Patches/{0481-Restrict-vanilla-teleport-command-to-valid-locations.patch => 0480-Restrict-vanilla-teleport-command-to-valid-locations.patch} (92%)
 rename Spigot-Server-Patches/{0482-Implement-Player-Client-Options-API.patch => 0481-Implement-Player-Client-Options-API.patch} (96%)
 rename Spigot-Server-Patches/{0483-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0482-Fix-Chunk-Post-Processing-deadlock-risk.patch} (97%)
 rename Spigot-Server-Patches/{0484-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (89%)
 rename Spigot-Server-Patches/{0485-Broadcast-join-message-to-console.patch => 0484-Broadcast-join-message-to-console.patch} (90%)
 rename Spigot-Server-Patches/{0486-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (96%)
 rename Spigot-Server-Patches/{0487-Load-Chunks-for-Login-Asynchronously.patch => 0486-Load-Chunks-for-Login-Asynchronously.patch} (98%)
 rename Spigot-Server-Patches/{0488-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (92%)
 rename Spigot-Server-Patches/{0489-Allow-sleeping-players-to-float.patch => 0488-Allow-sleeping-players-to-float.patch} (95%)
 rename Spigot-Server-Patches/{0490-Add-PlayerAttackEntityCooldownResetEvent.patch => 0489-Add-PlayerAttackEntityCooldownResetEvent.patch} (90%)
 rename Spigot-Server-Patches/{0491-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch => 0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} (94%)

diff --git a/Spigot-Server-Patches/0112-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0111-Add-setting-for-proxy-online-mode-status.patch
similarity index 94%
rename from Spigot-Server-Patches/0112-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0111-Add-setting-for-proxy-online-mode-status.patch
index 42fb090705..8bab5df759 100644
--- a/Spigot-Server-Patches/0112-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0111-Add-setting-for-proxy-online-mode-status.patch
@@ -1,11 +1,11 @@
-From cf32bd46104a23ec0112f2f1b2ca50a45cbf832b Mon Sep 17 00:00:00 2001
+From f769f45108864c73e6c1b3e096870a904d8bb99a Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 67f35fe66b..53f96a1576 100644
+index 67f35fe6..53f96a15 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -22,6 +22,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
@@ -31,7 +31,7 @@ index 67f35fe66b..53f96a1576 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index 1422503e11..d3c2e1bedf 100644
+index 1422503e..d3c2e1be 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -58,7 +58,8 @@ public class NameReferencingFileConverter {
@@ -45,7 +45,7 @@ index 1422503e11..d3c2e1bedf 100644
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cf0733baf7..1c25dc8f36 100644
+index cf0733ba..1c25dc8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1399,7 +1399,8 @@ public final class CraftServer implements Server {
@@ -59,5 +59,5 @@ index cf0733baf7..1c25dc8f36 100644
                  profile = console.getUserCache().getProfile( name );
              }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch
deleted file mode 100644
index 77cf15013b..0000000000
--- a/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b0a3d2baf0878e99b5852b16ac314019ef009af7 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Sun, 31 Jul 2016 16:33:03 -0500
-Subject: [PATCH] Re-track players that dismount from other players
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d4bba876d0..ae1f0d5783 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -997,6 +997,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-         if (entity1 != entity && this.playerConnection != null) {
-             this.playerConnection.a(this.locX(), this.locY(), this.locZ(), this.yaw, this.pitch);
-         }
-+        // Paper start - "Fixes" an issue in which the vehicle player would not be notified that the passenger dismounted
-+        if (entity instanceof EntityPlayer) {
-+            // TODO verify this solution
-+            WorldServer worldServer = (WorldServer) entity.getWorld();
-+            worldServer.getChunkProvider().playerChunkMap.removeEntity(this);
-+            worldServer.getChunkProvider().playerChunkMap.addEntity(this);
-+        }
-+        // Paper end
- 
-     }
- 
-@@ -1013,7 +1021,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-         if (!this.isSpectator()) {
-             super.b(blockposition);
-         }
--
-     }
- 
-     public void a(double d0, boolean flag) {
--- 
-2.25.1
-
diff --git a/Spigot-Server-Patches/0113-Optimise-BlockState-s-hashCode-equals.patch b/Spigot-Server-Patches/0112-Optimise-BlockState-s-hashCode-equals.patch
similarity index 94%
rename from Spigot-Server-Patches/0113-Optimise-BlockState-s-hashCode-equals.patch
rename to Spigot-Server-Patches/0112-Optimise-BlockState-s-hashCode-equals.patch
index 148c70cd16..1a30cb6784 100644
--- a/Spigot-Server-Patches/0113-Optimise-BlockState-s-hashCode-equals.patch
+++ b/Spigot-Server-Patches/0112-Optimise-BlockState-s-hashCode-equals.patch
@@ -1,4 +1,4 @@
-From 2bdd76a1c17eddcc04f21002f53c0941833fe1ec Mon Sep 17 00:00:00 2001
+From bef6f5e0736412aec113d29e4fc408e0596960b8 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 19 Aug 2016 01:52:56 +0100
 Subject: [PATCH] Optimise BlockState's hashCode/equals
@@ -9,7 +9,7 @@ object identity checks safely.
 Use a simpler optimized hashcode
 
 diff --git a/src/main/java/net/minecraft/server/BlockState.java b/src/main/java/net/minecraft/server/BlockState.java
-index 0ce77d9230..00e67b567f 100644
+index 0ce77d92..00e67b56 100644
 --- a/src/main/java/net/minecraft/server/BlockState.java
 +++ b/src/main/java/net/minecraft/server/BlockState.java
 @@ -28,23 +28,13 @@ public abstract class BlockState<T extends Comparable<T>> implements IBlockState
@@ -41,7 +41,7 @@ index 0ce77d9230..00e67b567f 100644
  
      public int c() {
 diff --git a/src/main/java/net/minecraft/server/BlockStateBoolean.java b/src/main/java/net/minecraft/server/BlockStateBoolean.java
-index d8738447d7..7ca302b522 100644
+index d8738447..7ca302b5 100644
 --- a/src/main/java/net/minecraft/server/BlockStateBoolean.java
 +++ b/src/main/java/net/minecraft/server/BlockStateBoolean.java
 @@ -30,8 +30,7 @@ public class BlockStateBoolean extends BlockState<Boolean> {
@@ -55,7 +55,7 @@ index d8738447d7..7ca302b522 100644
              return true;
          } else if (object instanceof BlockStateBoolean && super.equals(object)) {
 diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java
-index 1486d460c8..7cdadc6b6a 100644
+index 1486d460..7cdadc6b 100644
 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java
 +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java
 @@ -49,8 +49,7 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
@@ -69,7 +69,7 @@ index 1486d460c8..7cdadc6b6a 100644
              return true;
          } else if (object instanceof BlockStateEnum && super.equals(object)) {
 diff --git a/src/main/java/net/minecraft/server/BlockStateInteger.java b/src/main/java/net/minecraft/server/BlockStateInteger.java
-index 6f35c365f9..0499a71705 100644
+index 6f35c365..0499a717 100644
 --- a/src/main/java/net/minecraft/server/BlockStateInteger.java
 +++ b/src/main/java/net/minecraft/server/BlockStateInteger.java
 @@ -38,8 +38,7 @@ public class BlockStateInteger extends BlockState<Integer> {
@@ -83,5 +83,5 @@ index 6f35c365f9..0499a71705 100644
              return true;
          } else if (object instanceof BlockStateInteger && super.equals(object)) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0114-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0113-Configurable-packet-in-spam-threshold.patch
similarity index 93%
rename from Spigot-Server-Patches/0114-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0113-Configurable-packet-in-spam-threshold.patch
index e20bbc5c82..31408ad94e 100644
--- a/Spigot-Server-Patches/0114-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0113-Configurable-packet-in-spam-threshold.patch
@@ -1,11 +1,11 @@
-From 43dfe118b9c76025227c5e16d5fba88210cbed84 Mon Sep 17 00:00:00 2001
+From 5ca2647df8db59e280e0339d47eca2e6491b5a44 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 53f96a1576..010b17d2e7 100644
+index 53f96a15..010b17d2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -243,4 +243,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 53f96a1576..010b17d2e7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7476f07aa1..f057ebda81 100644
+index 7476f07a..f057ebda 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1204,13 +1204,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -44,5 +44,5 @@ index 7476f07aa1..f057ebda81 100644
              limitedPackets = 0;
              return true;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0115-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0114-Configurable-flying-kick-messages.patch
similarity index 94%
rename from Spigot-Server-Patches/0115-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0114-Configurable-flying-kick-messages.patch
index 1510227979..9252450c17 100644
--- a/Spigot-Server-Patches/0115-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0114-Configurable-flying-kick-messages.patch
@@ -1,11 +1,11 @@
-From 7921cd0efdadd166ff62add3473a7f0778f4c5db Mon Sep 17 00:00:00 2001
+From 32e8c434b4561dfdc75a82a414d27d77ad48b16f Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 010b17d2e7..5a83fc21cb 100644
+index 010b17d2..5a83fc21 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -252,4 +252,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 010b17d2e7..5a83fc21cb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f057ebda81..5b304c04bc 100644
+index f057ebda..5b304c04 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -147,7 +147,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -43,5 +43,5 @@ index f057ebda81..5b304c04bc 100644
                  }
              } else {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0116-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0115-Chunk-registration-fixes.patch
similarity index 90%
rename from Spigot-Server-Patches/0116-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0115-Chunk-registration-fixes.patch
index 5944f8d1db..06a7868b06 100644
--- a/Spigot-Server-Patches/0116-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0115-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From 72fe11d692b51e46025bd53e005221fe322a22ff Mon Sep 17 00:00:00 2001
+From 45d68970559eb14d25442d51f220fb6edff10f15 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
@@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 3004270455..eb99f3a967 100644
+index 30042704..eb99f3a9 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -696,7 +696,7 @@ public class WorldServer extends World {
@@ -21,5 +21,5 @@ index 3004270455..eb99f3a967 100644
  
          if (!entity.inChunk || entity.chunkX != i || entity.chunkY != j || entity.chunkZ != k) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0117-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 88%
rename from Spigot-Server-Patches/0117-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index 202835c4b7..ff0d007afc 100644
--- a/Spigot-Server-Patches/0117-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,11 +1,11 @@
-From 4684fa6318e2f4abedd442c40cb86c2704417b73 Mon Sep 17 00:00:00 2001
+From aee342c48579a1ce3e7383f8c26746807103cc29 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 16 Jun 2016 00:17:23 -0400
 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
-index cd04a2b997..174b9f5431 100644
+index cd04a2b9..174b9f54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 @@ -66,4 +66,15 @@ public class CraftFishHook extends AbstractProjectile implements FishHook {
@@ -25,5 +25,5 @@ index cd04a2b997..174b9f5431 100644
 +    
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0118-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0117-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 89%
rename from Spigot-Server-Patches/0118-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0117-Auto-fix-bad-Y-levels-on-player-login.patch
index 4a3f4ca1eb..073dc95ef7 100644
--- a/Spigot-Server-Patches/0118-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0117-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From 7cffcdf6e990c602452b5ae2c1f56914aa16600d Mon Sep 17 00:00:00 2001
+From 3ba304dde4eaa20b0d3da20b280e6a5f9d0879a2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ae1f0d5783..a5701623bf 100644
+index d4bba876..222bb312 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -197,6 +197,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,5 +18,5 @@ index ae1f0d5783..a5701623bf 100644
              if (this.getMinecraftServer().getForceGamemode()) {
                  this.playerInteractManager.setGameMode(this.getMinecraftServer().getGamemode());
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0119-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0118-Option-to-remove-corrupt-tile-entities.patch
similarity index 91%
rename from Spigot-Server-Patches/0119-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0118-Option-to-remove-corrupt-tile-entities.patch
index dde3c745e1..d31c3dc3de 100644
--- a/Spigot-Server-Patches/0119-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0118-Option-to-remove-corrupt-tile-entities.patch
@@ -1,11 +1,11 @@
-From 7d18db5d5b1c93da93819f4c984297cfae943e51 Mon Sep 17 00:00:00 2001
+From 8b83c17ec516576320f3251f9add49a1c30dfcdf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8cf3076f4..721eceeff 100644
+index 8cf3076f..721eceef 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -298,4 +298,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 8cf3076f4..721eceeff 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 8963acb9f..bb58fb796 100644
+index 8963acb9..bb58fb79 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -616,6 +616,12 @@ public class Chunk implements IChunkAccess {
@@ -36,5 +36,5 @@ index 8963acb9f..bb58fb796 100644
              // CraftBukkit end
          }
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0120-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0119-Add-EntityZapEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0120-Add-EntityZapEvent.patch
rename to Spigot-Server-Patches/0119-Add-EntityZapEvent.patch
index d29a6645b1..b2edd24472 100644
--- a/Spigot-Server-Patches/0120-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0119-Add-EntityZapEvent.patch
@@ -1,11 +1,11 @@
-From e69214e04ad26a535b149ce7611763cca83ad7a6 Mon Sep 17 00:00:00 2001
+From d7dc0221e397f8332fb4724121b7c2174af395ba Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 5c24e22c7d..8d277566e9 100644
+index 5c24e22c..8d277566 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -164,6 +164,12 @@ public class EntityPig extends EntityAnimal {
@@ -22,7 +22,7 @@ index 5c24e22c7d..8d277566e9 100644
          if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
              return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index f723470503..5e3835851d 100644
+index f7234705..5e383585 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -681,6 +681,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -39,7 +39,7 @@ index f723470503..5e3835851d 100644
          entitywitch.prepare(this.world, this.world.getDamageScaler(new BlockPosition(entitywitch)), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null);
          entitywitch.setNoAI(this.isNoAI());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 72b8677f26..2d454a3c3e 100644
+index 72b8677f..2d454a3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1045,6 +1045,14 @@ public class CraftEventFactory {
@@ -58,5 +58,5 @@ index 72b8677f26..2d454a3c3e 100644
          HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
          horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0121-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 94%
rename from Spigot-Server-Patches/0121-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to Spigot-Server-Patches/0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index a52349568e..e3db6fd09f 100644
--- a/Spigot-Server-Patches/0121-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,11 +1,11 @@
-From d88ab15995a757498456e1495ab3dc8dd8591256 Mon Sep 17 00:00:00 2001
+From a31f3551cbd2ac2a1b306cf31033ba910c741e24 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 721eceeffc..bff2e9d26d 100644
+index 721eceef..bff2e9d2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -30,7 +30,7 @@ index 721eceeffc..bff2e9d26d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index e64722f63b..6683f7c5f3 100644
+index e64722f6..6683f7c5 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -233,6 +233,15 @@ public class EntityFallingBlock extends Entity {
@@ -50,5 +50,5 @@ index e64722f63b..6683f7c5f3 100644
          if (nbttagcompound.hasKeyOfType("HurtEntities", 99)) {
              this.hurtEntities = nbttagcompound.getBoolean("HurtEntities");
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch
similarity index 94%
rename from Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch
rename to Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch
index 918ada0525..f618c6e5b7 100644
--- a/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch
@@ -1,11 +1,11 @@
-From b704867d1819955074cbb3ccc90c76c0d276f426 Mon Sep 17 00:00:00 2001
+From 21af3ee89e421dacb95f08387f84cce82fc68e28 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a5701623bf..d3bdec7995 100644
+index 222bb312..09dd7f06 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
@@ -50,7 +50,7 @@ index a5701623bf..d3bdec7995 100644
  
              this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
          }
-@@ -1332,7 +1341,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1325,7 +1334,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.lastHealthSent = -1.0F;
          this.lastFoodSent = -1;
          // this.recipeBook.a((RecipeBook) entityplayer.recipeBook); // CraftBukkit
@@ -67,5 +67,5 @@ index a5701623bf..d3bdec7995 100644
          this.cr = entityplayer.cr;
          this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0123-Optimise-removeQueue.patch b/Spigot-Server-Patches/0122-Optimise-removeQueue.patch
similarity index 96%
rename from Spigot-Server-Patches/0123-Optimise-removeQueue.patch
rename to Spigot-Server-Patches/0122-Optimise-removeQueue.patch
index 05c61fe512..edac339a39 100644
--- a/Spigot-Server-Patches/0123-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0122-Optimise-removeQueue.patch
@@ -1,11 +1,11 @@
-From fd472dc103b6e36824b557a86822a4d3b6f17f55 Mon Sep 17 00:00:00 2001
+From 18f68ee880df235c4d6e9a1e180246d93fea96d4 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index c6fd50daa8..19e72da6d9 100644
+index c6fd50da..19e72da6 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -97,6 +97,12 @@ public class LoginListener implements PacketLoginInListener {
@@ -66,5 +66,5 @@ index c6fd50daa8..19e72da6d9 100644
      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0124-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0123-Allow-Reloading-of-Command-Aliases.patch
similarity index 92%
rename from Spigot-Server-Patches/0124-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-Server-Patches/0123-Allow-Reloading-of-Command-Aliases.patch
index d6582ecf48..846a939cba 100644
--- a/Spigot-Server-Patches/0124-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0123-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From bd1aebbf6f16c7633c376529f45e91d5f4aaf9e0 Mon Sep 17 00:00:00 2001
+From b8a2b9046bf1c7514f777dac87e094c002a3bd9b Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1c25dc8f36..8f7b7e67f3 100644
+index 1c25dc8f..8f7b7e67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2118,5 +2118,24 @@ public final class CraftServer implements Server {
@@ -35,5 +35,5 @@ index 1c25dc8f36..8f7b7e67f3 100644
      // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0125-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0125-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch
index 15bb79da00..a78130128d 100644
--- a/Spigot-Server-Patches/0125-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,11 +1,11 @@
-From ba66292e0b855e1b32ab15c7189aeaa5b5398560 Mon Sep 17 00:00:00 2001
+From 3f7441f2c620db73c18600e59d423dc37029c462 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index f72bb0c138..0447800d9d 100644
+index f72bb0c1..0447800d 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -193,7 +193,7 @@ public class EntityExperienceOrb extends Entity {
@@ -18,7 +18,7 @@ index f72bb0c138..0447800d9d 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2d454a3c3e..95973558e3 100644
+index 2d454a3c..95973558 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -111,6 +111,7 @@ import org.bukkit.entity.ThrownPotion;
@@ -48,5 +48,5 @@ index 2d454a3c3e..95973558e3 100644
          return handleBlockGrowEvent(world, pos, block, 3);
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0126-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0125-Don-t-let-fishinghooks-use-portals.patch
similarity index 90%
rename from Spigot-Server-Patches/0126-Don-t-let-fishinghooks-use-portals.patch
rename to Spigot-Server-Patches/0125-Don-t-let-fishinghooks-use-portals.patch
index 74ef660de0..910a82c113 100644
--- a/Spigot-Server-Patches/0126-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0125-Don-t-let-fishinghooks-use-portals.patch
@@ -1,11 +1,11 @@
-From d72d69736365f04a5b40642fc3262d44e449b37e Mon Sep 17 00:00:00 2001
+From 44c5bb2c6355406dc77de81f8ee0602a9e2e7b71 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7e552f985a..2ab877c87b 100644
+index 7e552f98..2ab877c8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -161,7 +161,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 7e552f985a..2ab877c87b 100644
      public DimensionManager dimension;
      protected BlockPosition ai;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 40bdcf4e75..39e3bd3795 100644
+index 40bdcf4e..39e3bd37 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -160,6 +160,12 @@ public class EntityFishingHook extends Entity {
@@ -35,5 +35,5 @@ index 40bdcf4e75..39e3bd3795 100644
      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch
rename to Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch
index 1139318422..bbd5168db9 100644
--- a/Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch
@@ -1,11 +1,11 @@
-From cd5636eda85b76cacc81b1ccabafd6386896ff61 Mon Sep 17 00:00:00 2001
+From 4b6652a77776d09cba74b6e19177cdc74bf8a768 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 2b14b2c3fa..634e2bd304 100644
+index 2b14b2c3..634e2bd3 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -187,6 +187,17 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -27,7 +27,7 @@ index 2b14b2c3fa..634e2bd304 100644
                      this.a((MovingObjectPosition) object);
                      this.impulse = true;
 diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
-index 078cc25231..6756c79b31 100644
+index 078cc252..6756c79b 100644
 --- a/src/main/java/net/minecraft/server/EntityFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireball.java
 @@ -67,7 +67,16 @@ public abstract class EntityFireball extends Entity {
@@ -49,7 +49,7 @@ index 078cc25231..6756c79b31 100644
  
                  // CraftBukkit start - Fire ProjectileHitEvent
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 39e3bd3795..807ec3394d 100644
+index 39e3bd37..807ec339 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -214,7 +214,16 @@ public class EntityFishingHook extends Entity {
@@ -71,7 +71,7 @@ index 39e3bd3795..807ec3394d 100644
              if (movingobjectposition.getType() == MovingObjectPosition.EnumMovingObjectType.ENTITY) {
                  this.hooked = ((MovingObjectPositionEntity) movingobjectposition).getEntity();
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 2e4c9d4267..724b78b5d2 100644
+index 2e4c9d42..724b78b5 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -99,7 +99,16 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -93,7 +93,7 @@ index 2e4c9d4267..724b78b5d2 100644
                  this.c(((MovingObjectPositionBlock) movingobjectposition).getBlockPosition());
              } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 95973558e3..c45b7c15fc 100644
+index 95973558..c45b7c15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1149,6 +1149,16 @@ public class CraftEventFactory {
@@ -114,5 +114,5 @@ index 95973558e3..c45b7c15fc 100644
          Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
          ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0128-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0127-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 91%
rename from Spigot-Server-Patches/0128-Prevent-Pathfinding-out-of-World-Border.patch
rename to Spigot-Server-Patches/0127-Prevent-Pathfinding-out-of-World-Border.patch
index ef67794c5c..e1cf96c4a4 100644
--- a/Spigot-Server-Patches/0128-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0127-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From fcc715150803fa51d3b3fafa3d595d171e29d2b2 Mon Sep 17 00:00:00 2001
+From f32384944ebec3c10e236bf563648fd6cf5f1c4e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border
 This prevents Entities from trying to run outside of the World Border
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 39a0c45bb0..bdd092e49d 100644
+index 39a0c45b..bdd092e4 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -123,7 +123,7 @@ public abstract class NavigationAbstract {
@@ -19,5 +19,5 @@ index 39a0c45bb0..bdd092e49d 100644
                      if (!copiedSet) {
                          copiedSet = true;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0128-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 89%
rename from Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0128-Optimize-World.isLoaded-BlockPosition-Z.patch
index f411f6c250..f9f61c6bac 100644
--- a/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0128-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From dbef5e27ac9329eea9eac13f8262809bc66236a6 Mon Sep 17 00:00:00 2001
+From 5f3c851b5a2ad7a219d45ad5d680c85c8fb4b92a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 05ee02c4c2..ff14c265b1 100644
+index 86de3c63..96328395 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -224,6 +224,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -22,5 +22,5 @@ index 05ee02c4c2..ff14c265b1 100644
          return getWorldBorder().isInBounds(blockposition) && getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null;
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0130-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch
similarity index 94%
rename from Spigot-Server-Patches/0130-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch
index 9b13019dde..9f6d212b22 100644
--- a/Spigot-Server-Patches/0130-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From afee5d8e6bb2a78515a3da8d7288e819da577af9 Mon Sep 17 00:00:00 2001
+From 92063b53c457ea12dd4f9d3fa3f1c571391312f0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border
@@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.
 
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 0f248b6de3..e8ce2ecf23 100644
+index 0f248b6d..e8ce2ecf 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -108,6 +108,7 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
@@ -23,7 +23,7 @@ index 0f248b6de3..e8ce2ecf23 100644
  
                                  if (structurestart != null && structurestart.e()) {
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 4ee13ac454..5f10c4338e 100644
+index 4ee13ac4..5f10c433 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -24,6 +24,18 @@ public class WorldBorder {
@@ -46,5 +46,5 @@ index 4ee13ac454..5f10c4338e 100644
          return (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e() && (double) chunkcoordintpair.g() > this.d() && (double) chunkcoordintpair.e() < this.f();
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch
similarity index 93%
rename from Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch
index 360bd692fc..219c821bb2 100644
--- a/Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 5530a9b263ae79a80b9a46fe22034007ec906132 Mon Sep 17 00:00:00 2001
+From 87b159cec63df0af8d0d0262d74110d0d5ce0633 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bff2e9d26d..f164844f33 100644
+index bff2e9d2..f164844f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -312,4 +312,14 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index bff2e9d26d..f164844f33 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java
-index 3bcf0b385d..4764ffef77 100644
+index 3bcf0b38..4764ffef 100644
 --- a/src/main/java/net/minecraft/server/VillagerTrades.java
 +++ b/src/main/java/net/minecraft/server/VillagerTrades.java
 @@ -92,7 +92,8 @@ public class VillagerTrades {
@@ -42,5 +42,5 @@ index 3bcf0b385d..4764ffef77 100644
                  if (blockposition != null) {
                      ItemStack itemstack = ItemWorldMap.createFilledMapView(worldserver, blockposition.getX(), blockposition.getZ(), (byte) 2, true, true);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0132-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch
similarity index 87%
rename from Spigot-Server-Patches/0132-Optimize-ItemStack.isEmpty.patch
rename to Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch
index db1054de3b..dba4e95027 100644
--- a/Spigot-Server-Patches/0132-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From 67a0f28671a63dd0541a0cbc89a93c374c445ffd Mon Sep 17 00:00:00 2001
+From 7ecd6cb56b0a0291549a49f25190e3c4bc864f82 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index db11c8ec69..854cffe6c9 100644
+index db11c8ec..854cffe6 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -150,7 +150,7 @@ public final class ItemStack {
@@ -19,5 +19,5 @@ index db11c8ec69..854cffe6c9 100644
  
      public ItemStack cloneAndSubtract(int i) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0133-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 92%
rename from Spigot-Server-Patches/0133-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch
index bac04aeedc..e1f181b7f8 100644
--- a/Spigot-Server-Patches/0133-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,11 +1,11 @@
-From 085f39ca706bdfb003624eb6c180cf934a8a9405 Mon Sep 17 00:00:00 2001
+From 4da20ed499a4b6ec5a8ba5364d0ae240a39c46d2 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index ed6092f65a..176af6c889 100644
+index ed6092f6..176af6c8 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -43,6 +43,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index ed6092f65a..176af6c889 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08ade..124c3185bc 100644
+index 2b66a08a..124c3185 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -211,4 +211,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -52,5 +52,5 @@ index 2b66a08ade..124c3185bc 100644
 +    // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch
similarity index 86%
rename from Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch
index 4f49976a6e..d4c8e984b1 100644
--- a/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From c14beb24f2fd5ecb413ecde5e4df9b8947e3ec45 Mon Sep 17 00:00:00 2001
+From 52e1e31d7ee25cfe9bfc388429520919327bc64a Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d3bdec7995..1296eb04f0 100644
+index 09dd7f06..95e09e35 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1800,7 +1800,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1793,7 +1793,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      protected boolean isFrozen() {
@@ -19,7 +19,7 @@ index d3bdec7995..1296eb04f0 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5b304c04bc..f367a76e82 100644
+index 5b304c04..f367a76e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2526,7 +2526,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -32,5 +32,5 @@ index 5b304c04bc..f367a76e82 100644
      // CraftBukkit end
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch
index 823f631b98..e597dff69f 100644
--- a/Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From a6b5edccaf9bf86cd8c10cfa0156902839a41c93 Mon Sep 17 00:00:00 2001
+From 6c1d5b081a6dfd1aef3ca4bdf9d242e07153fa1a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
 
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 9fb9a96ccb..48f88eaba4 100644
+index 9fb9a96c..48f88eab 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -42,7 +42,7 @@ index 9fb9a96ccb..48f88eaba4 100644
      public static boolean isMainThread() {
          return MinecraftServer.getServer().isMainThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 060a21840f..d1745c4e93 100644
+index 060a2184..d1745c4e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -216,6 +216,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -65,5 +65,5 @@ index 060a21840f..d1745c4e93 100644
      public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
           if (header != null) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0136-Firework-API-s.patch b/Spigot-Server-Patches/0135-Firework-API-s.patch
similarity index 96%
rename from Spigot-Server-Patches/0136-Firework-API-s.patch
rename to Spigot-Server-Patches/0135-Firework-API-s.patch
index bfa8c5043c..349146a620 100644
--- a/Spigot-Server-Patches/0136-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0135-Firework-API-s.patch
@@ -1,11 +1,11 @@
-From 2343191bdb15c6a3287804f78858c35fd631aef5 Mon Sep 17 00:00:00 2001
+From 852ef08c9fa8869fe5b5c23ca304870633b2a13b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 07:18:33 +0100
 Subject: [PATCH] Firework API's
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 4f51b9b654..278ef79d89 100644
+index 4f51b9b6..278ef79d 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -3,6 +3,8 @@ package net.minecraft.server;
@@ -53,7 +53,7 @@ index 4f51b9b654..278ef79d89 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java
-index 313076d6d8..7be41c8698 100644
+index 313076d6..7be41c86 100644
 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java
 +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java
 @@ -199,6 +199,7 @@ public class ItemCrossbow extends ItemProjectileWeapon {
@@ -65,7 +65,7 @@ index 313076d6d8..7be41c8698 100644
                  object = a(world, entityliving, itemstack, itemstack1);
                  if (flag || f3 != 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 058c016b7b..92dac35ec4 100644
+index 058c016b..92dac35e 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -18,6 +18,7 @@ public class ItemFireworks extends Item {
@@ -90,7 +90,7 @@ index 058c016b7b..92dac35ec4 100644
                      itemstack.subtract(1);
                  }
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 75604dbc69..98deaba12c 100644
+index 75604dbc..98deaba1 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -136,7 +136,7 @@ public class NBTTagCompound implements NBTBase {
@@ -103,7 +103,7 @@ index 75604dbc69..98deaba12c 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 475b7b004b..de74e7214a 100644
+index 475b7b00..de74e721 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -2,6 +2,7 @@ package org.bukkit.craftbukkit.entity;
@@ -145,5 +145,5 @@ index 475b7b004b..de74e7214a 100644
 +    // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0137-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0137-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch
index c0287d486d..2afda9fada 100644
--- a/Spigot-Server-Patches/0137-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 67e81833b91a07330074fc7e72c905b67b59f91d Mon Sep 17 00:00:00 2001
+From 7bbf507c90412fdf8acd6d7e158d2a98ead54452 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index b907a3c4d8..78fba79378 100644
+index b907a3c4..78fba793 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -133,7 +133,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@@ -19,5 +19,5 @@ index b907a3c4d8..78fba79378 100644
                      if (teleEvent.isCancelled()) {
                          return;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 95%
rename from Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch
index a5a1e35d51..52479d4aa3 100644
--- a/Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From bcfbc728fd05e1d34c7db822258ca12d4875aafb Mon Sep 17 00:00:00 2001
+From 90524519681bd794aaa137bdeb4cc051e3d78717 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 16b78bd02e..c06b10c6b1 100644
+index 16b78bd0..c06b10c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -278,6 +278,48 @@ public class CraftWorld implements World {
@@ -60,5 +60,5 @@ index 16b78bd02e..c06b10c6b1 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0139-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch
similarity index 89%
rename from Spigot-Server-Patches/0139-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch
index 0a73b5e3f5..321856a3ac 100644
--- a/Spigot-Server-Patches/0139-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 37df96a0b9a2dac98753370a77dc1a9af7980f8d Mon Sep 17 00:00:00 2001
+From 3a6c017d5a8ef4b9fb510297cb3b5db3c3deb413 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 643e58839..293251988 100644
+index 643e5883..29325198 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -918,11 +918,13 @@ public abstract class PlayerList {
@@ -25,5 +25,5 @@ index 643e58839..293251988 100644
  
      public WhiteList getWhitelist() {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0140-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 88%
rename from Spigot-Server-Patches/0140-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch
index 81c4bd7335..a632b512ef 100644
--- a/Spigot-Server-Patches/0140-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,11 +1,11 @@
-From 573d1cfd449b7e3c354033b3e6846b4c455874ae Mon Sep 17 00:00:00 2001
+From b891916ae62c25ff68a788e8c226d34a92059e1a Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2ab877c87b..1c8958d15d 100644
+index 2ab877c8..1c8958d1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2029,6 +2029,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,5 +17,5 @@ index 2ab877c87b..1c8958d15d 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 96%
rename from Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 13f17e2d9d..ffe22b4062 100644
--- a/Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From b8fe1ba7ee5dcbf4f63adefe4d57181b32da4dda Mon Sep 17 00:00:00 2001
+From 02c5588d0d0f678d2820893db36cefa7f04183db Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 5de881371a..5f261b9b92 100644
+index 5de88137..5f261b9b 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -511,13 +511,13 @@ public class Block implements IMaterial {
@@ -28,7 +28,7 @@ index 5de881371a..5f261b9b92 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java
-index 2d2cd09ad1..ed88e208d0 100644
+index 2d2cd09a..ed88e208 100644
 --- a/src/main/java/net/minecraft/server/ContainerGrindstone.java
 +++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java
 @@ -81,7 +81,7 @@ public class ContainerGrindstone extends Container {
@@ -41,7 +41,7 @@ index 2d2cd09ad1..ed88e208d0 100644
  
                      world.triggerEffect(1042, blockposition, 0);
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 8762577696..138e2ea56a 100644
+index 87625776..138e2ea5 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -616,7 +616,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -54,7 +54,7 @@ index 8762577696..138e2ea56a 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 0447800d9d..d4275e733d 100644
+index 0447800d..d4275e73 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -16,9 +16,59 @@ public class EntityExperienceOrb extends Entity {
@@ -134,7 +134,7 @@ index 0447800d9d..d4275e733d 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 807ec3394d..73f5961aa3 100644
+index 807ec339..73f5961a 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -401,7 +401,7 @@ public class EntityFishingHook extends Entity {
@@ -147,7 +147,7 @@ index 807ec3394d..73f5961aa3 100644
                      // CraftBukkit end
                      if (itemstack1.getItem().a(TagsItem.FISHES)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index dd1caec9da..2775afc327 100644
+index dd1caec9..2775afc3 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1379,7 +1379,8 @@ public abstract class EntityLiving extends Entity {
@@ -161,7 +161,7 @@ index dd1caec9da..2775afc327 100644
              this.expToDrop = 0;
          }
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index 0bfc0a773d..ba2f90cc6a 100644
+index 0bfc0a77..ba2f90cc 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -43,7 +43,7 @@ public class EntityThrownExpBottle extends EntityProjectileThrowable {
@@ -174,7 +174,7 @@ index 0bfc0a773d..ba2f90cc6a 100644
  
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index c73cc9ae4b..76296119a1 100644
+index c73cc9ae..76296119 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -510,7 +510,7 @@ public class EntityTurtle extends EntityAnimal {
@@ -187,7 +187,7 @@ index c73cc9ae4b..76296119a1 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 5e3835851d..6ca4fa43c4 100644
+index 5e383585..6ca4fa43 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -509,7 +509,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -200,7 +200,7 @@ index 5e3835851d..6ca4fa43c4 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index 530c699964..2ad8dba5c0 100644
+index 530c6999..2ad8dba5 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -147,7 +147,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -213,7 +213,7 @@ index 530c699964..2ad8dba5c0 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index 1ab2668e91..2b708761d0 100644
+index 1ab2668e..2b708761 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 @@ -117,7 +117,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@@ -226,7 +226,7 @@ index 1ab2668e91..2b708761d0 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index f6c6ea4aaf..dff3eb1188 100644
+index f6c6ea4a..dff3eb11 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -374,7 +374,7 @@ public class PlayerInteractManager {
@@ -239,7 +239,7 @@ index f6c6ea4aaf..dff3eb1188 100644
  
                  return true;
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index d2698e847c..edc4a5c34e 100644
+index d2698e84..edc4a5c3 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 @@ -2,7 +2,7 @@ package net.minecraft.server;
@@ -252,7 +252,7 @@ index d2698e847c..edc4a5c34e 100644
  
      public SlotFurnaceResult(EntityHuman entityhuman, IInventory iinventory, int i, int j, int k) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index 8dc47452a4..560e2f42b7 100644
+index 8dc47452..560e2f42 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -554,7 +554,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@@ -265,7 +265,7 @@ index 8dc47452a4..560e2f42b7 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c06b10c6b1..d3df3f593f 100644
+index c06b10c6..d3df3f59 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1795,7 +1795,7 @@ public class CraftWorld implements World {
@@ -278,7 +278,7 @@ index c06b10c6b1..d3df3f593f 100644
              entity = new EntityLightning(world, x, y, z, false);
          } else if (Firework.class.isAssignableFrom(clazz)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 1b512cc45c..fbad045675 100644
+index 1b512cc4..fbad0456 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 @@ -20,6 +20,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
@@ -301,5 +301,5 @@ index 1b512cc45c..fbad045675 100644
      public EntityExperienceOrb getHandle() {
          return (EntityExperienceOrb) entity;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch
similarity index 93%
rename from Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch
index 6623736ba3..8d82e5068d 100644
--- a/Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From c60aec0eb4548625a800d36c5977d5ba6990a891 Mon Sep 17 00:00:00 2001
+From 6f567dd6ea759b3af52c4ec8096ea256858ba361 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f164844f33..751551f173 100644
+index f164844f..751551f1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -322,4 +322,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index f164844f33..751551f173 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1c8958d15d..4f8e10b860 100644
+index 1c8958d1..4f8e10b8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index 1c8958d15d..4f8e10b860 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2775afc327..74de19bbfb 100644
+index 2775afc3..74de19bb 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2623,8 +2623,11 @@ public abstract class EntityLiving extends Entity {
@@ -56,5 +56,5 @@ index 2775afc327..74de19bbfb 100644
                  this.C(entity);
              }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0143-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 95%
rename from Spigot-Server-Patches/0143-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch
index 5407be47cb..c1d2678da7 100644
--- a/Spigot-Server-Patches/0143-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From 3fdc2eae474660f8156b508c0d68c5988fd2b67e Mon Sep 17 00:00:00 2001
+From a99a62d07c1769b1d7b36d76a0ece98e1bf61f67 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 00:04:04 -0500
 Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 552daf4376..e102be583c 100644
+index 552daf43..e102be58 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -414,7 +414,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -47,5 +47,5 @@ index 552daf4376..e102be583c 100644
  
      @Deprecated
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 95%
rename from Spigot-Server-Patches/0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 128a438a9e..82a8340408 100644
--- a/Spigot-Server-Patches/0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,11 +1,11 @@
-From 58d7d22e391562ed715f337910c5dfb6640403a9 Mon Sep 17 00:00:00 2001
+From eaa90acb05f14ba3176d728f736c30c4494c5705 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 291c2a17bb..936fc4f6b9 100644
+index 291c2a17..936fc4f6 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -139,7 +139,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -37,5 +37,5 @@ index 291c2a17bb..936fc4f6b9 100644
          }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0145-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch
similarity index 92%
rename from Spigot-Server-Patches/0145-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch
index 27de861575..97cbb50fb9 100644
--- a/Spigot-Server-Patches/0145-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch
@@ -1,11 +1,11 @@
-From 15e6df8dfd3a4f2a37cb02e5ca6ad4e533438184 Mon Sep 17 00:00:00 2001
+From 737330b3c9fdebf2fd564107b78244f1aa0a0763 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 176af6c889..992d7bfb0f 100644
+index 176af6c8..992d7bfb 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -826,5 +826,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index 176af6c889..992d7bfb0f 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 74de19bbfb..b31355f2be 100644
+index 74de19bb..b31355f2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -227,6 +227,7 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index 74de19bbfb..b31355f2be 100644
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0146-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 98%
rename from Spigot-Server-Patches/0146-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch
index 0d472b83e5..0f8147a433 100644
--- a/Spigot-Server-Patches/0146-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From c611f29665a3b57b937b835fe497e4a774f7ae38 Mon Sep 17 00:00:00 2001
+From 85980c624cc37bb702630bb277ea5b1e43362a1f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 12 May 2017 23:34:11 -0500
 Subject: [PATCH] Properly handle async calls to restart the server
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ebb41f788..af2fa93d4 100644
+index ebb41f78..af2fa93d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -88,6 +88,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -73,7 +73,7 @@ index ebb41f788..af2fa93d4 100644
      // Spigot Start
      private static double calcTps(double avg, double exp, double tps)
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 293251988..56266a772 100644
+index 29325198..56266a77 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1029,10 +1029,15 @@ public abstract class PlayerList {
@@ -102,7 +102,7 @@ index 293251988..56266a772 100644
      // CraftBukkit start
      public void sendMessage(IChatBaseComponent[] iChatBaseComponents) {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index ccea803f5..aefea3a9a 100644
+index ccea803f..aefea3a9 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -46,86 +46,134 @@ public class RestartCommand extends Command
@@ -307,5 +307,5 @@ index ccea803f5..aefea3a9a 100644
 +
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0147-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0146-Add-system-property-to-disable-book-size-limits.patch
similarity index 96%
rename from Spigot-Server-Patches/0147-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0146-Add-system-property-to-disable-book-size-limits.patch
index 6a4cc32967..bc846f8b6a 100644
--- a/Spigot-Server-Patches/0147-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0146-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From 1eb0a4434d3c302c17871ea36b090195c637d489 Mon Sep 17 00:00:00 2001
+From 29ffd496d5b85c2626fdacb8d144824f45275241 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 13 May 2017 20:11:21 -0500
 Subject: [PATCH] Add system property to disable book size limits
@@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without
 limiting incoming data from packets in some other way.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 08f3a315f3..6ddb133587 100644
+index 08f3a315..6ddb1335 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -36,6 +36,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -57,5 +57,5 @@ index 08f3a315f3..6ddb133587 100644
              }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 94%
rename from Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index e240c4fbc4..7ae49f5213 100644
--- a/Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From a1610cec97de35b2e2a368aea3eaf1cf1faea507 Mon Sep 17 00:00:00 2001
+From 6f6338882a15f56648c1ea8c9098019162efd864 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 751551f173..eae1690cc6 100644
+index 751551f1..eae1690c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -328,4 +328,10 @@ public class PaperWorldConfig {
@@ -26,7 +26,7 @@ index 751551f173..eae1690cc6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index b407d80ae6..5e92f0ddb4 100644
+index b407d80a..5e92f0dd 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -463,7 +463,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,7 +39,7 @@ index b407d80ae6..5e92f0ddb4 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f367a76e82..046ef418f8 100644
+index f367a76e..046ef418 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1773,6 +1773,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -57,5 +57,5 @@ index f367a76e82..046ef418f8 100644
              case RELEASE_SHIFT_KEY:
                  this.player.setSneaking(false);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 91%
rename from Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch
index 98ea9110a0..01348fa0ee 100644
--- a/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From c86f500887327ec327c692597b05d2ad6f14b530 Mon Sep 17 00:00:00 2001
+From d191de1047b34bea36c01e3fc862b9ff3b352822 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:34 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5a83fc21cb..295b8390cb 100644
+index 5a83fc21..295b8390 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -259,4 +259,9 @@ public class PaperConfig {
@@ -20,7 +20,7 @@ index 5a83fc21cb..295b8390cb 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8f7b7e67f3..2e0f443d9f 100644
+index 8f7b7e67..2e0f443d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2137,5 +2137,10 @@ public final class CraftServer implements Server {
@@ -35,5 +35,5 @@ index 8f7b7e67f3..2e0f443d9f 100644
      // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch
index 89fe76c2c6..6cc870d755 100644
--- a/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From b0cac0325343f6656dca54c1a48d7fb79176097b Mon Sep 17 00:00:00 2001
+From a47a0f46d7c03f9ce3c5888be99993111aab36de Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index 3dc6c2a3f..b1f008738 100644
+index 3dc6c2a3..b1f00873 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -41,10 +41,27 @@
@@ -75,7 +75,7 @@ index 3dc6c2a3f..b1f008738 100644
                  <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 new file mode 100644
-index 000000000..cd6e25923
+index 00000000..cd6e2592
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -0,0 +1,40 @@
@@ -121,7 +121,7 @@ index 000000000..cd6e25923
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 new file mode 100644
-index 000000000..685deaa0e
+index 00000000..685deaa0
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 @@ -0,0 +1,17 @@
@@ -143,7 +143,7 @@ index 000000000..685deaa0e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 4b1f8c537..d34f772fa 100644
+index 4b1f8c53..d34f772f 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -86,6 +86,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -185,7 +185,7 @@ index 4b1f8c537..d34f772fa 100644
          System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
          System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index af2fa93d4..94f9201fc 100644
+index af2fa93d..94f9201f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -57,7 +57,7 @@ import org.apache.commons.lang3.Validate;
@@ -244,7 +244,7 @@ index af2fa93d4..94f9201fc 100644
  
      public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index d8e74e227..55c2cd05b 100644
+index 56266a77..77f1ddc8 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -76,8 +76,7 @@ public abstract class PlayerList {
@@ -258,7 +258,7 @@ index d8e74e227..55c2cd05b 100644
  
          this.k = new GameProfileBanList(PlayerList.b);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2e0f443d9..742c21480 100644
+index 2e0f443d..742c2148 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -42,7 +42,6 @@ import java.util.logging.Level;
@@ -284,7 +284,7 @@ index 2e0f443d9..742c21480 100644
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 93fcfd5f3..0e76e3466 100644
+index 93fcfd5f..0e76e346 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -13,7 +13,7 @@ import java.util.logging.Logger;
@@ -335,7 +335,7 @@ index 93fcfd5f3..0e76e3466 100644
              } catch (Throwable t) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 deleted file mode 100644
-index fdf2f075e..000000000
+index fdf2f075..00000000
 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 +++ /dev/null
 @@ -1,72 +0,0 @@
@@ -412,7 +412,7 @@ index fdf2f075e..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index befcc19f9..5510266fb 100644
+index befcc19f..5510266f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -4,20 +4,31 @@ import java.util.Collections;
@@ -495,7 +495,7 @@ index befcc19f9..5510266fb 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 70f8d4299..449e99d1b 100644
+index 70f8d429..449e99d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -17,7 +17,7 @@ public class ServerShutdownThread extends Thread {
@@ -509,7 +509,7 @@ index 70f8d4299..449e99d1b 100644
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 deleted file mode 100644
-index 99564fed7..000000000
+index 99564fed..00000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
 @@ -1,58 +0,0 @@
@@ -573,13 +573,13 @@ index 99564fed7..000000000
 -}
 diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
 new file mode 100644
-index 000000000..0694b2146
+index 00000000..0694b214
 --- /dev/null
 +++ b/src/main/resources/log4j2.component.properties
 @@ -0,0 +1 @@
 +log4j.skipJansi=true
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 722ca8496..620b9490e 100644
+index 722ca849..620b9490 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,17 +1,14 @@
@@ -617,5 +617,5 @@ index 722ca8496..620b9490e 100644
      </Loggers>
  </Configuration>
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0151-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 92%
rename from Spigot-Server-Patches/0151-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch
index 9a3f2c5bc3..5fc274c36a 100644
--- a/Spigot-Server-Patches/0151-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From 3e65aca5cf6438722db5073154a9bffe5c4b16a9 Mon Sep 17 00:00:00 2001
+From a45b8bf015a8d91a39b9780f11c6511dacfe3637 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index eae1690cc6..39ab545756 100644
+index eae1690c..39ab5457 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -334,4 +334,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index eae1690cc6..39ab545756 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index cc9887d040..374cf28fb4 100644
+index cc9887d0..374cf28f 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -228,7 +228,7 @@ public class EntityCreeper extends EntityMonster {
@@ -34,5 +34,5 @@ index cc9887d040..374cf28fb4 100644
  
              entityareaeffectcloud.setSource(this); // CraftBukkit
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0152-Item-canEntityPickup.patch b/Spigot-Server-Patches/0151-Item-canEntityPickup.patch
similarity index 92%
rename from Spigot-Server-Patches/0152-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0151-Item-canEntityPickup.patch
index 94fa4ef7ed..b2f035192d 100644
--- a/Spigot-Server-Patches/0152-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0151-Item-canEntityPickup.patch
@@ -1,11 +1,11 @@
-From 2df124c430e0d7f180c0018523390ce0ab4bf5a5 Mon Sep 17 00:00:00 2001
+From d86bb78367bcdc30f3c49eea150c3d4dcf0562e7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:17 -0500
 Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 1732c1ae95..b5816dc89e 100644
+index 1732c1ae..b5816dc8 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -521,6 +521,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -21,7 +21,7 @@ index 1732c1ae95..b5816dc89e 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 208dad2a34..97c6a8b6bd 100644
+index 208dad2a..97c6a8b6 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -20,6 +20,7 @@ public class EntityItem extends Entity {
@@ -33,7 +33,7 @@ index 208dad2a34..97c6a8b6bd 100644
      public EntityItem(EntityTypes<? extends EntityItem> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index cc593fbc99..3f552b5905 100644
+index cc593fbc..3f552b59 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -48,6 +48,16 @@ public class CraftItem extends CraftEntity implements Item {
@@ -54,5 +54,5 @@ index cc593fbc99..3f552b5905 100644
      public String toString() {
          return "CraftItem";
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0153-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 95%
rename from Spigot-Server-Patches/0153-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch
index a0cff62e35..23485e97fa 100644
--- a/Spigot-Server-Patches/0153-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,11 +1,11 @@
-From 9fde0dfeb5e1a49aba85ebc02f83010db78eb6cc Mon Sep 17 00:00:00 2001
+From 720969ab4cf22fb90dca8adf498dfc3aa28ef74b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:09 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 97c6a8b6bd..8747dc7075 100644
+index 97c6a8b6..8747dc70 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -322,6 +322,7 @@ public class EntityItem extends Entity {
@@ -45,5 +45,5 @@ index 97c6a8b6bd..8747dc7075 100644
                      this.die();
                      itemstack.setCount(i);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0154-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0154-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch
index 290d15d94b..f8e5fb84f3 100644
--- a/Spigot-Server-Patches/0154-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch
@@ -1,11 +1,11 @@
-From b8f60aabc6115c141b7cbf45eb4462d31ea3fbdc Mon Sep 17 00:00:00 2001
+From d6e4a66af39be2c669eaaef75688ead046456760 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:30 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 8747dc7075..5efcc50ab9 100644
+index 8747dc70..5efcc50a 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -9,6 +9,7 @@ import javax.annotation.Nullable;
@@ -40,5 +40,5 @@ index 8747dc7075..5efcc50ab9 100644
                  itemstack.setCount(canHold);
                  // Call legacy event
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch
index cd0afb5dec..095c010311 100644
--- a/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch
@@ -1,11 +1,11 @@
-From d8637d8eaf04e7f109b77ef684fa51fc7c06a206 Mon Sep 17 00:00:00 2001
+From 5b773eb30327f0bf80b195dda85dec7045867fb8 Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 742c21480a..1f1af567b4 100644
+index 742c2148..1f1af567 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -79,6 +79,7 @@ import net.minecraft.server.WorldServer;
@@ -40,5 +40,5 @@ index 742c21480a..1f1af567b4 100644
          // Spigot end
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch
rename to Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch
index 196907ea3b..942ea077b2 100644
--- a/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 8a13422ca62d64fd310c3be8a5273667bbf4d74e Mon Sep 17 00:00:00 2001
+From 210d72e066a073c2bcce64032a1a0037641c369d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 22:11:48 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -7,7 +7,7 @@ Establishes base extension of profile systems for future edits too
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 new file mode 100644
-index 0000000000..b151a13c1b
+index 00000000..b151a13c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 @@ -0,0 +1,280 @@
@@ -293,7 +293,7 @@ index 0000000000..b151a13c1b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 new file mode 100644
-index 0000000000..25836b975b
+index 00000000..25836b97
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 @@ -0,0 +1,30 @@
@@ -329,7 +329,7 @@ index 0000000000..25836b975b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 new file mode 100644
-index 0000000000..3bcdb8f93f
+index 00000000..3bcdb8f9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -0,0 +1,17 @@
@@ -352,7 +352,7 @@ index 0000000000..3bcdb8f93f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 new file mode 100644
-index 0000000000..4b2a67423f
+index 00000000..4b2a6742
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -0,0 +1,29 @@
@@ -387,7 +387,7 @@ index 0000000000..4b2a67423f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 new file mode 100644
-index 0000000000..3aceb0ea8a
+index 00000000..3aceb0ea
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 @@ -0,0 +1,11 @@
@@ -403,7 +403,7 @@ index 0000000000..3aceb0ea8a
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 48f88eaba4..9d0b0c9fc3 100644
+index 48f88eab..9d0b0c9f 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,7 +1,10 @@
@@ -429,7 +429,7 @@ index 48f88eaba4..9d0b0c9fc3 100644
       * Calculates distance between 2 entities
       * @param e1
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 94f9201fc4..ae939c9bda 100644
+index 94f9201f..ae939c9b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1299,7 +1299,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -450,7 +450,7 @@ index 94f9201fc4..ae939c9bda 100644
          return this.minecraftSessionService;
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 581199e6dc..a072222bc5 100644
+index 581199e6..a072222b 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -43,7 +43,7 @@ public class UserCache {
@@ -486,7 +486,7 @@ index 581199e6dc..a072222bc5 100644
  
          private UserCacheEntry(GameProfile gameprofile, Date date) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1f1af567b4..8d23eb0e7b 100644
+index 1f1af567..8d23eb0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -199,6 +199,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -525,5 +525,5 @@ index 1f1af567b4..8d23eb0e7b 100644
      // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0157-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0156-Shoulder-Entities-Release-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0157-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0156-Shoulder-Entities-Release-API.patch
index 3b31c8b661..de2a4b244d 100644
--- a/Spigot-Server-Patches/0157-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0156-Shoulder-Entities-Release-API.patch
@@ -1,11 +1,11 @@
-From 1e1eb3eebc71ab596ea7e07962d7088fe9a00bb4 Mon Sep 17 00:00:00 2001
+From 038221a7da315491055d2512213c6d8b4355cf0c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 5e92f0ddb4..3bd5ddba68 100644
+index 5e92f0dd..3bd5ddba 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1901,20 +1901,44 @@ public abstract class EntityHuman extends EntityLiving {
@@ -58,7 +58,7 @@ index 5e92f0ddb4..3bd5ddba68 100644
      @Override
      public abstract boolean isSpectator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 77ee3c293c..ce84885af6 100644
+index 77ee3c29..ce84885a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -513,6 +513,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -95,5 +95,5 @@ index 77ee3c293c..ce84885af6 100644
      public boolean discoverRecipe(NamespacedKey recipe) {
          return discoverRecipes(Arrays.asList(recipe)) != 0;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0158-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0157-Profile-Lookup-Events.patch
similarity index 96%
rename from Spigot-Server-Patches/0158-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0157-Profile-Lookup-Events.patch
index 2c7af76df9..56f9778755 100644
--- a/Spigot-Server-Patches/0158-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0157-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From b42b5c27a4119a90ee1cc89c9fb4976323c13bdd Mon Sep 17 00:00:00 2001
+From 0b003028c0b8227486c0754b25758d88cb7c3828 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 17:00:32 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
 profiles that had to be looked up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
-index 3bcdb8f93f..bb9894318e 100644
+index 3bcdb8f9..bb989431 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -1,17 +1,68 @@
@@ -81,5 +81,5 @@ index 3bcdb8f93f..bb9894318e 100644
      }
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0159-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch
similarity index 89%
rename from Spigot-Server-Patches/0159-Block-player-logins-during-server-shutdown.patch
rename to Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch
index 0ce863e27c..280945d15e 100644
--- a/Spigot-Server-Patches/0159-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch
@@ -1,11 +1,11 @@
-From a5bc0e06873b8f934ec73ba308bb2d0d381edf7f Mon Sep 17 00:00:00 2001
+From 5cea1f3c04abb99f31437849696d6c764b1aa611 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 2 Jul 2017 21:35:56 -0500
 Subject: [PATCH] Block player logins during server shutdown
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 19e72da6d9..234451ebc8 100644
+index 19e72da6..234451eb 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -49,6 +49,12 @@ public class LoginListener implements PacketLoginInListener {
@@ -22,5 +22,5 @@ index 19e72da6d9..234451ebc8 100644
              this.c();
          } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0160-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch
similarity index 94%
rename from Spigot-Server-Patches/0160-Entity-fromMobSpawner.patch
rename to Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch
index 039d94eaf6..c6d954a290 100644
--- a/Spigot-Server-Patches/0160-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch
@@ -1,11 +1,11 @@
-From 75a0444ae173c51f5eb262f0716845693cd754a6 Mon Sep 17 00:00:00 2001
+From 1c3787786da26275536db40457f0f9693a0813fd Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4f8e10b860..1de1a10cf0 100644
+index 4f8e10b8..1de1a10c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -37,7 +37,7 @@ index 4f8e10b860..1de1a10cf0 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index b249af20c4..ab5d83d34d 100644
+index b249af20..ab5d83d3 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -140,6 +140,7 @@ public abstract class MobSpawnerAbstract {
@@ -49,7 +49,7 @@ index b249af20c4..ab5d83d34d 100644
                          if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockposition).isCancelled()) {
                              Entity vehicle = entity.getVehicle();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index bb07dec3c8..495a7c464f 100644
+index bb07dec3..495a7c46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1045,5 +1045,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -64,5 +64,5 @@ index bb07dec3c8..495a7c464f 100644
      // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0161-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch
similarity index 94%
rename from Spigot-Server-Patches/0161-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch
index cb0f171af9..29f0aa2073 100644
--- a/Spigot-Server-Patches/0161-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From 3363396eb2533f24b7e4408fe9cc3fe2c42fadcc Mon Sep 17 00:00:00 2001
+From e361ca221cfcf1aad706043726600535619007db Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Dec 2016 16:24:06 -0500
 Subject: [PATCH] Improve the Saddle API for Horses
@@ -7,7 +7,7 @@ Not all horses with Saddles have armor. This lets us break up the horses with sa
 and access their saddle state separately from an interface shared with Armor.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 09016e3547..9952db3eb5 100644
+index 09016e35..9952db3e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -6,6 +6,7 @@ import net.minecraft.server.EntityHorseAbstract;
@@ -27,7 +27,7 @@ index 09016e3547..9952db3eb5 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
-index 63991bf4be..9a47a1adc1 100644
+index 63991bf4..9a47a1ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 @@ -4,7 +4,7 @@ import net.minecraft.server.IInventory;
@@ -41,7 +41,7 @@ index 63991bf4be..9a47a1adc1 100644
          super(inventory);
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 new file mode 100644
-index 0000000000..99cfbaf90b
+index 00000000..99cfbaf9
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 @@ -0,0 +1,15 @@
@@ -61,5 +61,5 @@ index 0000000000..99cfbaf90b
 +
 +}
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0162-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch
similarity index 90%
rename from Spigot-Server-Patches/0162-Implement-ensureServerConversions-API.patch
rename to Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch
index 5ed5d56cf0..28e5f06aa1 100644
--- a/Spigot-Server-Patches/0162-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From 28bc2a5976de226d2af3900ba5f40d48df3cc62a Mon Sep 17 00:00:00 2001
+From 5e85d280c3172b657231cc60b3dba12471f8f16c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 22:43:12 -0400
 Subject: [PATCH] Implement ensureServerConversions API
@@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 01ab19434a..8b219b5fa2 100644
+index 01ab1943..8b219b5f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -335,4 +335,10 @@ public final class CraftItemFactory implements ItemFactory {
@@ -22,5 +22,5 @@ index 01ab19434a..8b219b5fa2 100644
 +    // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0163-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch
similarity index 93%
rename from Spigot-Server-Patches/0163-Implement-getI18NDisplayName.patch
rename to Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch
index 162cb28728..fd22892cda 100644
--- a/Spigot-Server-Patches/0163-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From 14dff3cabf6f1b60cf87426b00671a5211f7f3f9 Mon Sep 17 00:00:00 2001
+From b7611f2db448f4fb14eb979adf2212d9283adb3b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:59:38 -0400
 Subject: [PATCH] Implement getI18NDisplayName
@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
-index c0c13798f8..6012739331 100644
+index c0c13798..60127393 100644
 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java
 +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
 @@ -65,10 +65,12 @@ public class LocaleLanguage {
@@ -25,7 +25,7 @@ index c0c13798f8..6012739331 100644
          return this.c(s);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 8b219b5fa2..23d7756456 100644
+index 8b219b5f..23d77564 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -340,5 +340,18 @@ public final class CraftItemFactory implements ItemFactory {
@@ -48,5 +48,5 @@ index 8b219b5fa2..23d7756456 100644
      // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0164-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0164-ProfileWhitelistVerifyEvent.patch
rename to Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch
index 679a509e87..0e59605d09 100644
--- a/Spigot-Server-Patches/0164-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch
@@ -1,11 +1,11 @@
-From 1d9d4821b898167d2b6ea80a9655c6838eecf706 Mon Sep 17 00:00:00 2001
+From e4cd3b233ea376d63831b573a85821dfa5ad8d9f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 77f1ddc8a..a61815c79 100644
+index 77f1ddc8..a61815c7 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -509,9 +509,9 @@ public abstract class PlayerList {
@@ -48,5 +48,5 @@ index 77f1ddc8a..a61815c79 100644
      public boolean isOp(GameProfile gameprofile) {
          return this.operators.d(gameprofile) || this.server.a(gameprofile) && this.server.getWorldServer(DimensionManager.OVERWORLD).getWorldData().t() || this.u;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0165-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch
similarity index 93%
rename from Spigot-Server-Patches/0165-Fix-this-stupid-bullshit.patch
rename to Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch
index a2b771c290..72118430c3 100644
--- a/Spigot-Server-Patches/0165-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From ecf6ec4205b6e9d942dd5890913b264c0ce81aa8 Mon Sep 17 00:00:00 2001
+From e772f359fd89943ec103233db8479e790d5e4689 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sun, 6 Aug 2017 17:17:53 -0500
 Subject: [PATCH] Fix this stupid bullshit
@@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
 and to provide some level of hint without being disruptive.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 0e76e34664..444a6a608b 100644
+index 0e76e346..444a6a60 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -218,10 +218,12 @@ public class Main {
@@ -29,5 +29,5 @@ index 0e76e34664..444a6a608b 100644
                  }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0166-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 87%
rename from Spigot-Server-Patches/0166-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch
index a505183754..ffd8c9b856 100644
--- a/Spigot-Server-Patches/0166-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch
@@ -1,11 +1,11 @@
-From fd673275e5f2f533af7c23ca18c3a13bbf6cadaf Mon Sep 17 00:00:00 2001
+From 0d3f6d75f7837c2048c4ed5d07861db136f7bb26 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:54:40 -0500
 Subject: [PATCH] Ocelot despawns should honor nametags and leash
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index 0624114553..d9a7b8ac1e 100644
+index 06241145..d9a7b8ac 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -81,7 +81,7 @@ public class EntityOcelot extends EntityAnimal {
@@ -18,5 +18,5 @@ index 0624114553..d9a7b8ac1e 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 91%
rename from Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 4ce4e1c457..d387ec74b9 100644
--- a/Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -1,11 +1,11 @@
-From cf2f4b1e5981127d40f7acb4f39b34a05271a8a0 Mon Sep 17 00:00:00 2001
+From 0a60c7d137249b42e32668e922eba7d6e637ace7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:45:19 -0500
 Subject: [PATCH] Reset spawner timer when spawner event is cancelled
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index ab5d83d34d..c38295a09d 100644
+index ab5d83d3..c38295a0 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -142,6 +142,7 @@ public abstract class MobSpawnerAbstract {
@@ -26,5 +26,5 @@ index ab5d83d34d..c38295a09d 100644
                  }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 91%
rename from Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index ccd7860244..37f043d79c 100644
--- a/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -1,11 +1,11 @@
-From 529e676c1d75d76e73012bc1d0fd5bcd8e42c499 Mon Sep 17 00:00:00 2001
+From c1379fc6595e8463a7e9c7c27c31f24e1f93868f Mon Sep 17 00:00:00 2001
 From: mezz <tehgeek@gmail.com>
 Date: Wed, 9 Aug 2017 17:51:22 -0500
 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9632839598..14c97a163c 100644
+index 96328395..14c97a16 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -647,7 +647,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -22,5 +22,5 @@ index 9632839598..14c97a163c 100644
              this.tileEntityListUnload.clear();
          }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0169-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 94%
rename from Spigot-Server-Patches/0169-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch
index a500be84ca..abb728bd61 100644
--- a/Spigot-Server-Patches/0169-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -1,4 +1,4 @@
-From 8216a8c6dd17b26814884d2e64542a03f3779544 Mon Sep 17 00:00:00 2001
+From 9b4d6efc58a480aea2f77b4bc5805ab81571ea64 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 17 Aug 2017 16:08:20 -0700
 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 295b8390cb..5884b04f7e 100644
+index 295b8390..5884b04f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -27,7 +27,7 @@ index 295b8390cb..5884b04f7e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 234451ebc8..758fe77489 100644
+index 234451eb..758fe774 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -247,6 +247,10 @@ public class LoginListener implements PacketLoginInListener {
@@ -42,5 +42,5 @@ index 234451ebc8..758fe77489 100644
                              LoginListener.LOGGER.error("Couldn't verify username because servers are unavailable");
                          }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0170-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0169-LivingEntity-setKiller.patch
similarity index 92%
rename from Spigot-Server-Patches/0170-LivingEntity-setKiller.patch
rename to Spigot-Server-Patches/0169-LivingEntity-setKiller.patch
index 471e4cbc8c..e3809ab975 100644
--- a/Spigot-Server-Patches/0170-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0169-LivingEntity-setKiller.patch
@@ -1,11 +1,11 @@
-From 7240dff14641c3f58898416b67cf426b31cc71d4 Mon Sep 17 00:00:00 2001
+From a1835d11de28874c38029a3b057ee27b6818ad23 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:48 -0500
 Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b31355f2be..c7b62872c4 100644
+index b31355f2..c7b62872 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity {
@@ -18,7 +18,7 @@ index b31355f2be..c7b62872c4 100644
      protected int ticksFarFromPlayer;
      protected float aR;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index e38f4f6910..23a4819992 100644
+index e38f4f69..23a48199 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -318,6 +318,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -39,5 +39,5 @@ index e38f4f6910..23a4819992 100644
      public boolean addPotionEffect(PotionEffect effect) {
          return addPotionEffect(effect, false);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
similarity index 93%
rename from Spigot-Server-Patches/0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
rename to Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
index 82360381b9..108893d05d 100644
--- a/Spigot-Server-Patches/0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@@ -1,4 +1,4 @@
-From b0bb87241e3ca3a38ee92fdcc0260fabedf9363e Mon Sep 17 00:00:00 2001
+From cc7eb34ab0d7d3ed2ac9c1133b0867d3f46c0227 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Mon, 18 Sep 2017 12:00:03 +0200
 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
@@ -12,7 +12,7 @@ results in a separate line, even though it should not result in
 a line break. Log4j's implementation handles it correctly.
 
 diff --git a/pom.xml b/pom.xml
-index b1f008738b..14c4ec250c 100644
+index b1f00873..14c4ec25 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,11 @@
@@ -28,7 +28,7 @@ index b1f008738b..14c4ec250c 100644
              <groupId>org.ow2.asm</groupId>
              <artifactId>asm</artifactId>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index d34f772fae..ec257ba31f 100644
+index d34f772f..ec257ba3 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -155,8 +155,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -45,5 +45,5 @@ index d34f772fae..ec257ba31f 100644
  
          thread.setDaemon(true);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0172-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 95%
rename from Spigot-Server-Patches/0172-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch
index a1d61ed3d9..f911527390 100644
--- a/Spigot-Server-Patches/0172-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -1,4 +1,4 @@
-From 617fb94e256f7eafc1660a273e40c925fbf98d3a Mon Sep 17 00:00:00 2001
+From d1c079b07d209c70bf52c519ce4b2cfc5a2a9fe0 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:55 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J configuration
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/pom.xml b/pom.xml
-index 14c4ec250c..5a230592c7 100644
+index 14c4ec25..5a230592 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -61,7 +61,7 @@
@@ -28,7 +28,7 @@ index 14c4ec250c..5a230592c7 100644
          <dependency>
              <groupId>org.apache.logging.log4j</groupId>
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index fdca34346a..6d77bbc5aa 100644
+index fdca3434..6d77bbc5 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -286,7 +286,7 @@ public class SpigotConfig
@@ -41,7 +41,7 @@ index fdca34346a..6d77bbc5aa 100644
  
      public static int playerShuffle;
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 620b9490e5..a8bdaaeaa1 100644
+index 620b9490..a8bdaaea 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -5,10 +5,22 @@
@@ -70,5 +70,5 @@ index 620b9490e5..a8bdaaeaa1 100644
                  <TimeBasedTriggeringPolicy />
                  <OnStartupTriggeringPolicy />
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch
similarity index 85%
rename from Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch
index 5bad5f5cec..a03554a39c 100644
--- a/Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch
@@ -1,11 +1,11 @@
-From a0aeb66881e3e84c2a5407d063d82f7de394c5e6 Mon Sep 17 00:00:00 2001
+From a40b48933c0e67d7f6146cf6a40d377a33b54857 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:35 +0200
 Subject: [PATCH] Include Log4J2 SLF4J implementation
 
 
 diff --git a/pom.xml b/pom.xml
-index 5a230592c7..6f2fe9c26d 100644
+index 5a230592..6f2fe9c2 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,12 @@
@@ -22,5 +22,5 @@ index 5a230592c7..6f2fe9c26d 100644
              <groupId>org.apache.logging.log4j</groupId>
              <artifactId>log4j-iostreams</artifactId>
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch
similarity index 94%
rename from Spigot-Server-Patches/0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch
rename to Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch
index 08cd867167..3eb53da96a 100644
--- a/Spigot-Server-Patches/0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@@ -1,4 +1,4 @@
-From b387c73dbdd9f6418d40c1d290fd1334dc3200ae Mon Sep 17 00:00:00 2001
+From 660ce1760bc0098207da4b3458e9e4bcccba1ce0 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Sat, 23 Sep 2017 21:07:20 +0200
 Subject: [PATCH] Disable logger prefix for various plugins bypassing the
@@ -11,7 +11,7 @@ log. Disable the logger prefix for these plugins so the messages
 show up correctly.
 
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index a8bdaaeaa1..a9bb987652 100644
+index a8bdaaea..a9bb9876 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -8,7 +8,8 @@
@@ -35,5 +35,5 @@ index a8bdaaeaa1..a9bb987652 100644
                  </LoggerNamePatternSelector>
              </PatternLayout>
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0175-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0175-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch
index b9a85a2a38..4d7398290d 100644
--- a/Spigot-Server-Patches/0175-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch
@@ -1,11 +1,11 @@
-From c2abf57d9f2f352fdb91ac63edf5966985e3cc6d Mon Sep 17 00:00:00 2001
+From b3f78ad92fa558d6b564b0d5c9b33a043e6e37a5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 046ef418f8..b0651dcfbf 100644
+index 046ef418..b0651dcf 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory;
@@ -54,5 +54,5 @@ index 046ef418f8..b0651dcfbf 100644
  
                              this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch
similarity index 94%
rename from Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch
index a130da6225..aae6308df4 100644
--- a/Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From 0c913b8e40c90661a114f2387020d5967d32eb78 Mon Sep 17 00:00:00 2001
+From cd8cd2fea7a78279d7558e213bfd0c2ccee8745e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 5 Oct 2017 01:54:07 +0100
 Subject: [PATCH] handle PacketPlayInKeepAlive async
@@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b0651dcfbf..d4a649a83f 100644
+index b0651dcf..d4a649a8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2487,14 +2487,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -40,5 +40,5 @@ index b0651dcfbf..d4a649a83f 100644
  
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch
similarity index 95%
rename from Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch
index 9418e97f04..871a43521c 100644
--- a/Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From bb5e450c8154a82323f388c18893110db3d8d1cf Mon Sep 17 00:00:00 2001
+From 58ad26ff9c4f0a9dd0b33e00d751122ae46431f5 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 new file mode 100644
-index 0000000000..5caca6439d
+index 00000000..5caca643
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 @@ -0,0 +1,50 @@
@@ -61,7 +61,7 @@ index 0000000000..5caca6439d
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index d0b9c6e3dc..8928d93e49 100644
+index d0b9c6e3..8928d93e 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -84,7 +84,7 @@ index d0b9c6e3dc..8928d93e49 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 3ccf166366..e2d8ed88f0 100644
+index 3ccf1663..e2d8ed88 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -60,6 +60,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -99,7 +99,7 @@ index 3ccf166366..e2d8ed88f0 100644
      public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
          this.h = enumprotocoldirection;
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
-index 4f008e4723..8545146fb1 100644
+index 4f008e47..8545146f 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -35,6 +35,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@@ -111,7 +111,7 @@ index 4f008e4723..8545146fb1 100644
          return this.a;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d1745c4e93..129aefd5e8 100644
+index d1745c4e..129aefd5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -183,6 +183,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -136,5 +136,5 @@ index d1745c4e93..129aefd5e8 100644
      public double getEyeHeight(boolean ignorePose) {
          if (ignorePose) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0178-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0177-revert-serverside-behavior-of-keepalives.patch
similarity index 97%
rename from Spigot-Server-Patches/0178-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0177-revert-serverside-behavior-of-keepalives.patch
index c69f99b6e6..c496f42cb6 100644
--- a/Spigot-Server-Patches/0178-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0177-revert-serverside-behavior-of-keepalives.patch
@@ -1,4 +1,4 @@
-From 6aa1944d363b484140359ea7e5a822ab4d00e06b Mon Sep 17 00:00:00 2001
+From 61fd7a176ae3d7230ee00efa5f238370ef29d432 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Oct 2017 00:29:07 +0100
 Subject: [PATCH] revert serverside behavior of keepalives
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d4a649a83f..2a3771d065 100644
+index d4a649a8..2a3771d0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -70,7 +70,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -74,5 +74,5 @@ index d4a649a83f..2a3771d065 100644
          this.minecraftServer.getMethodProfiler().exit();
          // CraftBukkit start
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 97%
rename from Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 885d1e895a..e950b2fdd8 100644
--- a/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -1,4 +1,4 @@
-From 3525cf56eab8d92724da5d7edea7a0419569fab1 Mon Sep 17 00:00:00 2001
+From 6ff7e04ed57eaba5dcacbac55ad5d68de9e82eb0 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 31 Oct 2017 03:26:18 +0100
 Subject: [PATCH] Send attack SoundEffects only to players who can see the
@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 3bd5ddba68..c86d22e7ae 100644
+index 3bd5ddba..c86d22e7 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1023,6 +1023,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -72,7 +72,7 @@ index 3bd5ddba68..c86d22e7ae 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 14c97a163c..a956dbc3d4 100644
+index 14c97a16..a956dbc3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -584,6 +584,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -88,5 +88,5 @@ index 14c97a163c..a956dbc3d4 100644
  
      public abstract void playSound(@Nullable EntityHuman entityhuman, Entity entity, SoundEffect soundeffect, SoundCategory soundcategory, float f, float f1);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 95%
rename from Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch
index e83e03a996..6ed50486a5 100644
--- a/Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,11 +1,11 @@
-From cab727503baa63f9dd0f50b9bada3ea554a404d5 Mon Sep 17 00:00:00 2001
+From 79780ca45f8bce43fbcdd664e0c3ddd5ff0beca5 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 39ab545756..d2582d981f 100644
+index 39ab5457..d2582d98 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -340,4 +340,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 39ab545756..d2582d981f 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c45b7c15fc..dbda8b35aa 100644
+index c45b7c15..dbda8b35 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -542,16 +542,32 @@ public class CraftEventFactory {
@@ -60,5 +60,5 @@ index c45b7c15fc..dbda8b35aa 100644
          // Spigot end
          } else if (!(entity instanceof EntityPlayer)) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0181-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0181-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch
index 17b33b779b..4530a77a84 100644
--- a/Spigot-Server-Patches/0181-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch
@@ -1,11 +1,11 @@
-From 4971f3493441d4522d32bb68cc230904d169fd37 Mon Sep 17 00:00:00 2001
+From ac291d00f151d73d3d718328ed97714ece0a4de8 Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c7b62872c4..fe0b082206 100644
+index c7b62872..fe0b0822 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1,5 +1,6 @@
@@ -30,7 +30,7 @@ index c7b62872c4..fe0b082206 100644
                      if (!itemstack.isEmpty()) {
                          this.getAttributeMap().a(itemstack.a(enumitemslot));
 diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
-index 02a7ae6785..60b235f16f 100644
+index 02a7ae67..60b235f1 100644
 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java
 +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
 @@ -16,6 +16,7 @@ public enum EnumItemSlot {
@@ -42,5 +42,5 @@ index 02a7ae6785..60b235f16f 100644
          return this.g;
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0182-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 89%
rename from Spigot-Server-Patches/0182-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch
index 5cf7f757aa..c07ce7b5c2 100644
--- a/Spigot-Server-Patches/0182-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -1,4 +1,4 @@
-From 27b2bf36570fce673b15bb60da0050e7cccb364c Mon Sep 17 00:00:00 2001
+From 01a3a6042dd4a983e00627fd7098d0cb6e5a3375 Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Sun, 12 Nov 2017 19:40:01 +0100
 Subject: [PATCH] Prevent logins from being processed when the player has
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 758fe77489..1fb609dcfc 100644
+index 758fe774..1fb609dc 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -56,7 +56,11 @@ public class LoginListener implements PacketLoginInListener {
@@ -23,5 +23,5 @@ index 758fe77489..1fb609dcfc 100644
              EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId());
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 96%
rename from Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch
index 3fd7316a14..afc896dc92 100644
--- a/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch
@@ -1,4 +1,4 @@
-From acb4e329c24a42d0fa90ca0f05b0a24e885c97c5 Mon Sep 17 00:00:00 2001
+From 92d1e8f03547840bcefbbc9f9bc7edd35b521907 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 16 Nov 2017 12:12:41 +0000
 Subject: [PATCH] use CB BlockState implementations for captured blocks
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a956dbc3d4..2f57c7bc76 100644
+index a956dbc3..2f57c7bc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -66,7 +66,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -58,5 +58,5 @@ index a956dbc3d4..2f57c7bc76 100644
                  return previous.getHandle();
              }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 96%
rename from Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch
index 847138c579..47b9f76da1 100644
--- a/Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From a14f5b0c6cc0718f0811156f67ed304439a657cc Mon Sep 17 00:00:00 2001
+From e1c64c1bb29a3243a08d22459101f338e858ee41 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:08:22 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
 If Tile Entity was null, correct Sign to return empty lines instead of null
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 630b279158..958279249f 100644
+index 630b2791..95827924 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -231,7 +231,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -39,7 +39,7 @@ index 630b279158..958279249f 100644
          return null;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index eb0201ebe1..1354d949c1 100644
+index eb0201eb..1354d949 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -311,6 +311,20 @@ public class CraftBlock implements Block {
@@ -64,7 +64,7 @@ index eb0201ebe1..1354d949c1 100644
  
          switch (material) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 17d80b5c6e..f6401e2cde 100644
+index 17d80b5c..f6401e2c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -26,20 +26,40 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -114,7 +114,7 @@ index 17d80b5c6e..f6401e2cde 100644
  
      private T createSnapshot(T tileEntity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index 15022ada0c..af15656cc4 100644
+index 15022ada..af15656c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -17,10 +17,12 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements
@@ -131,5 +131,5 @@ index 15022ada0c..af15656cc4 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch
index 61ab32dad0..945dc5b32b 100644
--- a/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From 0576e19db0d775933920f1cb9162db2501a793dc Mon Sep 17 00:00:00 2001
+From a21a5ec7909615a49eccd6c6445cc5f16c01df44 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2a3771d065..64f789d7c4 100644
+index 2a3771d0..64f789d7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -524,10 +524,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -72,7 +72,7 @@ index 2a3771d065..64f789d7c4 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8d23eb0e7b..b7eaa0fef9 100644
+index 8d23eb0e..b7eaa0fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1709,7 +1709,7 @@ public final class CraftServer implements Server {
@@ -85,7 +85,7 @@ index 8d23eb0e7b..b7eaa0fef9 100644
  
          return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 5510266fb1..a51202ed53 100644
+index 5510266f..a51202ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer {
@@ -129,5 +129,5 @@ index 5510266fb1..a51202ed53 100644
          Waitable<List<String>> waitable = new Waitable<List<String>>() {
              @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0186-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 87%
rename from Spigot-Server-Patches/0186-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch
index 89a45e6ede..3d2acc70fd 100644
--- a/Spigot-Server-Patches/0186-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch
@@ -1,11 +1,11 @@
-From 2b3b0cbd50b62a4cbb5aefd0b332e23b44e6caef Mon Sep 17 00:00:00 2001
+From 3448dbfbbe909b6309363e11ba5142a39c4b559f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Nov 2017 22:18:54 -0500
 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
-index eafdcb916a..d37a2fa0ab 100644
+index eafdcb91..d37a2fa0 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 @@ -55,7 +55,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
@@ -18,5 +18,5 @@ index eafdcb916a..d37a2fa0ab 100644
          }
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0187-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch
similarity index 91%
rename from Spigot-Server-Patches/0187-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch
index 85b4cdc998..b4e415b8b5 100644
--- a/Spigot-Server-Patches/0187-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From 0823f1c7545f4e5c4a1ee0ae4f16987b820e34f7 Mon Sep 17 00:00:00 2001
+From a1deab71b1071eb4508794a3d294c966c435e0fa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index d4275e733d..b3edb69a96 100644
+index d4275e73..b3edb69a 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -222,7 +222,7 @@ public class EntityExperienceOrb extends Entity {
@@ -19,5 +19,5 @@ index d4275e733d..b3edb69a96 100644
                  entityhuman.receive(this, 1);
                  Entry<EnumItemSlot, ItemStack> entry = EnchantmentManager.b(Enchantments.MENDING, (EntityLiving) entityhuman);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch
index 617179c7c7..e7118dbd10 100644
--- a/Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From 12dcb77bba6dddc5a70327d0b537909f14e70614 Mon Sep 17 00:00:00 2001
+From 15351f65aacd707684c22266856d744f098de87e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -8,7 +8,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index dbda8b35aa..f9b0f39f78 100644
+index dbda8b35..f9b0f39f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -552,7 +552,7 @@ public class CraftEventFactory {
@@ -21,5 +21,5 @@ index dbda8b35aa..f9b0f39f78 100644
                              if ((int) newTotal < 0) continue; // Overflow
                              if (maxValue > 0 && newTotal > (long)maxValue) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch
index 19c1138897..9bebf98fed 100644
--- a/Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From 2ddd8eb72ea47d200d3dbd78ecae35a33a76de34 Mon Sep 17 00:00:00 2001
+From 5cfbc50e91161d98eebeef3974b5e40dfd7a4920 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index 1822178e8d..d96c03a1a1 100644
+index 1822178e..d96c03a1 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -246,6 +246,11 @@ public class EnchantmentManager {
@@ -26,7 +26,7 @@ index 1822178e8d..d96c03a1a1 100644
      public static Entry<EnumItemSlot, ItemStack> b(Enchantment enchantment, EntityLiving entityliving) {
          Map<EnumItemSlot, ItemStack> map = enchantment.a(entityliving);
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index b3edb69a96..87c6b77ce3 100644
+index b3edb69a..87c6b77c 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -254,10 +254,12 @@ public class EntityExperienceOrb extends Entity {
@@ -43,7 +43,7 @@ index b3edb69a96..87c6b77ce3 100644
          return i * 2;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 129aefd5e8..6d46fa23d2 100644
+index 129aefd5..6d46fa23 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1018,8 +1018,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -86,5 +86,5 @@ index 129aefd5e8..6d46fa23d2 100644
      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0190-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch
similarity index 93%
rename from Spigot-Server-Patches/0190-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch
index cf2c5f8307..5010a35dc4 100644
--- a/Spigot-Server-Patches/0190-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch
@@ -1,4 +1,4 @@
-From fede97cace00c5730920e207569e01eb725ed0c0 Mon Sep 17 00:00:00 2001
+From d72d7c2745dafb5a961d0f6ae0d3c5f8e974a669 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
@@ -7,7 +7,7 @@ I don't know why upstream made only the minimum height configurable but
 whatever
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d2582d981f..92e6891502 100644
+index d2582d98..92e68915 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -346,4 +346,9 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index d2582d981f..92e6891502 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 8c4f3b2c2e..1c1ff2069d 100644
+index 8c4f3b2c..1c1ff206 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -171,7 +171,8 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -35,5 +35,5 @@ index 8c4f3b2c2e..1c1ff2069d 100644
  
      public void a(float f, float f1, float f2) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0191-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0191-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch
index 6df6e08ff1..49fd4652ce 100644
--- a/Spigot-Server-Patches/0191-PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 47f642cc207303a6afcdc93b2f5feaa19349a945 Mon Sep 17 00:00:00 2001
+From d82b5b0a49ae6f72dd7d3889eca92c0869e8150e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@@ -15,7 +15,7 @@ instead and save a lot of server resources.
 See: https://github.com/PaperMC/Paper/issues/917
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index c38295a09d..43c491f71b 100644
+index c38295a0..43c491f7 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -105,6 +105,27 @@ public abstract class MobSpawnerAbstract {
@@ -47,7 +47,7 @@ index c38295a09d..43c491f71b 100644
                              entity1.setPositionRotation(d3, d4, d5, entity1.yaw, entity1.pitch);
                              return entity1;
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 02157d051f..224443e03c 100644
+index 02157d05..224443e0 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -38,7 +38,7 @@ public final class SpawnerCreature {
@@ -86,5 +86,5 @@ index 02157d051f..224443e03c 100644
                                                              Entity entity = entitytypes.a((World) worldserver);
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch
index 9367ad51b7..9fa447f56c 100644
--- a/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From f55042716d3ac30f4e1bf608bb667c23eea4047c Mon Sep 17 00:00:00 2001
+From 311435ed23ad169d182172814b2198d4cdd0b124 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:36:02 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 554013a98..05534126a 100644
+index 554013a9..05534126 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -587,6 +587,15 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -29,7 +29,7 @@ index 554013a98..05534126a 100644
                  Optional<Chunk> optional = ((Either) playerchunk.b().getNow(PlayerChunk.UNLOADED_CHUNK)).left();
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1296eb04f..625b68428 100644
+index 95e09e35..d8721ab2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1,5 +1,6 @@
@@ -48,7 +48,7 @@ index 1296eb04f..625b68428 100644
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer> cachedSingleHashSet; // Paper
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 936fc4f6b..fcf229ad5 100644
+index 936fc4f6..fcf229ad 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -881,12 +881,23 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -78,5 +78,5 @@ index 936fc4f6b..fcf229ad5 100644
      }
  
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 96%
rename from Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch
rename to Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch
index a74eefad24..abb6661755 100644
--- a/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch
@@ -1,4 +1,4 @@
-From fc10f8c932094ea48409d91d5b7c286a42adb2bf Mon Sep 17 00:00:00 2001
+From 9f7326144c684306ed2ac5822ef8fa8c82f4d26f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:36:25 -0500
 Subject: [PATCH] Add setPlayerProfile API for Skulls
@@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
 which commonly cause rate limit issues with Mojang API
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
-index a4bc7f9701..2dd2f476f0 100644
+index a4bc7f97..2dd2f476 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
 @@ -1,5 +1,7 @@
@@ -48,7 +48,7 @@ index a4bc7f9701..2dd2f476f0 100644
      public BlockFace getRotation() {
          BlockData blockData = getBlockData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 4fb27cc7ed..96d62bbf88 100644
+index 4fb27cc7..96d62bbf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -3,6 +3,8 @@ package org.bukkit.craftbukkit.inventory;
@@ -89,5 +89,5 @@ index 4fb27cc7ed..96d62bbf88 100644
      public OfflinePlayer getOwningPlayer() {
          if (hasOwner()) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0194-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch
similarity index 94%
rename from Spigot-Server-Patches/0194-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch
index 89b77cf3db..7feb281d05 100644
--- a/Spigot-Server-Patches/0194-Fill-Profile-Property-Events.patch
+++ b/Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From 3f27703850252713fd6574d265c8caad71847b20 Mon Sep 17 00:00:00 2001
+From 1f4c9a9620489ca343683979c02bc5bdf5e33514 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 2 Jan 2018 00:31:26 -0500
 Subject: [PATCH] Fill Profile Property Events
@@ -11,7 +11,7 @@ If Mojang API does need to be hit, event fire so you can get the results.
 This is useful for implementing a ProfileCache for Player Skulls
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
-index 4b2a67423f..61cfdf73c8 100644
+index 4b2a6742..61cfdf73 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -1,5 +1,7 @@
@@ -40,5 +40,5 @@ index 4b2a67423f..61cfdf73c8 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0195-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch
similarity index 89%
rename from Spigot-Server-Patches/0195-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch
index f5045ae003..e469850706 100644
--- a/Spigot-Server-Patches/0195-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,11 +1,11 @@
-From a8c6001fe5db7539f88f646d7d5eb2f696e0c512 Mon Sep 17 00:00:00 2001
+From b7076ba2ea9bf32e67b02aa7d808d3726faf9046 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jan 2018 08:15:29 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index ca661f3933..c41e138472 100644
+index ca661f39..c41e1384 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 @@ -276,6 +276,12 @@ public class AdvancementDataPlayer {
@@ -22,5 +22,5 @@ index ca661f3933..c41e138472 100644
              this.i.add(advancement);
              flag = true;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0196-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch
similarity index 98%
rename from Spigot-Server-Patches/0196-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch
index 2294481254..8b1d58843c 100644
--- a/Spigot-Server-Patches/0196-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From da394890b3d09b3f04b96db7370d5ab7f5a25f5d Mon Sep 17 00:00:00 2001
+From b5fdde6eeed609cb641c841f2369c8da3ce8f542 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:04:14 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -13,7 +13,7 @@ starting point for future additions in this area.
 Fixes GH-559
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
-index f700522840..3723faccac 100644
+index f7005228..3723facc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 @@ -8,13 +8,39 @@ import org.bukkit.Material;
@@ -267,7 +267,7 @@ index f700522840..3723faccac 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index bd9e09f999..0682c6e859 100644
+index bd9e09f9..0682c6e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -1429,7 +1429,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@@ -288,7 +288,7 @@ index bd9e09f999..0682c6e859 100644
              }
              return HANDLED_TAGS;
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 6302339601..3a82bede7c 100644
+index 63023396..3a82bede 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -6,6 +6,7 @@ import java.util.ArrayList;
@@ -308,5 +308,5 @@ index 6302339601..3a82bede7c 100644
                      return cleanStack;
                  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0197-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch
similarity index 97%
rename from Spigot-Server-Patches/0197-Extend-Player-Interact-cancellation.patch
rename to Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch
index e02d8003ad..eef9281290 100644
--- a/Spigot-Server-Patches/0197-Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch
@@ -1,4 +1,4 @@
-From afa8825160769feb030e751d9fc2f2732bf2c42d Mon Sep 17 00:00:00 2001
+From 24136f5fe9c8145e07f6469d31e47687113eb3b7 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Feb 2018 10:43:46 +0000
 Subject: [PATCH] Extend Player Interact cancellation
@@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds
 when cancelling interaction.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index dff3eb1188..e2e5c17c24 100644
+index dff3eb11..e2e5c17c 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -137,6 +137,11 @@ public class PlayerInteractManager {
@@ -55,5 +55,5 @@ index dff3eb1188..e2e5c17c24 100644
              enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
          } else if (this.gamemode == EnumGamemode.SPECTATOR) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0198-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch
similarity index 90%
rename from Spigot-Server-Patches/0198-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch
index 351d71d530..db57bce1e8 100644
--- a/Spigot-Server-Patches/0198-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 0d7c76b8b8abda694580589ff8aead9247d81c2f Mon Sep 17 00:00:00 2001
+From 876ea6519418b03a17dc24683e90c2d4d655d406 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 01:14:55 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 9952db3eb5..1aea5f3f05 100644
+index 9952db3e..1aea5f3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -90,6 +90,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
@@ -21,7 +21,7 @@ index 9952db3eb5..1aea5f3f05 100644
          return getHandle().getOwnerUUID();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
-index 5dfa40dda1..407b95cafd 100644
+index 5dfa40dd..407b95ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 @@ -17,6 +17,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
@@ -35,5 +35,5 @@ index 5dfa40dda1..407b95cafd 100644
          try {
              return getHandle().getOwnerUUID();
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 92%
rename from Spigot-Server-Patches/0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 3072c3b269..8499f6c6d9 100644
--- a/Spigot-Server-Patches/0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,11 +1,11 @@
-From 6c2bfd814f3b7de618aecd0ddb77fabf622d8a7f Mon Sep 17 00:00:00 2001
+From 95800827cdcc7fae8fa36289665c51b72aa4c540 Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sat, 10 Mar 2018 00:50:24 +0100
 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 92e6891502..77cdbfadf9 100644
+index 92e68915..77cdbfad 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -187,6 +187,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 92e6891502..77cdbfadf9 100644
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index c86d22e7ae..3fe13fe489 100644
+index c86d22e7..3fe13fe4 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1063,6 +1063,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -33,5 +33,5 @@ index c86d22e7ae..3fe13fe489 100644
                      if (flag2) {
                          f *= 1.5F;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
similarity index 91%
rename from Spigot-Server-Patches/0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
rename to Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
index fcf534569e..67fb0bc347 100644
--- a/Spigot-Server-Patches/0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
+++ b/Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
@@ -1,4 +1,4 @@
-From d48f8ffe7c980bd2e8c646dfb2c21669f20b2438 Mon Sep 17 00:00:00 2001
+From 2d743a0d990859ae40ffedb1d72a2cc2c9e7f58b Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Mar 2018 13:03:49 +0000
 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
 
 
 diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
-index 5a9ac3960d..fd31b9a6dc 100644
+index 5a9ac396..fd31b9a6 100644
 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
 +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
 @@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder;
@@ -27,5 +27,5 @@ index 5a9ac3960d..fd31b9a6dc 100644
      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index e0d5d6626c..8344d202b9 100644
--- a/Spigot-Server-Patches/0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
@@ -1,11 +1,11 @@
-From 78c923236c7a238eabab0ff9c203ced8c36c26ac Mon Sep 17 00:00:00 2001
+From 5aeca8ddfade5486b63bfe4ada70a48864218d47 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Mar 2018 16:33:15 -0500
 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index 5e414138e4..638a0aa5ae 100644
+index 5e414138..638a0aa5 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -26,8 +26,8 @@ public class BlockIceFrost extends BlockIce {
@@ -29,5 +29,5 @@ index 5e414138e4..638a0aa5ae 100644
                      if (j >= i) {
                          boolean flag = false;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0202-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 93%
rename from Spigot-Server-Patches/0202-Disable-Explicit-Network-Manager-Flushing.patch
rename to Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch
index 4271b1a649..609d184ef3 100644
--- a/Spigot-Server-Patches/0202-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch
@@ -1,4 +1,4 @@
-From 04090444d216cfef3013a9ecb2232fc318c30146 Mon Sep 17 00:00:00 2001
+From 2d02e01cb976c09b298b6191b4fa7b8f6ffbd96d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 11 Mar 2018 14:13:33 -0400
 Subject: [PATCH] Disable Explicit Network Manager Flushing
@@ -12,7 +12,7 @@ flushing on the netty event loop, so it won't do the flush on the main thread.
 Renable flushing by passing -Dpaper.explicit-flush=true
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index e2d8ed88f0..08e314af7c 100644
+index e2d8ed88..08e314af 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -63,6 +63,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -33,5 +33,5 @@ index e2d8ed88f0..08e314af7c 100644
  
          if (this.t++ % 20 == 0) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0203-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0203-Implement-extended-PaperServerListPingEvent.patch
rename to Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch
index 292bbfc4de..f1e41ec829 100644
--- a/Spigot-Server-Patches/0203-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From dd7f18e4ff17100f5e82d7b83b4037cf8bec4da2 Mon Sep 17 00:00:00 2001
+From eee8827333c0691fa54044406451dd2c626b43a0 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 15:56:26 +0200
 Subject: [PATCH] Implement extended PaperServerListPingEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement extended PaperServerListPingEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
 new file mode 100644
-index 000000000..c1a8e295b
+index 00000000..c1a8e295
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
 @@ -0,0 +1,31 @@
@@ -43,7 +43,7 @@ index 000000000..c1a8e295b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
 new file mode 100644
-index 000000000..a2a409e63
+index 00000000..a2a409e6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
 @@ -0,0 +1,11 @@
@@ -60,7 +60,7 @@ index 000000000..a2a409e63
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 new file mode 100644
-index 000000000..a85466bc7
+index 00000000..a85466bc
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 @@ -0,0 +1,112 @@
@@ -177,7 +177,7 @@ index 000000000..a85466bc7
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ae939c9bd..b292e5046 100644
+index ae939c9b..b292e504 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,6 +1,9 @@
@@ -200,7 +200,7 @@ index ae939c9bd..b292e5046 100644
  
              for (int k = 0; k < agameprofile.length; ++k) {
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index 658ea609c..4bb21c48b 100644
+index 658ea609..4bb21c48 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
 @@ -37,6 +37,8 @@ public class PacketStatusListener implements PacketStatusInListener {
@@ -223,7 +223,7 @@ index 658ea609c..4bb21c48b 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
-index aa125a52d..ea52e89bd 100644
+index aa125a52..ea52e89b 100644
 --- a/src/main/java/net/minecraft/server/ServerPing.java
 +++ b/src/main/java/net/minecraft/server/ServerPing.java
 @@ -29,6 +29,7 @@ public class ServerPing {
@@ -248,7 +248,7 @@ index aa125a52d..ea52e89bd 100644
              this.c = agameprofile;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 6d77bbc5a..1cf214eac 100644
+index 6d77bbc5..1cf214ea 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -285,7 +285,7 @@ public class SpigotConfig
@@ -261,5 +261,5 @@ index 6d77bbc5a..1cf214eac 100644
      }
  
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0204-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch
similarity index 99%
rename from Spigot-Server-Patches/0204-Improved-Async-Task-Scheduler.patch
rename to Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch
index 465bb19ee5..712d6fea37 100644
--- a/Spigot-Server-Patches/0204-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch
@@ -1,4 +1,4 @@
-From 413d54fe3999269f138ff809b9fa7d9262579593 Mon Sep 17 00:00:00 2001
+From bc4eaad7021910497a2282fb7aadf0e11122e7dd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Mar 2018 22:59:43 -0400
 Subject: [PATCH] Improved Async Task Scheduler
@@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 new file mode 100644
-index 0000000000..3c1992e212
+index 00000000..3c1992e2
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 @@ -0,0 +1,122 @@
@@ -159,7 +159,7 @@ index 0000000000..3c1992e212
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index e102be583c..5db848de14 100644
+index e102be58..5db848de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -62,7 +62,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -365,5 +365,5 @@ index e102be583c..5db848de14 100644
  
      private boolean isReady(final int currentTick) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 95%
rename from Spigot-Server-Patches/0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 816ed49a30..5a58f9cf07 100644
--- a/Spigot-Server-Patches/0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From 529f047dbeee3b24b5a426cad9ca6c7a66fd80f1 Mon Sep 17 00:00:00 2001
+From bc462ac9f523431a5b85df4829112a7a80f5bdfa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 11:45:57 -0400
 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 1fb609dcfc..1b43f92164 100644
+index 1fb609dc..1b43f921 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -1,5 +1,7 @@
@@ -44,5 +44,5 @@ index 1fb609dcfc..1b43f92164 100644
                              if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) {
                                  final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch
index e1993dbe16..079851d266 100644
--- a/Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From cb49deb9821891dc3560fac122eed7e326d890b8 Mon Sep 17 00:00:00 2001
+From aea5efe6d3f4aac48a477d0522f1667fb7bffdb7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:29:48 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 3fe13fe489..60dd8672b1 100644
+index 3fe13fe4..60dd8672 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -66,7 +66,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index 3fe13fe489..60dd8672b1 100644
      private final ItemCooldown bW;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 1b43f92164..1c4ac7bf7a 100644
+index 1b43f921..1c4ac7bf 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -37,7 +37,7 @@ public class LoginListener implements PacketLoginInListener {
@@ -48,7 +48,7 @@ index 1b43f92164..1c4ac7bf7a 100644
                              uniqueId = i.getId();
                              // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6d46fa23d2..ef7fff7545 100644
+index 6d46fa23..ef7fff75 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,6 +1,8 @@
@@ -141,5 +141,5 @@ index 6d46fa23d2..ef7fff7545 100644
      public void removeDisconnectingPlayer(Player player) {
          hiddenPlayers.remove(player.getUniqueId());
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0207-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch
similarity index 90%
rename from Spigot-Server-Patches/0207-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch
index 090022f6f9..6c01154e80 100644
--- a/Spigot-Server-Patches/0207-Fix-Dragon-Server-Crashes.patch
+++ b/Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch
@@ -1,4 +1,4 @@
-From 9e75b3f1f4d2c1aff58b26be43037c1f1d326b59 Mon Sep 17 00:00:00 2001
+From 88f0ade67220eaabe4886bf7c08328bfbce16f73 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Mar 2018 20:52:07 -0400
 Subject: [PATCH] Fix Dragon Server Crashes
@@ -7,7 +7,7 @@ If the dragon tries to find "ground" and hits a hole, or off edge,
 it will infinitely keep looking for non air and eventually crash.
 
 diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
-index c42de9771e..40a8beff55 100644
+index c42de977..40a8beff 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -54,7 +54,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
@@ -20,5 +20,5 @@ index c42de9771e..40a8beff55 100644
                  if (d3 < 0.0D) {
                      d3 = d2;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch
index 56139a9d22..8e69618873 100644
--- a/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 9f4935fd2dadab6fadb868d1aaa6a5cb61b90c95 Mon Sep 17 00:00:00 2001
+From 884e7260c35a99e7f1bcd59095718c506dd64ec5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:40:24 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b7eaa0fef9..bc70d0fc79 100644
+index b7eaa0fe..bc70d0fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1402,6 +1402,26 @@ public final class CraftServer implements Server {
@@ -40,5 +40,5 @@ index b7eaa0fef9..bc70d0fc79 100644
      @Deprecated
      public OfflinePlayer getOfflinePlayer(String name) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0209-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch
similarity index 92%
rename from Spigot-Server-Patches/0209-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch
index 5ecd778ec4..accd40911e 100644
--- a/Spigot-Server-Patches/0209-Make-player-data-saving-configurable.patch
+++ b/Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch
@@ -1,11 +1,11 @@
-From 198909d1bf40f6a46c179c03261f925a7cbb8e0d Mon Sep 17 00:00:00 2001
+From b13a8729b87f5d82fc1113556483f67ccd77a2e5 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 26 Mar 2018 18:30:53 +0300
 Subject: [PATCH] Make player data saving configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5884b04f7e..ba341e0174 100644
+index 5884b04f..ba341e01 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -270,4 +270,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 5884b04f7e..ba341e0174 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index a0254d8e51..e60e10c57d 100644
+index a0254d8e..e60e10c5 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -138,6 +138,7 @@ public class WorldNBTStorage implements IPlayerFileData {
@@ -35,5 +35,5 @@ index a0254d8e51..e60e10c57d 100644
              NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound());
              File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat.tmp");
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0210-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch
similarity index 98%
rename from Spigot-Server-Patches/0210-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch
index 80ecf6024f..9b8788c370 100644
--- a/Spigot-Server-Patches/0210-Make-legacy-ping-handler-more-reliable.patch
+++ b/Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch
@@ -1,4 +1,4 @@
-From 93a16e281fb254711122b786e4481ff6e88cd527 Mon Sep 17 00:00:00 2001
+From 8e18d5f39b428086b19d00e6e8607447737e2691 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 18:22:50 +0200
 Subject: [PATCH] Make legacy ping handler more reliable
@@ -28,7 +28,7 @@ respond to the request.
 [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13
 
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 9ee5a1ff02..063efe9bbe 100644
+index 9ee5a1ff..063efe9b 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -14,6 +14,7 @@ public class LegacyPingHandler extends ChannelInboundHandlerAdapter {
@@ -167,5 +167,5 @@ index 9ee5a1ff02..063efe9bbe 100644
          channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE);
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0211-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 98%
rename from Spigot-Server-Patches/0211-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 5897922fd8..77b02ea36a 100644
--- a/Spigot-Server-Patches/0211-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch
@@ -1,4 +1,4 @@
-From 9e469b554d046c3b7b8de24b5af049d6ffb8064f Mon Sep 17 00:00:00 2001
+From 69bbccc848de18e55c166461c4a59828a3afedbf Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 19:30:51 +0200
 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
@@ -6,7 +6,7 @@ Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 new file mode 100644
-index 0000000000..74c012fd40
+index 00000000..74c012fd
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 @@ -0,0 +1,73 @@
@@ -84,7 +84,7 @@ index 0000000000..74c012fd40
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 063efe9bbe..4a49fe4cc6 100644
+index 063efe9b..4a49fe4c 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -1,5 +1,7 @@
@@ -153,5 +153,5 @@ index 063efe9bbe..4a49fe4cc6 100644
      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch
similarity index 94%
rename from Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch
index 774328ddea..191aea2a02 100644
--- a/Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch
@@ -1,4 +1,4 @@
-From e179bc675da1cafd87c51d57de4472ffd4cd46b6 Mon Sep 17 00:00:00 2001
+From 1c24e191a7c157c3396da1746f7386ae2db2b4a6 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 31 Mar 2018 17:04:26 +0100
 Subject: [PATCH] Flag to disable the channel limit
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ef7fff7545..25c80a40d8 100644
+index ef7fff75..25c80a40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -138,6 +138,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -30,5 +30,5 @@ index ef7fff7545..25c80a40d8 100644
          if (channels.add(channel)) {
              server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0213-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch
similarity index 91%
rename from Spigot-Server-Patches/0213-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch
index 12f7393708..e7d2a3d63e 100644
--- a/Spigot-Server-Patches/0213-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch
@@ -1,11 +1,11 @@
-From d40c57ab4c44bad10a22d537758c9d4f432b44e9 Mon Sep 17 00:00:00 2001
+From 23c45dc6f86e4e10480417605172fab76f986aee Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:29:37 +0300
 Subject: [PATCH] Add method to open already placed sign
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index ce84885af6..d5f5550350 100644
+index ce84885a..d5f55503 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -612,4 +612,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -27,5 +27,5 @@ index ce84885af6..d5f5550350 100644
 +    // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch
similarity index 92%
rename from Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch
index 134a152e64..759b4196f3 100644
--- a/Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch
@@ -1,4 +1,4 @@
-From b1f8ee2e1199e0b6654015f48671f27a3024e128 Mon Sep 17 00:00:00 2001
+From d40911b9c0e73b919d14cec9820b93cafae6fdb3 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 14 Apr 2018 20:20:46 +0200
 Subject: [PATCH] Configurable sprint interruption on attack
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 77cdbfadf9..171c8e3031 100644
+index 77cdbfad..171c8e30 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -356,4 +356,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 77cdbfadf9..171c8e3031 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 60dd8672b1..1d3c7ce488 100644
+index 60dd8672..1d3c7ce4 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1112,7 +1112,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -37,5 +37,5 @@ index 60dd8672b1..1d3c7ce488 100644
  
                          if (flag3) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 90%
rename from Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index b75f920d04..03953ddd66 100644
--- a/Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -1,11 +1,11 @@
-From fecb823be50e81323a8892d9a85585651cfde873 Mon Sep 17 00:00:00 2001
+From 113fb1fd4b2e8d559b02c1c1c077bd79c0df6dda Mon Sep 17 00:00:00 2001
 From: 0x22 <0x22@futureclient.net>
 Date: Thu, 26 Apr 2018 04:41:11 -0400
 Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 64f789d7c4..4a0a847944 100644
+index 64f789d7..4a0a8479 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2502,7 +2502,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -18,5 +18,5 @@ index 64f789d7c4..4a0a847944 100644
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
              this.server.getPluginManager().callEvent(event);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0216-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0215-EndermanEscapeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0216-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0215-EndermanEscapeEvent.patch
index 8584a6f02c..fcd53a505e 100644
--- a/Spigot-Server-Patches/0216-EndermanEscapeEvent.patch
+++ b/Spigot-Server-Patches/0215-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From 8ab62be5ad0a6928a746d577fc9a3e4cd8c9170e Mon Sep 17 00:00:00 2001
+From f007664579914c1639fe7c4e84bd5f9afb03e636 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:15:55 -0400
 Subject: [PATCH] EndermanEscapeEvent
@@ -8,7 +8,7 @@ Fires an event anytime an enderman intends to teleport away from the player
 You may cancel this, enabling ranged attacks to damage the enderman for example.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 538c2169cd..2893f75bdf 100644
+index 538c2169..2893f75b 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -81,5 +81,5 @@ index 538c2169cd..2893f75bdf 100644
                          }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0217-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch
similarity index 90%
rename from Spigot-Server-Patches/0217-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch
index 7911edfe9a..0da96848b8 100644
--- a/Spigot-Server-Patches/0217-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From 79ec4af17c4c948e5a32d25e9ffe80914b7d01ff Mon Sep 17 00:00:00 2001
+From 1ef5f65dfcdae34412cdd21c1c6b563101fc0256 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:44 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 2893f75bdf..f279c9b148 100644
+index 2893f75b..f279c9b1 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -193,6 +193,7 @@ public class EntityEnderman extends EntityMonster {
@@ -18,7 +18,7 @@ index 2893f75bdf..f279c9b148 100644
          if (!this.world.p_() && this.isAlive()) {
              double d0 = this.locX() + (this.random.nextDouble() - 0.5D) * 64.0D;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-index 970efabd37..0c5f359346 100644
+index 970efabd..0c5f3593 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 @@ -16,6 +16,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
@@ -30,5 +30,5 @@ index 970efabd37..0c5f359346 100644
      public MaterialData getCarriedMaterial() {
          IBlockData blockData = getHandle().getCarried();
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch
similarity index 93%
rename from Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch
index 22587ebd90..12be427af9 100644
--- a/Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch
@@ -1,4 +1,4 @@
-From 886bb7e903925468d0b6b6b9766f980d1b5c023f Mon Sep 17 00:00:00 2001
+From 0a26e05cc7f40eace62585151e07ebdcb2bf9062 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:15:26 -0400
 Subject: [PATCH] Block Enderpearl Travel Exploit
@@ -12,7 +12,7 @@ This disables that by not saving the thrower when the chunk is unloaded.
 This is mainly useful for survival servers that do not allow freeform teleporting.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 171c8e3031..9c52e31f4c 100644
+index 171c8e30..9c52e31f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -361,4 +361,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 171c8e3031..9c52e31f4c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 724b78b5d2..9eed1dce3e 100644
+index 724b78b5..9eed1dce 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -201,6 +201,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -39,5 +39,5 @@ index 724b78b5d2..9eed1dce3e 100644
      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 96%
rename from Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch
index f3633945dd..05203c9b73 100644
--- a/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From f48e9aa868bcfd797787755261307dc76b550cb6 Mon Sep 17 00:00:00 2001
+From 7af280e9f9ac11163f93222bd790de28566a1a70 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 15 Aug 2017 22:29:12 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index eb99f3a967..da391e945c 100644
+index eb99f3a9..da391e94 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -56,7 +56,7 @@ public class WorldServer extends World {
@@ -43,7 +43,7 @@ index eb99f3a967..da391e945c 100644
  
              if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d3df3f593f..daf305bb14 100644
+index d3df3f59..daf305bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2285,11 +2285,17 @@ public class CraftWorld implements World {
@@ -66,5 +66,5 @@ index d3df3f593f..daf305bb14 100644
                  x, y, z, // Position
                  count,  // Count
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0220-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0220-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch
index 06d646ce91..3c0d68c2d9 100644
--- a/Spigot-Server-Patches/0220-EndermanAttackPlayerEvent.patch
+++ b/Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From 9f2bd9b9fb36353233446c2eb8f949571d2c63f9 Mon Sep 17 00:00:00 2001
+From 22c613e4ff9cfb13730b65ff629044eeeeeee191 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:18:54 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
@@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player.
 This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index f279c9b148..b7c67f0cdb 100644
+index f279c9b1..b7c67f0c 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -141,7 +141,15 @@ public class EntityEnderman extends EntityMonster {
@@ -28,5 +28,5 @@ index f279c9b148..b7c67f0cdb 100644
  
          if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0221-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0221-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch
index 593b488789..f148845b6c 100644
--- a/Spigot-Server-Patches/0221-WitchConsumePotionEvent.patch
+++ b/Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From abc9903c5d3cffce9396db4bd310053acd65fcb8 Mon Sep 17 00:00:00 2001
+From 95921ccb9289471955c3915944fc4ad61c7edd3e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:35:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchConsumePotionEvent
 Fires when a witch consumes the potion in their hand
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index ddff0b5786..aa90111716 100644
+index ddff0b57..aa901117 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -88,7 +88,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -23,5 +23,5 @@ index ddff0b5786..aa90111716 100644
                          if (list != null) {
                              Iterator iterator = list.iterator();
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0222-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0222-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch
index 0c5747da04..7a855df8f1 100644
--- a/Spigot-Server-Patches/0222-WitchThrowPotionEvent.patch
+++ b/Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From a82024e65858dc3a1817b54e7a6e7fe845601021 Mon Sep 17 00:00:00 2001
+From 02447e7b90d67cf6ed83c47f88a374ed51962d7c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:44:58 -0400
 Subject: [PATCH] WitchThrowPotionEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent
 Fired when a witch throws a potion at a player
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index aa90111716..1f2759e95e 100644
+index aa901117..1f2759e9 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -185,9 +185,16 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -29,5 +29,5 @@ index aa90111716..1f2759e95e 100644
              entitypotion.shoot(d0, d1 + (double) (f1 * 0.2F), d2, 0.75F, 8.0F);
              this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_THROW, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 91%
rename from Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index e4265d96b8..46f6b217fe 100644
--- a/Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -1,4 +1,4 @@
-From 6948c27f93bb2267bcf9d3d30e199f75abd513d9 Mon Sep 17 00:00:00 2001
+From 81b581e0ad3f3e5d1426564630feda39ceb010d0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Jun 2018 20:39:20 -0400
 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@@ -8,7 +8,7 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index daf305bb14..0b4821e16e 100644
+index daf305bb..0b4821e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1487,6 +1487,10 @@ public class CraftWorld implements World {
@@ -23,5 +23,5 @@ index daf305bb14..0b4821e16e 100644
              entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z)));
          } else if (Projectile.class.isAssignableFrom(clazz)) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0224-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0224-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch
index 918a1c5ec0..ec68a19fe0 100644
--- a/Spigot-Server-Patches/0224-WitchReadyPotionEvent.patch
+++ b/Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch
@@ -1,11 +1,11 @@
-From 84886bc08d208239d33820ac7f88e50aa0afb7c9 Mon Sep 17 00:00:00 2001
+From bf579a62bd48c3a09294f85746c499019f28148a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:47:26 -0400
 Subject: [PATCH] WitchReadyPotionEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index 1f2759e95e..be6ecfb08a 100644
+index 1f2759e9..be6ecfb0 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -121,7 +121,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -22,5 +22,5 @@ index 1f2759e95e..be6ecfb08a 100644
                      this.t(true);
                      this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_DRINK, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0225-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch
similarity index 91%
rename from Spigot-Server-Patches/0225-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch
index 0501ce79e6..b94be720c6 100644
--- a/Spigot-Server-Patches/0225-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From 074c1511331d71376d9fd4ab4e57d5767daf279e Mon Sep 17 00:00:00 2001
+From 778cd81b84f24e5bb53148de377c49b0323d43bb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 23:00:29 -0400
 Subject: [PATCH] ItemStack#getMaxItemUseDuration
@@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 854cffe6c9..641a52b968 100644
+index 854cffe6..641a52b9 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -548,6 +548,7 @@ public final class ItemStack {
@@ -18,7 +18,7 @@ index 854cffe6c9..641a52b968 100644
          return this.getItem().f_(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 3dd912abe3..a41be8fdae 100644
+index 3dd912ab..a41be8fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -174,6 +174,13 @@ public final class CraftItemStack extends ItemStack {
@@ -36,5 +36,5 @@ index 3dd912abe3..a41be8fdae 100644
      public void addUnsafeEnchantment(Enchantment ench, int level) {
          Validate.notNull(ench, "Cannot add null enchantment");
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0226-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0226-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch
index 23c233ff59..fdbe9d32de 100644
--- a/Spigot-Server-Patches/0226-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch
@@ -1,11 +1,11 @@
-From f66371fedb36c176ab017137e3458f1576d4023e Mon Sep 17 00:00:00 2001
+From 7e35cbea7e3b41972883ce15c399b679edc82787 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 9 Jun 2018 14:08:39 +0200
 Subject: [PATCH] Implement EntityTeleportEndGatewayEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index 78fba79378..c71f76004e 100644
+index 78fba793..c71f7600 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -145,8 +145,19 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@@ -30,5 +30,5 @@ index 78fba79378..c71f76004e 100644
  
              this.h();
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 92%
rename from Spigot-Server-Patches/0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 244d2aed31..998447539d 100644
--- a/Spigot-Server-Patches/0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -1,4 +1,4 @@
-From 6fef741f0bb6edefa05c3c0187aaa134adae4a8f Mon Sep 17 00:00:00 2001
+From 6905451b147c37757bf3d12e01a00d1a8ae06873 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 01:18:49 -0400
 Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
@@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
 Otherwise the creeper infinite explodes
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 374cf28fb4..b895300797 100644
+index 374cf28f..b8953007 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -12,7 +12,7 @@ public class EntityCreeper extends EntityMonster {
@@ -27,5 +27,5 @@ index 374cf28fb4..b895300797 100644
              // CraftBukkit end
          }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0228-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch
similarity index 93%
rename from Spigot-Server-Patches/0228-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch
index 9982d3e8b3..cfe30ac32b 100644
--- a/Spigot-Server-Patches/0228-Fix-CraftEntity-hashCode.patch
+++ b/Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch
@@ -1,4 +1,4 @@
-From 7b47f14e65bc46b08bc4266d6c98a1901ecfda05 Mon Sep 17 00:00:00 2001
+From 74126edeb165e88aa5dbfeeea449d4d6623c4dfe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:20:15 -0400
 Subject: [PATCH] Fix CraftEntity hashCode
@@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 495a7c464f..915ccb1807 100644
+index 495a7c46..915ccb18 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -723,14 +723,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -45,5 +45,5 @@ index 495a7c464f..915ccb1807 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0229-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 97%
rename from Spigot-Server-Patches/0229-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch
index a6a4648d65..54e5fa49b6 100644
--- a/Spigot-Server-Patches/0229-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -1,4 +1,4 @@
-From eb10557d100cb75bdec93289ff0d1924211c1748 Mon Sep 17 00:00:00 2001
+From f4a2d9b520ac493ec58e8720a51f1c293528a2bf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Jun 2018 00:30:32 -0400
 Subject: [PATCH] Configurable Alternative LootPool Luck Formula
@@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas.
 I would love to see this change in Vanilla, so Mojang please pull :)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ba341e0174..26ab855dcf 100644
+index ba341e01..26ab855d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -279,4 +279,12 @@ public class PaperConfig {
@@ -53,7 +53,7 @@ index ba341e0174..26ab855dcf 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LootSelectorEntry.java b/src/main/java/net/minecraft/server/LootSelectorEntry.java
-index 3ed6a1e785..03398ce8fd 100644
+index 3ed6a1e7..03398ce8 100644
 --- a/src/main/java/net/minecraft/server/LootSelectorEntry.java
 +++ b/src/main/java/net/minecraft/server/LootSelectorEntry.java
 @@ -11,8 +11,8 @@ import org.apache.commons.lang3.ArrayUtils;
@@ -109,5 +109,5 @@ index 3ed6a1e785..03398ce8fd 100644
 +        // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0230-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 87%
rename from Spigot-Server-Patches/0230-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch
index 088c9c0ec7..da024b55b6 100644
--- a/Spigot-Server-Patches/0230-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch
@@ -1,11 +1,11 @@
-From 5ce8b664a007704371ee016d6074f7613c93f8f1 Mon Sep 17 00:00:00 2001
+From fd4864fdd1508bd2a1bfa8545a90f61a84808e35 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Jun 2018 20:37:03 -0400
 Subject: [PATCH] Print Error details when failing to save player data
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index e60e10c57d..350ac42d6b 100644
+index e60e10c5..350ac42d 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -151,7 +151,7 @@ public class WorldNBTStorage implements IPlayerFileData {
@@ -18,5 +18,5 @@ index e60e10c57d..350ac42d6b 100644
  
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch
similarity index 94%
rename from Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch
index 655105a3a5..f515dc311b 100644
--- a/Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch
@@ -1,11 +1,11 @@
-From 89ae35b8b61c41741eb52a43ca58e7da52716494 Mon Sep 17 00:00:00 2001
+From d69d147193305db0196bc2c7630a2563c3c373fc Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9c52e31f4c..33ce9a5004 100644
+index 9c52e31f..33ce9a50 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -367,4 +367,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 9c52e31f4c..33ce9a5004 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fe0b082206..a738848ecd 100644
+index fe0b0822..a738848e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2998,7 +2998,7 @@ public abstract class EntityLiving extends Entity {
@@ -48,7 +48,7 @@ index fe0b082206..a738848ecd 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 23a4819992..7d89c0e8e5 100644
+index 23a48199..7d89c0e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -644,5 +644,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -68,5 +68,5 @@ index 23a4819992..7d89c0e8e5 100644
      // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 97%
rename from Spigot-Server-Patches/0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-Server-Patches/0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 6775146173..14191496d8 100644
--- a/Spigot-Server-Patches/0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From 8407818729bc6103258937ff4adff0011f2cea3b Mon Sep 17 00:00:00 2001
+From f041c322f256f1ceb9551f3992040fddcb69e947 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
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
 Adds ability to get what arrow was shot, and control if it should be consumed.
 
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-index fb9656afde..3c95c0428b 100644
+index fb9656af..3c95c042 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 @@ -157,7 +157,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -19,7 +19,7 @@ index fb9656afde..3c95c0428b 100644
              event.getProjectile().remove();
              return;
 diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
-index 83aa70c295..26899916d3 100644
+index 83aa70c2..26899916 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
 @@ -36,6 +36,7 @@ public class ItemBow extends ItemProjectileWeapon {
@@ -59,7 +59,7 @@ index 83aa70c295..26899916d3 100644
                          if (itemstack1.isEmpty()) {
                              entityhuman.inventory.f(itemstack1);
 diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java
-index 7be41c8698..60a47bccca 100644
+index 7be41c86..60a47bcc 100644
 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java
 +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java
 @@ -221,7 +221,7 @@ public class ItemCrossbow extends ItemProjectileWeapon {
@@ -72,7 +72,7 @@ index 7be41c8698..60a47bccca 100644
                  event.getProjectile().remove();
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f9b0f39f78..caf277439a 100644
+index f9b0f39f..caf27743 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -51,6 +51,7 @@ import net.minecraft.server.GeneratorAccess;
@@ -104,5 +104,5 @@ index f9b0f39f78..caf277439a 100644
  
          return event;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0233-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0232-PlayerReadyArrowEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0233-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0232-PlayerReadyArrowEvent.patch
index 5b12f417db..aef9a45381 100644
--- a/Spigot-Server-Patches/0233-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0232-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From a4918790d6995478f6350a1884562d9ba203bbc7 Mon Sep 17 00:00:00 2001
+From 5e5fba553935417846f5c14a73a55775f26122d3 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 1d3c7ce4..4721c288 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0234-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0233-Fire-EntityShootBowEvent-for-Illusioner.patch
similarity index 92%
rename from Spigot-Server-Patches/0234-Fire-EntityShootBowEvent-for-Illusioner.patch
rename to Spigot-Server-Patches/0233-Fire-EntityShootBowEvent-for-Illusioner.patch
index 5ed972ba9b..ea934c3648 100644
--- a/Spigot-Server-Patches/0234-Fire-EntityShootBowEvent-for-Illusioner.patch
+++ b/Spigot-Server-Patches/0233-Fire-EntityShootBowEvent-for-Illusioner.patch
@@ -1,11 +1,11 @@
-From 34761a652b2d6eb4a9e2b5b9f0502280470ca706 Mon Sep 17 00:00:00 2001
+From 06950c4b0d9026a642a8ad57724eb824138a49ca 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-index 2ea0583a3e..81b7cd06f2 100644
+index 2ea0583a..81b7cd06 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 @@ -138,8 +138,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -29,5 +29,5 @@ index 2ea0583a3e..81b7cd06f2 100644
  
      class a extends EntityIllagerWizard.c {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0235-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0234-Implement-EntityKnockbackByEntityEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0235-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0234-Implement-EntityKnockbackByEntityEvent.patch
index 4d445c1172..efa97653a5 100644
--- a/Spigot-Server-Patches/0235-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0234-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From 385fbb42d914964afe6ef66622dba68c75006aee Mon Sep 17 00:00:00 2001
+From cee6a7dc371776dd785b76fb2dc1e3943fa17b34 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a738848ecd..2196dbfce9 100644
+index a738848e..2196dbfc 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1421,6 +1421,16 @@ public abstract class EntityLiving extends Entity {
@@ -27,5 +27,5 @@ index a738848ecd..2196dbfce9 100644
      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0236-Expand-Explosions-API.patch b/Spigot-Server-Patches/0235-Expand-Explosions-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0236-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0235-Expand-Explosions-API.patch
index 15eba8dcc8..2e6c9ef773 100644
--- a/Spigot-Server-Patches/0236-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0235-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 9e69a6e57d35c6cd554bc76a6b96d8bd3da870be Mon Sep 17 00:00:00 2001
+From c2a1a378bb925940946aab42f08ec66c9c80803a 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 0b4821e16e..1787c2d205 100644
+index 0b4821e1..1787c2d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -875,6 +875,11 @@ public class CraftWorld implements World {
@@ -22,5 +22,5 @@ index 0b4821e16e..1787c2d205 100644
      @Override
      public boolean createExplosion(Location loc, float power) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0237-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0236-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0237-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0236-LivingEntity-Hand-Raised-Item-Use-API.patch
index 2027f877b2..9bdecd2de0 100644
--- a/Spigot-Server-Patches/0237-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0236-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From e0690944f64dbb06474125fb98bd81579f98efa1 Mon Sep 17 00:00:00 2001
+From a84a51b9f898ce2d668391b3da43966307835f5c 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 2196dbfc..fea821be 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 7d89c0e8..02346f1c 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0238-RangedEntity-API.patch b/Spigot-Server-Patches/0237-RangedEntity-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0238-RangedEntity-API.patch
rename to Spigot-Server-Patches/0237-RangedEntity-API.patch
index 67f7d9db4d..919da64a8f 100644
--- a/Spigot-Server-Patches/0238-RangedEntity-API.patch
+++ b/Spigot-Server-Patches/0237-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From 80454b845746cb5463b2e17de487af1e69c84703 Mon Sep 17 00:00:00 2001
+From 3a4a542ee1d8cb96f99529d0ba80f07c9741dadd 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
@@ -8,7 +8,7 @@ and to perform an attack.
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java
 new file mode 100644
-index 0000000000..696660b089
+index 00000000..696660b0
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java
 @@ -0,0 +1,19 @@
@@ -32,7 +32,7 @@ index 0000000000..696660b089
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/IRangedEntity.java b/src/main/java/net/minecraft/server/IRangedEntity.java
-index b4178ce1e8..9b79ac77db 100644
+index b4178ce1..9b79ac77 100644
 --- a/src/main/java/net/minecraft/server/IRangedEntity.java
 +++ b/src/main/java/net/minecraft/server/IRangedEntity.java
 @@ -2,5 +2,8 @@ package net.minecraft.server;
@@ -46,7 +46,7 @@ index b4178ce1e8..9b79ac77db 100644
 +    void q(boolean flag); default void setChargingAttack(boolean charging) { q(charging); }; // Paper
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
-index 6e41dfd923..390183fffd 100644
+index 6e41dfd9..390183ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java
 @@ -1,11 +1,12 @@
@@ -64,7 +64,7 @@ index 6e41dfd923..390183fffd 100644
      public CraftDrowned(CraftServer server, EntityDrowned entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
-index 2ec1af8be4..f31d3eed3a 100644
+index 2ec1af8b..f31d3eed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
 @@ -1,11 +1,12 @@
@@ -82,7 +82,7 @@ index 2ec1af8be4..f31d3eed3a 100644
      public CraftIllusioner(CraftServer server, EntityIllagerIllusioner entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index 23ab78da15..3f94c5a920 100644
+index 23ab78da..3f94c5a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 @@ -1,5 +1,6 @@
@@ -102,7 +102,7 @@ index 23ab78da15..3f94c5a920 100644
      public CraftLlama(CraftServer server, EntityLlama entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
-index b4ae898401..02df66ecfe 100644
+index b4ae8984..02df66ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
 @@ -1,11 +1,12 @@
@@ -120,7 +120,7 @@ index b4ae898401..02df66ecfe 100644
      public CraftSkeleton(CraftServer server, EntitySkeletonAbstract entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-index 27460c59e3..e482b1c9dc 100644
+index 27460c59..e482b1c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 @@ -1,11 +1,12 @@
@@ -138,7 +138,7 @@ index 27460c59e3..e482b1c9dc 100644
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index 244e4dc8ec..bae107e76e 100644
+index 244e4dc8..bae107e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 @@ -1,11 +1,12 @@
@@ -156,7 +156,7 @@ index 244e4dc8ec..bae107e76e 100644
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-index 38b555cc7e..03cf6136e6 100644
+index 38b555cc..03cf6136 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 @@ -1,5 +1,6 @@
@@ -176,5 +176,5 @@ index 38b555cc7e..03cf6136e6 100644
      private BossBar bossBar;
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0239-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0238-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 94%
rename from Spigot-Server-Patches/0239-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0238-Add-config-to-disable-ender-dragon-legacy-check.patch
index 99462d7fe1..274cef7cec 100644
--- a/Spigot-Server-Patches/0239-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0238-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -1,11 +1,11 @@
-From c837eb577d0ddf3291dd2084c82ec62f895e4df1 Mon Sep 17 00:00:00 2001
+From b46d2f6dc34acc6e533388d1e353827bf192d8d4 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 33ce9a5004..cea15d50ed 100644
+index 33ce9a50..cea15d50 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -372,4 +372,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 33ce9a5004..cea15d50ed 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index 0674811849..687efa022d 100644
+index 06748118..687efa02 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -28,10 +28,10 @@ public class EnderDragonBattle {
@@ -47,5 +47,5 @@ index 0674811849..687efa022d 100644
          if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) {
              if (nbttagcompound.b("DragonUUID")) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0240-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0239-Implement-World.getEntity-UUID-API.patch
similarity index 88%
rename from Spigot-Server-Patches/0240-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0239-Implement-World.getEntity-UUID-API.patch
index ff3380d2ce..acb773ed72 100644
--- a/Spigot-Server-Patches/0240-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0239-Implement-World.getEntity-UUID-API.patch
@@ -1,11 +1,11 @@
-From 7bc8aafd7975fa8fb64b0d6f520bdbd037cbfdd0 Mon Sep 17 00:00:00 2001
+From 8027a74b92f5d43d920a05c302c8b28abe767db9 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 1787c2d205..588c87119f 100644
+index 1787c2d2..588c8711 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1289,6 +1289,15 @@ public class CraftWorld implements World {
@@ -25,5 +25,5 @@ index 1787c2d205..588c87119f 100644
      public void save() {
          org.spigotmc.AsyncCatcher.catchOp("world save"); // Spigot
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0240-InventoryCloseEvent-Reason-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0240-InventoryCloseEvent-Reason-API.patch
index ee0a6d132e..c619d72195 100644
--- a/Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0240-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From e3d5a0f193a22a02bff9129d888715337abe45cd Mon Sep 17 00:00:00 2001
+From f45ba3c2d3cea875e1d7ea61203af19f4ca85dde 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 4721c288b..36748ccb7 100644
+index 4721c288..36748ccb 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 4721c288b..36748ccb7 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 625b68428..f849dba21 100644
+index d8721ab2..12ba65ed 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 {
@@ -55,7 +55,7 @@ index 625b68428..f849dba21 100644
          }
  
          String deathMessage = event.getDeathMessage();
-@@ -1062,7 +1062,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1055,7 +1055,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              return OptionalInt.empty();
          } else {
              if (this.activeContainer != this.defaultContainer) {
@@ -64,7 +64,7 @@ index 625b68428..f849dba21 100644
              }
  
              this.nextContainerCounter();
-@@ -1122,7 +1122,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1115,7 +1115,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
          // CraftBukkit end
          if (this.activeContainer != this.defaultContainer) {
@@ -73,7 +73,7 @@ index 625b68428..f849dba21 100644
          }
  
          // this.nextContainerCounter(); // CraftBukkit - moved up
-@@ -1186,7 +1186,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1179,7 +1179,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public void closeInventory() {
@@ -88,7 +88,7 @@ index 625b68428..f849dba21 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4a0a84794..8eb12e89e 100644
+index 4a0a8479..8eb12e89 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 4a0a84794..8eb12e89e 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 a61815c79..5ae0927c1 100644
+index a61815c7..5ae0927c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -390,7 +390,7 @@ public abstract class PlayerList {
@@ -114,7 +114,7 @@ index a61815c79..5ae0927c1 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 da391e945..c5b4218b4 100644
+index da391e94..c5b4218b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1051,7 +1051,7 @@ public class WorldServer extends World {
@@ -136,7 +136,7 @@ index da391e945..c5b4218b4 100644
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index d5f555035..1c88eacea 100644
+index d5f55503..1c88eace 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -467,8 +467,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -155,7 +155,7 @@ index d5f555035..1c88eacea 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 25c80a40d..91ad5776c 100644
+index 25c80a40..91ad5776 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -785,7 +785,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,7 +168,7 @@ index 25c80a40d..91ad5776c 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 caf277439..f931fa48b 100644
+index caf27743..f931fa48 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 caf277439..f931fa48b 100644
          human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity());
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0242-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0241-Configurable-Bed-Search-Radius.patch
similarity index 98%
rename from Spigot-Server-Patches/0242-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0241-Configurable-Bed-Search-Radius.patch
index c6b64f46b2..e35f558ffe 100644
--- a/Spigot-Server-Patches/0242-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0241-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From 9acfa558bf7e3b4f3454663fbb3804ffa9d57007 Mon Sep 17 00:00:00 2001
+From 8b2de3bab8c798a3901892aa8f3ea552354a1bd7 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
@@ -10,7 +10,7 @@ player at their bed should it of became obstructed.
 Defaults to vanilla 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cea15d50e..387e0dcb9 100644
+index cea15d50..387e0dcb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -377,4 +377,15 @@ public class PaperWorldConfig {
@@ -30,7 +30,7 @@ index cea15d50e..387e0dcb9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index 794756342..74e915c21 100644
+index 79475634..74e915c2 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
 @@ -196,6 +196,10 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
@@ -162,5 +162,5 @@ index 794756342..74e915c21 100644
              }
  
 -- 
-2.22.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0243-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0242-Vex-getSummoner-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0243-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0242-Vex-getSummoner-API.patch
index fa10c903e5..9790b6d035 100644
--- a/Spigot-Server-Patches/0243-Vex-getSummoner-API.patch
+++ b/Spigot-Server-Patches/0242-Vex-getSummoner-API.patch
@@ -1,4 +1,4 @@
-From 109c542b07b8b39e1a589823069f4ce128be11ec Mon Sep 17 00:00:00 2001
+From 4220c1abb582cb119764ffa12bee6e89fa580b2d 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getSummoner API
 Get's the NPC that summoned this Vex
 
 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index cd9fb3aabf..a46730460e 100644
+index cd9fb3aa..a4673046 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -92,6 +92,7 @@ public class EntityVex extends EntityMonster {
@@ -18,7 +18,7 @@ index cd9fb3aabf..a46730460e 100644
          return this.c;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 737a37b6fe..169c951ec3 100644
+index 737a37b6..169c951e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -1,8 +1,10 @@
@@ -47,5 +47,5 @@ index 737a37b6fe..169c951ec3 100644
      public String toString() {
          return "CraftVex";
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0243-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 92%
rename from Spigot-Server-Patches/0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0243-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 96f4f66d3d..836db3eec5 100644
--- a/Spigot-Server-Patches/0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0243-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From c3cf0b6476dca8498ad71ef823d780fa6fd23b89 Mon Sep 17 00:00:00 2001
+From 54643c6b1738a807643df04c1f5bbf8879002a7f 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
@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8eb12e89ea..8648845acb 100644
+index 8eb12e89..8648845a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1950,6 +1950,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -28,5 +28,5 @@ index 8eb12e89ea..8648845acb 100644
                      }
                      // CraftBukkit end
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0245-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0244-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 87%
rename from Spigot-Server-Patches/0245-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0244-Don-t-change-the-Entity-Random-seed-for-squids.patch
index 64cb8507ad..d9d196e8af 100644
--- a/Spigot-Server-Patches/0245-Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/0244-Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -1,11 +1,11 @@
-From a7fe914cc883f269049ea1b97502d320e4afe5f0 Mon Sep 17 00:00:00 2001
+From 55eb86292e527cd8e69cd482c0c434d18b783498 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 1c1ff2069d..92efe4e7f5 100644
+index 1c1ff206..92efe4e7 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -21,7 +21,7 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -18,5 +18,5 @@ index 1c1ff2069d..92efe4e7f5 100644
      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0246-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0245-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 91%
rename from Spigot-Server-Patches/0246-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0245-Re-add-vanilla-entity-warnings-for-duplicates.patch
index 100304b0e4..f1fecc8073 100644
--- a/Spigot-Server-Patches/0246-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0245-Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -1,4 +1,4 @@
-From 6714752163ec229a2445503d005f5095b9befac6 Mon Sep 17 00:00:00 2001
+From 955e0d13a2ab0e817fc312a943a8cadb4a01f7ad 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 c5b4218b44..4cbf390ce0 100644
+index c5b4218b..4cbf390c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1036,7 +1036,8 @@ public class WorldServer extends World {
@@ -22,5 +22,5 @@ index c5b4218b44..4cbf390ce0 100644
          }
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0246-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 89%
rename from Spigot-Server-Patches/0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0246-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index 3abadc1eb9..b014dc36c7 100644
--- a/Spigot-Server-Patches/0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0246-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -1,11 +1,11 @@
-From 14b56bdad0ae60dbb02b3d8cf0808465b63d5a44 Mon Sep 17 00:00:00 2001
+From bf5750c5d0eae954924d4554e426ce7c60240c34 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 5efcc50ab9..e5c9bac88a 100644
+index 5efcc50a..e5c9bac8 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 5efcc50ab9..e5c9bac88a 100644
              double radius = world.spigotConfig.itemMerge;
              List<EntityItem> list = this.world.a(EntityItem.class, this.getBoundingBox().grow(radius, radius, radius), (entityitem) -> {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0248-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0247-Use-asynchronous-Log4j-2-loggers.patch
similarity index 91%
rename from Spigot-Server-Patches/0248-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0247-Use-asynchronous-Log4j-2-loggers.patch
index 574049f355..11bae125e1 100644
--- a/Spigot-Server-Patches/0248-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0247-Use-asynchronous-Log4j-2-loggers.patch
@@ -1,11 +1,11 @@
-From 2afc85c134cab7ce729e32a67bebcf7896462deb Mon Sep 17 00:00:00 2001
+From 3d7f218a63941724b6e4fd12852b8e8a1f12df98 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 6f2fe9c26d..55679af926 100644
+index 6f2fe9c2..55679af9 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -74,6 +74,13 @@
@@ -24,7 +24,7 @@ index 6f2fe9c26d..55679af926 100644
              <artifactId>asm</artifactId>
 diff --git a/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java b/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java
 new file mode 100644
-index 0000000000..db652a1f7a
+index 00000000..db652a1f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java
 @@ -0,0 +1,17 @@
@@ -46,7 +46,7 @@ index 0000000000..db652a1f7a
 +    }
 +}
 diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
-index 0694b21465..30efeb5faf 100644
+index 0694b214..30efeb5f 100644
 --- a/src/main/resources/log4j2.component.properties
 +++ b/src/main/resources/log4j2.component.properties
 @@ -1 +1,3 @@
@@ -54,5 +54,5 @@ index 0694b21465..30efeb5faf 100644
 +log4j2.AsyncQueueFullPolicy="com.destroystokyo.paper.log.LogFullPolicy"
  log4j.skipJansi=true
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0249-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0248-add-more-information-to-Entity.toString.patch
similarity index 92%
rename from Spigot-Server-Patches/0249-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0248-add-more-information-to-Entity.toString.patch
index 453a85b525..e7bd061206 100644
--- a/Spigot-Server-Patches/0249-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0248-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From e696b3bbb9dc087f0f1613c525656648bbd624a6 Mon Sep 17 00:00:00 2001
+From 924ae2bd1b7c1c84bc630daf49616a534f084338 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 1de1a10cf0..dce1e2af62 100644
+index 1de1a10c..dce1e2af 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2503,7 +2503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,5 +19,5 @@ index 1de1a10cf0..dce1e2af62 100644
  
      public boolean isInvulnerable(DamageSource damagesource) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0249-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0249-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index d5eca87ed0..4eaaad36ea 100644
--- a/Spigot-Server-Patches/0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0249-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -1,4 +1,4 @@
-From 9a76930aea280a0e6eab6f01334f409f4fccd808 Mon Sep 17 00:00:00 2001
+From 03c1aad49556e57791d79e54b1cfa6eba6b8c728 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 dce1e2af62..d39037a979 100644
+index dce1e2af..d39037a9 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 dce1e2af62..d39037a979 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 fcf229ad..f640d2ac 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 f349c7fe2e..cab9ec5dd4 100644
+index 2f57c7bc..a1c33c52 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 f349c7fe2e..cab9ec5dd4 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 4cbf390ce0..6ce7f77a5e 100644
+index 4cbf390c..6ce7f77a 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 4cbf390ce0..6ce7f77a5e 100644
              // CraftBukkit start - SPIGOT-5278
              if (entity instanceof EntityDrowned) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0251-EnderDragon-Events.patch b/Spigot-Server-Patches/0250-EnderDragon-Events.patch
similarity index 95%
rename from Spigot-Server-Patches/0251-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0250-EnderDragon-Events.patch
index 5b18513a64..9b0547940b 100644
--- a/Spigot-Server-Patches/0251-EnderDragon-Events.patch
+++ b/Spigot-Server-Patches/0250-EnderDragon-Events.patch
@@ -1,11 +1,11 @@
-From eed44766d30a48ee5a4559f5ea3ffa4e5e03ef7c Mon Sep 17 00:00:00 2001
+From c917b7ad01a2ff5e0e4a7886c88f27322829fffa 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
 
 
 diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
-index 40a8beff55..18fdcd453a 100644
+index 40a8beff..18fdcd45 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -71,7 +71,11 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
@@ -29,7 +29,7 @@ index 40a8beff55..18fdcd453a 100644
      public void e() {
          if (this.d != null) {
 diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
-index a2c36548ca..a9d20ee3bb 100644
+index a2c36548..a9d20ee3 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 @@ -68,7 +68,9 @@ public class DragonControllerStrafe extends AbstractDragonController {
@@ -43,7 +43,7 @@ index a2c36548ca..a9d20ee3bb 100644
                          if (this.d != null) {
                              while (!this.d.b()) {
 diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java
-index bc08b53fcd..db43ac1cc4 100644
+index bc08b53f..db43ac1c 100644
 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java
 @@ -41,8 +41,10 @@ public class EntityDragonFireball extends EntityFireball {
@@ -58,5 +58,5 @@ index bc08b53fcd..db43ac1cc4 100644
              }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0252-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0251-PlayerElytraBoostEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0252-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0251-PlayerElytraBoostEvent.patch
index ceea7e2c9e..90e462f812 100644
--- a/Spigot-Server-Patches/0252-PlayerElytraBoostEvent.patch
+++ b/Spigot-Server-Patches/0251-PlayerElytraBoostEvent.patch
@@ -1,11 +1,11 @@
-From 54f39c3f4e87f62020db7521485cba949b5364d9 Mon Sep 17 00:00:00 2001
+From b289084fd0f03553bbfaf2ddeb139c0ea95f4d76 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
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 92dac35ec4..bd524a35bb 100644
+index 92dac35e..bd524a35 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -36,11 +36,16 @@ public class ItemFireworks extends Item {
@@ -30,5 +30,5 @@ index 92dac35ec4..bd524a35bb 100644
  
              return InteractionResultWrapper.success(entityhuman.b(enumhand));
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0253-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0252-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 98%
rename from Spigot-Server-Patches/0253-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0252-Speedup-BlockPos-by-fixing-inlining.patch
index 8cb0a9e373..47203c39be 100644
--- a/Spigot-Server-Patches/0253-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0252-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 00af267858cee1ef342078231c7d1d227ae4c399 Mon Sep 17 00:00:00 2001
+From e9d1ec5e98fae3544674a6c26e75f505c6ba7b4f 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 71089442..c439a8d0 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 5dbd3e60..e9ea232a 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0254-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0253-Optimize-RegistryID.c.patch
similarity index 94%
rename from Spigot-Server-Patches/0254-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0253-Optimize-RegistryID.c.patch
index f1bb9cf192..0ab20a436e 100644
--- a/Spigot-Server-Patches/0254-Optimize-RegistryID.c.patch
+++ b/Spigot-Server-Patches/0253-Optimize-RegistryID.c.patch
@@ -1,4 +1,4 @@
-From 9dcee9d8eca6917463de0000301d8d5780dea843 Mon Sep 17 00:00:00 2001
+From b49ffcdd08c8abc5099bbb0811458bda0c5c9aa0 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()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize RegistryID.c()
 This is a frequent hotspot for world loading/saving.
 
 diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
-index e15d286710..e8a48b9a4c 100644
+index e15d2867..e8a48b9a 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
 @@ -14,12 +14,14 @@ public class RegistryID<K> implements Registry<K> {
@@ -64,5 +64,5 @@ index e15d286710..e8a48b9a4c 100644
  
      public int b() {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0254-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 91%
rename from Spigot-Server-Patches/0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0254-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index c9179523f9..dca128d55e 100644
--- a/Spigot-Server-Patches/0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0254-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,11 +1,11 @@
-From 63dd01cefe3869a13f0bd4947ffd314561a75551 Mon Sep 17 00:00:00 2001
+From 93f5f3cd2b5746c40ce73feeef88bee9c8025583 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 387e0dcb9f..eaaa51e4bf 100644
+index 387e0dcb..eaaa51e4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -388,4 +388,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 387e0dcb9f..eaaa51e4bf 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a1c33c525c..2261c42ab6 100644
+index a1c33c52..2261c42a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -781,6 +781,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -38,5 +38,5 @@ index a1c33c525c..2261c42ab6 100644
          int i = MathHelper.floor(axisalignedbb.minX);
          int j = MathHelper.f(axisalignedbb.maxX);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0256-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0255-Vanished-players-don-t-have-rights.patch
similarity index 96%
rename from Spigot-Server-Patches/0256-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0255-Vanished-players-don-t-have-rights.patch
index aff71244f0..bd96fcd570 100644
--- a/Spigot-Server-Patches/0256-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0255-Vanished-players-don-t-have-rights.patch
@@ -1,11 +1,11 @@
-From 2edf29d7e7a3d8bbdd274c88abb35fb204b5a249 Mon Sep 17 00:00:00 2001
+From e0cc490d67ef8fa63d54a96e8fa9d631dfd713cb 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
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d39037a979..7378d531b6 100644
+index d39037a9..7378d531 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -98,7 +98,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index d39037a979..7378d531b6 100644
      protected int j;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 278ef79d89..5c3731f68a 100644
+index 278ef79d..5c3731f6 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -110,6 +110,16 @@ public class EntityFireworks extends Entity implements IProjectile {
@@ -39,7 +39,7 @@ index 278ef79d89..5c3731f68a 100644
          }, RayTrace.BlockCollisionOption.COLLIDER, true);
  
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index 3a1ad2346b..9ab57be850 100644
+index 3a1ad234..9ab57be8 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -146,6 +146,7 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
@@ -51,7 +51,7 @@ index 3a1ad2346b..9ab57be850 100644
          return this.getBlock().b(this, iblockaccess, blockposition, voxelshapecollision);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index ab875a7365..aed353365b 100644
+index ab875a73..aed35336 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -136,7 +136,8 @@ public class ItemBlock extends Item {
@@ -65,7 +65,7 @@ index ab875a7365..aed353365b 100644
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
 diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
-index 0f64a3c056..0f95bcbccb 100644
+index 0f64a3c0..0f95bcbc 100644
 --- a/src/main/java/net/minecraft/server/VoxelShape.java
 +++ b/src/main/java/net/minecraft/server/VoxelShape.java
 @@ -46,6 +46,7 @@ public abstract class VoxelShape {
@@ -77,7 +77,7 @@ index 0f64a3c056..0f95bcbccb 100644
          return (VoxelShape) (this.isEmpty() ? VoxelShapes.a() : new VoxelShapeArray(this.a, new DoubleListOffset(this.a(EnumDirection.EnumAxis.X), d0), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Y), d1), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Z), d2)));
      }
 diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java
-index 143be566c6..08c83c62df 100644
+index 143be566..08c83c62 100644
 --- a/src/main/java/net/minecraft/server/VoxelShapes.java
 +++ b/src/main/java/net/minecraft/server/VoxelShapes.java
 @@ -33,6 +33,7 @@ public final class VoxelShapes {
@@ -97,7 +97,7 @@ index 143be566c6..08c83c62df 100644
          if (operatorboolean.apply(false, false)) {
              throw (IllegalArgumentException) SystemUtils.c(new IllegalArgumentException());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 749915198b..1905aae877 100644
+index 2261c42a..378ac5ae 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -152,6 +152,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -148,7 +148,7 @@ index 749915198b..1905aae877 100644
      public boolean p_() {
          return this.isClientSide;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f931fa48b4..317a5bf4ef 100644
+index f931fa48..317a5bf4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1171,6 +1171,14 @@ public class CraftEventFactory {
@@ -167,5 +167,5 @@ index f931fa48b4..317a5bf4ef 100644
          return event;
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0256-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 89%
rename from Spigot-Server-Patches/0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0256-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
index c81e9f5f52..ad83072731 100644
--- a/Spigot-Server-Patches/0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
+++ b/Spigot-Server-Patches/0256-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@@ -1,4 +1,4 @@
-From 8aed5dee1485d23a7886293ae6035bdbcba93ad2 Mon Sep 17 00:00:00 2001
+From 690c2443891b33e7072e3421dc7fd5e234c63cd2 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index bb58fb796..54d48ef5e 100644
+index bb58fb79..54d48ef5 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -498,6 +498,7 @@ public class Chunk implements IChunkAccess {
@@ -26,5 +26,5 @@ index bb58fb796..54d48ef5e 100644
          this.entities.remove(entity); // Paper
      }
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0258-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0257-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 95%
rename from Spigot-Server-Patches/0258-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0257-Add-some-Debug-to-Chunk-Entity-slices.patch
index 72dc9b93ac..4ee864e870 100644
--- a/Spigot-Server-Patches/0258-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0257-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From 36fe8aa5205599e8be07f1b6ec98a6ae09ac3b9a Mon Sep 17 00:00:00 2001
+From 89795692719d0924f95531a4e2b861c5b03696bc 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
@@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created
 if the entity was to end up in 2 different chunk slices
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 54d48ef5e..8d3c265cc 100644
+index 54d48ef5..8d3c265c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -489,6 +489,25 @@ public class Chunk implements IChunkAccess {
@@ -58,7 +58,7 @@ index 54d48ef5e..8d3c265cc 100644
              return;
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7378d531b..356de07da 100644
+index 7378d531..356de07d 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
@@ -70,5 +70,5 @@ index 7378d531b..356de07da 100644
  
      public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0259-EntityTransformedEvent.patch b/Spigot-Server-Patches/0258-EntityTransformedEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0259-EntityTransformedEvent.patch
rename to Spigot-Server-Patches/0258-EntityTransformedEvent.patch
index 557042f125..d55836317f 100644
--- a/Spigot-Server-Patches/0259-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0258-EntityTransformedEvent.patch
@@ -1,11 +1,11 @@
-From a06407e3b553f3cee196f93f47dd32f701ee1e17 Mon Sep 17 00:00:00 2001
+From 3e8e2f0c35df3933f44810dfb16473584f3a4705 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 19c12728da..3706c31aad 100644
+index 19c12728..3706c31a 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -116,6 +116,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -17,7 +17,7 @@ index 19c12728da..3706c31aad 100644
  
                      this.die(); // CraftBukkit - from above
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 6ca4fa43c4..6e0020ae0b 100644
+index 6ca4fa43..6e0020ae 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -699,6 +699,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -29,7 +29,7 @@ index 6ca4fa43c4..6e0020ae0b 100644
          // CraftBukkit end
          this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 0240cef74a..31aba6bfc3 100644
+index 0240cef7..31aba6bf 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -257,6 +257,7 @@ public class EntityZombie extends EntityMonster {
@@ -49,7 +49,7 @@ index 0240cef74a..31aba6bfc3 100644
              this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index 91cac5d530..8082fa617a 100644
+index 91cac5d5..8082fa61 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -197,6 +197,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
@@ -61,5 +61,5 @@ index 91cac5d530..8082fa617a 100644
          worldserver.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason
          // CraftBukkit end
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0260-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0259-SkeletonHorse-Additions.patch
similarity index 94%
rename from Spigot-Server-Patches/0260-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0259-SkeletonHorse-Additions.patch
index be55112f5b..5ccf8e9d7c 100644
--- a/Spigot-Server-Patches/0260-SkeletonHorse-Additions.patch
+++ b/Spigot-Server-Patches/0259-SkeletonHorse-Additions.patch
@@ -1,11 +1,11 @@
-From 2def4b10aa913a36afc305f5e8e07c72190cfd8f Mon Sep 17 00:00:00 2001
+From 2da4f59005ac4219f00f63a985ab3a20efeb2ab0 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index 621f2afee5..290cb9337c 100644
+index 621f2afe..290cb933 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -31,7 +31,7 @@ index 621f2afee5..290cb9337c 100644
          if (flag != this.bG) {
              this.bG = flag;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index dfe5a63583..37626f925f 100644
+index dfe5a635..37626f92 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 @@ -15,6 +15,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@@ -43,7 +43,7 @@ index dfe5a63583..37626f925f 100644
  
          this.a.r(false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-index e822c2200d..2a7d1d4ec2 100644
+index e822c220..2a7d1d4e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 @@ -26,4 +26,26 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
@@ -74,5 +74,5 @@ index e822c2200d..2a7d1d4ec2 100644
 +    // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0261-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0260-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0261-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0260-Prevent-Saving-Bad-entities-to-chunks.patch
index a975cc10cb..89e3a2c402 100644
--- a/Spigot-Server-Patches/0261-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0260-Prevent-Saving-Bad-entities-to-chunks.patch
@@ -1,4 +1,4 @@
-From ac56ad751d4d82d4212eabc7f6dcdbc47b857bb7 Mon Sep 17 00:00:00 2001
+From 24172598e778ee9027f3183cdde638f350c3697a 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
@@ -18,7 +18,7 @@ an invalid entity.
 This should reduce log occurrences of dupe uuid messages.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 4af5a230b..83bcef7e6 100644
+index 4af5a230..83bcef7e 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -300,6 +300,7 @@ public class ChunkRegionLoader {
@@ -80,7 +80,7 @@ index 4af5a230b..83bcef7e6 100644
      public static ChunkStatus.Type a(@Nullable NBTTagCompound nbttagcompound) {
          if (nbttagcompound != null) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 6ce7f77a5..87762b172 100644
+index 6ce7f77a..87762b17 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1085,6 +1085,7 @@ public class WorldServer extends World {
@@ -118,5 +118,5 @@ index 6ce7f77a5..87762b172 100644
      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0262-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0261-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 96%
rename from Spigot-Server-Patches/0262-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0261-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 7a6c6987fc..7e98d76ba6 100644
--- a/Spigot-Server-Patches/0262-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0261-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -1,4 +1,4 @@
-From 47537f82a6f5a0de4bb3d6e1a1ee09fa1135683a Mon Sep 17 00:00:00 2001
+From 49432a1910abab2fef75e56f423750a578217537 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
@@ -11,7 +11,7 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
 Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index a41be8fdae..d5e8a7ee6d 100644
+index a41be8fd..d5e8a7ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -553,7 +553,7 @@ public final class CraftItemStack extends ItemStack {
@@ -24,7 +24,7 @@ index a41be8fdae..d5e8a7ee6d 100644
  
      static boolean hasItemMeta(net.minecraft.server.ItemStack item) {
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 3a82bede7c..d731418397 100644
+index 3a82bede..d7314183 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -2,10 +2,9 @@ package org.bukkit.craftbukkit.inventory;
@@ -77,5 +77,5 @@ index 3a82bede7c..d731418397 100644
      public void testConflictingStoredEnchantment() {
          EnchantmentStorageMeta itemMeta = (EnchantmentStorageMeta) Bukkit.getItemFactory().getItemMeta(Material.ENCHANTED_BOOK);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0262-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 96%
rename from Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0262-Ignore-Dead-Entities-in-entityList-iteration.patch
index 7689f6ed56..8477c7942b 100644
--- a/Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0262-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From 2d63a1d0f55b60e2f1b461a14e1b4b77424c28f2 Mon Sep 17 00:00:00 2001
+From 78f846465f4f93cb461215ef66ff965a3bcba3ab 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 b839769ce..5acad8e44 100644
+index b839769c..5acad8e4 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 b839769ce..5acad8e44 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 8d3c265cc..8d6c5d18e 100644
+index 8d3c265c..8d6c5d18 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -796,6 +796,7 @@ public class Chunk implements IChunkAccess {
@@ -51,7 +51,7 @@ index 8d3c265cc..8d6c5d18e 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 356de07da..33cd7f7b4 100644
+index 356de07d..33cd7f7b 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 356de07da..33cd7f7b4 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 87762b172..8d292604c 100644
+index 87762b17..8d292604 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -908,7 +908,7 @@ public class WorldServer extends World {
@@ -92,7 +92,7 @@ index 87762b172..8d292604c 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 588c87119..e94ac028d 100644
+index 588c8711..e94ac028 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1025,6 +1025,7 @@ public class CraftWorld implements World {
@@ -128,5 +128,5 @@ index 588c87119..e94ac028d 100644
  
                  if (bukkitEntity == null) {
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0264-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0263-Implement-Expanded-ArmorStand-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0264-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0263-Implement-Expanded-ArmorStand-API.patch
index 9cbdd7ce2b..be09c3d62a 100644
--- a/Spigot-Server-Patches/0264-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0263-Implement-Expanded-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From f7d2d3848b7823289d0174fe9ea68ba4205690a0 Mon Sep 17 00:00:00 2001
+From ab0e36766506a33e33b15878e29a96554d9869ba 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
@@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 992d7bfb0f..61d7d507aa 100644
+index 992d7bfb..61d7d507 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -29,7 +29,7 @@ index 992d7bfb0f..61d7d507aa 100644
          return (this.bB & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 124c3185bc..d1d689e5d7 100644
+index 124c3185..d1d689e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -126,5 +126,5 @@ index 124c3185bc..d1d689e5d7 100644
      // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0265-AnvilDamageEvent.patch b/Spigot-Server-Patches/0264-AnvilDamageEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0265-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0264-AnvilDamageEvent.patch
index 23cbc951ac..e3ab675a84 100644
--- a/Spigot-Server-Patches/0265-AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/0264-AnvilDamageEvent.patch
@@ -1,11 +1,11 @@
-From 69ea740d1362a02b4de939322a3113f3594ba7cc Mon Sep 17 00:00:00 2001
+From 20363551cb0ae0df34c79ac6adb9094efbbc2408 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
 
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index 1d9ce5ef1c..286b930ddb 100644
+index 1d9ce5ef..286b930d 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -85,6 +85,16 @@ public class ContainerAnvil extends Container {
@@ -26,5 +26,5 @@ index 1d9ce5ef1c..286b930ddb 100644
                          if (iblockdata1 == null) {
                              world.a(blockposition, false);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0266-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0265-Add-TNTPrimeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0266-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0265-Add-TNTPrimeEvent.patch
index c64076a49d..2cb46d1a91 100644
--- a/Spigot-Server-Patches/0266-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0265-Add-TNTPrimeEvent.patch
@@ -1,11 +1,11 @@
-From 93ec0f7901814f5559baa4ba4210a1818164472f Mon Sep 17 00:00:00 2001
+From 4252cf9ec2387ad8e4883277997e9469b0ca983d 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
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index 0ece78d4dc..1c30a02501 100644
+index d32857c8..b41de95a 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -40,7 +40,7 @@ index 0ece78d4dc..1c30a02501 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
-index 6cb82420b4..592fcd538a 100644
+index 6cb82420..592fcd53 100644
 --- a/src/main/java/net/minecraft/server/BlockTNT.java
 +++ b/src/main/java/net/minecraft/server/BlockTNT.java
 @@ -1,6 +1,7 @@
@@ -115,7 +115,7 @@ index 6cb82420b4..592fcd538a 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 138e2ea56a..6a4ccaeb0f 100644
+index 138e2ea5..6a4ccaeb 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 138e2ea56a..6a4ccaeb0f 100644
  
                  this.world.a(blockposition, false);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0267-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0266-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 96%
rename from Spigot-Server-Patches/0267-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0266-Break-up-and-make-tab-spam-limits-configurable.patch
index 7437f7602a..875c017fe8 100644
--- a/Spigot-Server-Patches/0267-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0266-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From a8320c956406ed8dfca64375d720c32d49bf7c52 Mon Sep 17 00:00:00 2001
+From 18d350ed5beaf27fcfa47d3ad10bd135a9e619b9 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
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 26ab855dcf..adef07d4d5 100644
+index 26ab855d..adef07d4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -287,4 +287,18 @@ public class PaperConfig {
@@ -45,7 +45,7 @@ index 26ab855dcf..adef07d4d5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8648845acb..6627d8402f 100644
+index 8648845a..6627d840 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 8648845acb..6627d8402f 100644
              return;
          }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0268-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0267-Add-hand-to-bucket-events.patch
similarity index 98%
rename from Spigot-Server-Patches/0268-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0267-Add-hand-to-bucket-events.patch
index 006f7d0862..a1aa0dc1aa 100644
--- a/Spigot-Server-Patches/0268-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0267-Add-hand-to-bucket-events.patch
@@ -1,11 +1,11 @@
-From 600e0f4800c2155415302ce757b65bf79854dabf Mon Sep 17 00:00:00 2001
+From de528e7073e73c37bcdc85a2969654bae96323aa 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 6e385b5304..2c8bbf20ae 100644
+index 6e385b53..2c8bbf20 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -61,7 +61,7 @@ public class EntityCow extends EntityAnimal {
@@ -18,7 +18,7 @@ index 6e385b5304..2c8bbf20ae 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index 7c5c049843..ffe4b9eb86 100644
+index 7c5c0498..ffe4b9eb 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -41,7 +41,7 @@ public class ItemBucket extends Item {
@@ -69,7 +69,7 @@ index 7c5c049843..ffe4b9eb86 100644
                          ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
                          ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 317a5bf4ef..f006b441ad 100644
+index 317a5bf4..f006b441 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -373,6 +373,20 @@ public class CraftEventFactory {
@@ -107,5 +107,5 @@ index 317a5bf4ef..f006b441ad 100644
          }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0269-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0268-MC-135506-Experience-should-save-as-Integers.patch
similarity index 91%
rename from Spigot-Server-Patches/0269-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0268-MC-135506-Experience-should-save-as-Integers.patch
index 590a5648b8..fbaf337b7b 100644
--- a/Spigot-Server-Patches/0269-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0268-MC-135506-Experience-should-save-as-Integers.patch
@@ -1,11 +1,11 @@
-From a059499a952e1ce9d0d4512cf3f47241d44a6588 Mon Sep 17 00:00:00 2001
+From 67313c686e96cb3cdfea580101ecb4b4be67b779 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 87c6b77ce3..53c6c33892 100644
+index 87c6b77c..53c6c338 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -207,7 +207,7 @@ public class EntityExperienceOrb extends Entity {
@@ -27,5 +27,5 @@ index 87c6b77ce3..53c6c33892 100644
      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0270-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0269-Fix-client-rendering-skulls-from-same-user.patch
similarity index 96%
rename from Spigot-Server-Patches/0270-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0269-Fix-client-rendering-skulls-from-same-user.patch
index d951fda7bd..dcb8b0d8db 100644
--- a/Spigot-Server-Patches/0270-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0269-Fix-client-rendering-skulls-from-same-user.patch
@@ -1,4 +1,4 @@
-From 3261b570ff6eaa68dec1814e27557f05b55f4f82 Mon Sep 17 00:00:00 2001
+From 2f847b20fdc241809b36afe8d9518f429d1eb984 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 641a52b968..0b0c3c681c 100644
+index 641a52b9..0b0c3c68 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 {
@@ -25,7 +25,7 @@ index 641a52b968..0b0c3c681c 100644
      private EntityItemFrame i;
      private ShapeDetectorBlock j;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index d9574a9ace..93ae6dcd78 100644
+index d9574a9a..93ae6dcd 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -253,6 +253,15 @@ public class PacketDataSerializer extends ByteBuf {
@@ -62,7 +62,7 @@ index d9574a9ace..93ae6dcd78 100644
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 3a1d0deb0d..1fcbbd698a 100644
+index 3a1d0deb..1fcbbd69 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -58,6 +58,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -74,7 +74,7 @@ index 3a1d0deb0d..1fcbbd698a 100644
                  this.g.add(nbttagcompound);
              }
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index 177cceb77f..0882d82cef 100644
+index 177cceb7..0882d82c 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -142,9 +142,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa
@@ -117,5 +117,5 @@ index 177cceb77f..0882d82cef 100644
      public NBTTagCompound b() {
          return this.save(new NBTTagCompound());
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0271-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0270-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 97%
rename from Spigot-Server-Patches/0271-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0270-Add-Early-Warning-Feature-to-WatchDog.patch
index 70982a4b77..8e393f00f8 100644
--- a/Spigot-Server-Patches/0271-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0270-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -1,4 +1,4 @@
-From 3dceaa4c5ffc0cf8a6fdbb0c3807dcef7c642938 Mon Sep 17 00:00:00 2001
+From d9584e11d270f4d10a69ad778b91a2602ea48311 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
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index adef07d4d5..214b577b32 100644
+index adef07d4..214b577b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -24,6 +24,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -36,7 +36,7 @@ index adef07d4d5..214b577b32 100644
      public static int tabSpamLimit = 500;
      private static void tabSpamLimiters() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7c268eb543..9e5fe97947 100644
+index b292e504..1bbe4fd8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -870,6 +870,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -48,7 +48,7 @@ index 7c268eb543..9e5fe97947 100644
                  long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
                  lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bc70d0fc79..4cf2887904 100644
+index bc70d0fc..4cf28879 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -770,6 +770,7 @@ public final class CraftServer implements Server {
@@ -68,7 +68,7 @@ index bc70d0fc79..4cf2887904 100644
  
      @Override
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 1cf214eaca..e66050b87a 100644
+index 1cf214ea..e66050b8 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -225,7 +225,7 @@ public class SpigotConfig
@@ -81,7 +81,7 @@ index 1cf214eaca..e66050b87a 100644
  
      public static boolean bungee;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 121c7ff601..07936eeba2 100644
+index 121c7ff6..07936eeb 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -5,6 +5,7 @@ import java.lang.management.MonitorInfo;
@@ -183,5 +183,5 @@ index 121c7ff601..07936eeba2 100644
              {
                  interrupt();
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0272-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0271-Make-EnderDragon-implement-Mob.patch
similarity index 92%
rename from Spigot-Server-Patches/0272-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0271-Make-EnderDragon-implement-Mob.patch
index 1df45095fc..136e64e031 100644
--- a/Spigot-Server-Patches/0272-Make-EnderDragon-implement-Mob.patch
+++ b/Spigot-Server-Patches/0271-Make-EnderDragon-implement-Mob.patch
@@ -1,11 +1,11 @@
-From 21ada7c53742cac07c0ec0f034a73d6c0135df49 Mon Sep 17 00:00:00 2001
+From f4473d86276ae564b5228f42a1b4fff5667e4322 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
-index cc115cc368..4947249da2 100644
+index cc115cc3..4947249d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 @@ -1,17 +1,18 @@
@@ -32,5 +32,5 @@ index cc115cc368..4947249da2 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0273-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0272-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 97%
rename from Spigot-Server-Patches/0273-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0272-Use-ConcurrentHashMap-in-JsonList.patch
index ecacd64b6e..1292d46d00 100644
--- a/Spigot-Server-Patches/0273-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0272-Use-ConcurrentHashMap-in-JsonList.patch
@@ -1,4 +1,4 @@
-From 8c73232c2470b81a1f291eb84e712488deabb722 Mon Sep 17 00:00:00 2001
+From b83898f26a8b24c740b4b6c581dd0fa2d5877415 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
@@ -25,7 +25,7 @@ The point of this is readability, but does have a side-benefit of a small microp
 Finally, added a couple obfhelpers for the modified code
 
 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 734e7ecf63..8570e38f42 100644
+index 734e7ecf..8570e38f 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -35,7 +35,8 @@ public class JsonList<K, V extends JsonListEntry<K>> {
@@ -99,5 +99,5 @@ index 734e7ecf63..8570e38f42 100644
          String s = this.b.toJson(collection);
          BufferedWriter bufferedwriter = null;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0274-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0273-Use-a-Queue-for-Queueing-Commands.patch
similarity index 94%
rename from Spigot-Server-Patches/0274-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0273-Use-a-Queue-for-Queueing-Commands.patch
index 3b93cea93b..e0329d24a3 100644
--- a/Spigot-Server-Patches/0274-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0273-Use-a-Queue-for-Queueing-Commands.patch
@@ -1,4 +1,4 @@
-From 35f21b9dfa9c886560a329181a4ddb1fd1c81305 Mon Sep 17 00:00:00 2001
+From 89eee188e06b61bc10b1ead166c78418b3af806a 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 ec257ba3..349a0ea2 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0275-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 92%
rename from Spigot-Server-Patches/0275-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index cf5c5844f4..509ac75ab1 100644
--- a/Spigot-Server-Patches/0275-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-Server-Patches/0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,11 +1,11 @@
-From 7f8d66cab05b5ab4c3d993c6059a836de7c83f66 Mon Sep 17 00:00:00 2001
+From 2986a99dd3e2f8b30dfa8a74adecb337abc2d681 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 2995237994..91f2066b12 100644
+index 29952379..91f2066b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -127,9 +127,16 @@ public class CraftChunk implements Chunk {
@@ -35,5 +35,5 @@ index 2995237994..91f2066b12 100644
  
          return entities;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0276-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0275-Allow-disabling-armour-stand-ticking.patch
similarity index 98%
rename from Spigot-Server-Patches/0276-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0275-Allow-disabling-armour-stand-ticking.patch
index 62c4939a09..04a67936cb 100644
--- a/Spigot-Server-Patches/0276-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0275-Allow-disabling-armour-stand-ticking.patch
@@ -1,11 +1,11 @@
-From c557cf35b3b59be8567caaaae4323d6add65ed0b Mon Sep 17 00:00:00 2001
+From 14fecaf11f803552ed46187c2fa561ffc28af497 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index eaaa51e4bf..bc3df01aab 100644
+index eaaa51e4..bc3df01a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -393,4 +393,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index eaaa51e4bf..bc3df01aab 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 61d7d507aa..42b9a339e9 100644
+index 61d7d507..42b9a339 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -44,6 +44,12 @@ public class EntityArmorStand extends EntityLiving {
@@ -142,7 +142,7 @@ index 61d7d507aa..42b9a339e9 100644
  
      public Vector3f r() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fea821be1c..0b84ead5f2 100644
+index fea821be..0b84ead5 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2326,52 +2326,7 @@ public abstract class EntityLiving extends Entity {
@@ -256,7 +256,7 @@ index fea821be1c..0b84ead5f2 100644
          float f2 = MathHelper.g(f - this.aI);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index d1d689e5d7..ac105270d5 100644
+index d1d689e5..ac105270 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -297,5 +297,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -277,5 +277,5 @@ index d1d689e5d7..ac105270d5 100644
      // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0277-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0276-Optimize-BlockPosition-helper-methods.patch
similarity index 97%
rename from Spigot-Server-Patches/0277-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0276-Optimize-BlockPosition-helper-methods.patch
index d40d8213f5..f00ee3b1cf 100644
--- a/Spigot-Server-Patches/0277-Optimize-BlockPosition-helper-methods.patch
+++ b/Spigot-Server-Patches/0276-Optimize-BlockPosition-helper-methods.patch
@@ -1,4 +1,4 @@
-From 48a58dc3035fea5f4492338ceff26b6c441bec39 Mon Sep 17 00:00:00 2001
+From ea0915386eeeb48a5e4a3d1505a42c03c9f4cde0 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 e9ea232a78..e76528f199 100644
+index e9ea232a..e76528f1 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 e9ea232a78..e76528f199 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0278-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0277-Send-nearby-packets-from-world-player-list-not-serve.patch
similarity index 96%
rename from Spigot-Server-Patches/0278-Send-nearby-packets-from-world-player-list-not-serve.patch
rename to Spigot-Server-Patches/0277-Send-nearby-packets-from-world-player-list-not-serve.patch
index ff8882b207..292a5fe560 100644
--- a/Spigot-Server-Patches/0278-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0277-Send-nearby-packets-from-world-player-list-not-serve.patch
@@ -1,11 +1,11 @@
-From ff414a1ec9636eefbb5e0c6cf55c51150885a0c4 Mon Sep 17 00:00:00 2001
+From ee158658a7daac620ed254197b946dfce35290af 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 5ae0927c1..6b6720185 100644
+index 5ae0927c..6b672018 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -910,8 +910,25 @@ public abstract class PlayerList {
@@ -46,7 +46,7 @@ index 5ae0927c1..6b6720185 100644
                  double d5 = d1 - entityplayer.locY();
                  double d6 = d2 - entityplayer.locZ();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 8d292604c..09176e604 100644
+index 8d292604..09176e60 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1290,7 +1290,7 @@ public class WorldServer extends World {
@@ -68,7 +68,7 @@ index 8d292604c..09176e604 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e94ac028d..d61769b4f 100644
+index e94ac028..d61769b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2120,7 +2120,7 @@ public class CraftWorld implements World {
@@ -81,5 +81,5 @@ index e94ac028d..d61769b4f 100644
  
      private static Map<String, GameRules.GameRuleKey<?>> gamerules;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0279-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0278-Restore-vanlla-default-mob-spawn-range.patch
similarity index 86%
rename from Spigot-Server-Patches/0279-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0278-Restore-vanlla-default-mob-spawn-range.patch
index 52de3fa5ce..010d871aff 100644
--- a/Spigot-Server-Patches/0279-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0278-Restore-vanlla-default-mob-spawn-range.patch
@@ -1,11 +1,11 @@
-From 471f3825a6d6ea9bf405009a92f3fe8854cd1759 Mon Sep 17 00:00:00 2001
+From 4adf68d34719a18581759afd2b38ceab59fef9a8 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 3cd66886cd..5e932a5d97 100644
+index 3cd66886..5e932a5d 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 3cd66886cd..5e932a5d97 100644
      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0280-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0279-Optimize-CraftBlockData-Creation.patch
similarity index 94%
rename from Spigot-Server-Patches/0280-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0279-Optimize-CraftBlockData-Creation.patch
index e14c80cd12..d9a34c587b 100644
--- a/Spigot-Server-Patches/0280-Optimize-CraftBlockData-Creation.patch
+++ b/Spigot-Server-Patches/0279-Optimize-CraftBlockData-Creation.patch
@@ -1,4 +1,4 @@
-From 60ad61e55d2f381ce48a5f4d2a44d77877dc1bd3 Mon Sep 17 00:00:00 2001
+From fff3f39209b3ec563dec9442cdbefc85d5ce8dd9 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
@@ -7,7 +7,7 @@ Avoids a hashmap lookup by cacheing a reference to the CraftBlockData
 and cloning it when one is needed.
 
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index 9ab57be850..c1ff62aa52 100644
+index 9ab57be8..c1ff62aa 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -4,6 +4,8 @@ import com.google.common.collect.ImmutableMap;
@@ -36,7 +36,7 @@ index 9ab57be850..c1ff62aa52 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 683b17a0c9..a0746a1694 100644
+index 683b17a0..a0746a16 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 683b17a0c9..a0746a1694 100644
      }
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0281-Fix-MC-124320.patch b/Spigot-Server-Patches/0280-Fix-MC-124320.patch
similarity index 95%
rename from Spigot-Server-Patches/0281-Fix-MC-124320.patch
rename to Spigot-Server-Patches/0280-Fix-MC-124320.patch
index 0d25c03320..45943811d0 100644
--- a/Spigot-Server-Patches/0281-Fix-MC-124320.patch
+++ b/Spigot-Server-Patches/0280-Fix-MC-124320.patch
@@ -1,11 +1,11 @@
-From f387340ba8c69c04a286d4ffebab07d10a3ca591 Mon Sep 17 00:00:00 2001
+From 757409f99b57549649bd4c5769a7669494f201f6 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
 
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 5f261b9b92..b9b750c369 100644
+index 5f261b9b..b9b750c3 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -170,6 +170,7 @@ public class Block implements IMaterial {
@@ -17,7 +17,7 @@ index 5f261b9b92..b9b750c369 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 b7c67f0cdb..d86f76f30b 100644
+index b7c67f0c..d86f76f3 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 b7c67f0cdb..d86f76f30b 100644
              if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1, blockposition1)) {
                  // CraftBukkit start - Place event
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0282-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0281-Slime-Pathfinder-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0282-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0281-Slime-Pathfinder-Events.patch
index f1fef5d0d1..ec36e9a186 100644
--- a/Spigot-Server-Patches/0282-Slime-Pathfinder-Events.patch
+++ b/Spigot-Server-Patches/0281-Slime-Pathfinder-Events.patch
@@ -1,11 +1,11 @@
-From 526dc2b7c2f5b56821bf60d31fc92513924a6498 Mon Sep 17 00:00:00 2001
+From 04d57c4de9c3435cf2294fde4d27ae8ccf76fe7f 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 3ecf732192..2efc18df94 100644
+index 3ecf7321..2efc18df 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -3,6 +3,14 @@ package net.minecraft.server;
@@ -147,7 +147,7 @@ index 3ecf732192..2efc18df94 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-index ce6ed6e890..6e9f1b66df 100644
+index ce6ed6e8..6e9f1b66 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 @@ -35,4 +35,14 @@ public class CraftSlime extends CraftMob implements Slime {
@@ -166,5 +166,5 @@ index ce6ed6e890..6e9f1b66df 100644
 +    // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0283-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0282-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 95%
rename from Spigot-Server-Patches/0283-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0282-Configurable-speed-for-water-flowing-over-lava.patch
index cb05d5f504..e88a14e81c 100644
--- a/Spigot-Server-Patches/0283-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0282-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,11 +1,11 @@
-From 58cfd40eafa75f38b2534a7e0a26b3b3c25ffd18 Mon Sep 17 00:00:00 2001
+From 15c67414bd3b3841caf54447dc1222ed9ce200fd 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bc3df01aab..487b0d5cd6 100644
+index bc3df01a..487b0d5c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -399,4 +399,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index bc3df01aab..487b0d5cd6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
-index f56e14e1e2..6d351f0979 100644
+index f56e14e1..6d351f09 100644
 --- a/src/main/java/net/minecraft/server/BlockFluids.java
 +++ b/src/main/java/net/minecraft/server/BlockFluids.java
 @@ -70,11 +70,28 @@ public class BlockFluids extends Block implements IFluidSource {
@@ -63,5 +63,5 @@ index f56e14e1e2..6d351f0979 100644
  
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0284-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0283-Optimize-RegistryMaterials.patch
similarity index 92%
rename from Spigot-Server-Patches/0284-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0283-Optimize-RegistryMaterials.patch
index fe2a6b4ae3..57773de299 100644
--- a/Spigot-Server-Patches/0284-Optimize-RegistryMaterials.patch
+++ b/Spigot-Server-Patches/0283-Optimize-RegistryMaterials.patch
@@ -1,4 +1,4 @@
-From 722a5fcb53b393d0a7292ca42756ab09fb294be9 Mon Sep 17 00:00:00 2001
+From c3732af7e8535275708cd94d5d135fa29b0bd9a0 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
@@ -8,7 +8,7 @@ Use larger initial sizes to increase bucket capacity on the BiMap
 BiMap.get was seen to be using a good bit of CPU time.
 
 diff --git a/src/main/java/net/minecraft/server/RegistryMaterials.java b/src/main/java/net/minecraft/server/RegistryMaterials.java
-index 2d6a7b3a47..8477febca2 100644
+index 2d6a7b3a..8477febc 100644
 --- a/src/main/java/net/minecraft/server/RegistryMaterials.java
 +++ b/src/main/java/net/minecraft/server/RegistryMaterials.java
 @@ -16,8 +16,8 @@ import org.apache.logging.log4j.Logger;
@@ -31,5 +31,5 @@ index 2d6a7b3a47..8477febca2 100644
      }
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0285-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0284-Add-PhantomPreSpawnEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0285-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0284-Add-PhantomPreSpawnEvent.patch
index fca441d5d2..38e9dcf4df 100644
--- a/Spigot-Server-Patches/0285-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-Server-Patches/0284-Add-PhantomPreSpawnEvent.patch
@@ -1,11 +1,11 @@
-From 9c2d55e826a2238f476f6ca0624ef55a7ae5cc4d Mon Sep 17 00:00:00 2001
+From 5e27e8d5bdc8fc534f405757690bc097819a6767 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index b62a8227b2..82323bf4ac 100644
+index b62a8227..82323bf4 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -130,6 +130,11 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -48,7 +48,7 @@ index b62a8227b2..82323bf4ac 100644
  
          private final PathfinderTargetCondition b;
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index add566ea4f..f488c22ed6 100644
+index add566ea..f488c22e 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 @@ -52,8 +52,17 @@ public class MobSpawnerPhantom {
@@ -71,7 +71,7 @@ index add566ea4f..f488c22ed6 100644
                                                  groupdataentity = entityphantom.prepare(worldserver, difficultydamagescaler, EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null);
                                                  worldserver.addEntity(entityphantom, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-index 9f9ee92390..2b97313694 100644
+index 9f9ee923..2b973136 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
 @@ -35,4 +35,10 @@ public class CraftPhantom extends CraftFlying implements Phantom {
@@ -86,5 +86,5 @@ index 9f9ee92390..2b97313694 100644
 +    // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0286-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0285-Add-More-Creeper-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0286-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0285-Add-More-Creeper-API.patch
index 8a13fadf8f..19c9ee21e0 100644
--- a/Spigot-Server-Patches/0286-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0285-Add-More-Creeper-API.patch
@@ -1,11 +1,11 @@
-From 06d8f45f06b194608244981d47063e49d2d34abe Mon Sep 17 00:00:00 2001
+From 47e5b03171d034db36f02ac6dbab155184e3f46e 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index b895300797..45dfc8104a 100644
+index b8953007..45dfc810 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -14,7 +14,7 @@ public class EntityCreeper extends EntityMonster {
@@ -38,7 +38,7 @@ index b895300797..45dfc8104a 100644
  
      public boolean canCauseHeadDrop() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
-index 896405148c..075a5e77e2 100644
+index 89640514..075a5e77 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 @@ -88,4 +88,18 @@ public class CraftCreeper extends CraftMonster implements Creeper {
@@ -61,5 +61,5 @@ index 896405148c..075a5e77e2 100644
 +    // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0287-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0286-Inventory-removeItemAnySlot.patch
similarity index 95%
rename from Spigot-Server-Patches/0287-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0286-Inventory-removeItemAnySlot.patch
index 7677accff5..2f084fb72e 100644
--- a/Spigot-Server-Patches/0287-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0286-Inventory-removeItemAnySlot.patch
@@ -1,11 +1,11 @@
-From dfefab1e8a9782e07b19cab09b33353ff0cc7a91 Mon Sep 17 00:00:00 2001
+From 4dc9d2ec2628aeb210f80aac4a3ce48407811202 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 0d637e207e..026a0c3995 100644
+index 0d637e20..026a0c39 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 @@ -223,10 +223,16 @@ public class CraftInventory implements Inventory {
@@ -57,5 +57,5 @@ index 0d637e207e..026a0c3995 100644
                  // Drat! we don't have this type in the inventory
                  if (first == -1) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0288-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 90%
rename from Spigot-Server-Patches/0288-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index aa4a75b02b..28aeda6890 100644
--- a/Spigot-Server-Patches/0288-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From b94ad02de37cef49e2e9940d81fc7d23f1f41322 Mon Sep 17 00:00:00 2001
+From 8707fd0b7db5806f4db49a77cd944b6a26380efc 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 d61769b4f2..6e1ae94cea 100644
+index d61769b4..6e1ae94c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -499,7 +499,7 @@ public class CraftWorld implements World {
@@ -19,5 +19,5 @@ index d61769b4f2..6e1ae94cea 100644
          // If generate = false, but the chunk already exists, we will get this back.
          if (chunk instanceof ProtoChunkExtension) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0289-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0288-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 96%
rename from Spigot-Server-Patches/0289-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0288-Add-ray-tracing-methods-to-LivingEntity.patch
index e117588a21..1509382a24 100644
--- a/Spigot-Server-Patches/0289-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0288-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,11 +1,11 @@
-From c64179e5ccdcee7c33334fdd66243bcbf69f7a61 Mon Sep 17 00:00:00 2001
+From d3b3cbc37c86796149d287801e75104238ca1d20 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 0b84ead5..fa097e05 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 02346f1c..d197094f 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0290-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0289-Expose-attack-cooldown-methods-for-Player.patch
similarity index 93%
rename from Spigot-Server-Patches/0290-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0289-Expose-attack-cooldown-methods-for-Player.patch
index 8a5513ea12..2bfaa81640 100644
--- a/Spigot-Server-Patches/0290-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0289-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,11 +1,11 @@
-From a6a1c9d5fa82bfa5253abd4beb164014cbdfa7d1 Mon Sep 17 00:00:00 2001
+From 50fce82521d2c181194520c980498495f0397c55 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 36748ccb..308ac18f 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 91ad5776c8..c7bd3015a8 100644
+index 91ad5776..c7bd3015 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1905,6 +1905,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -52,5 +52,5 @@ index 91ad5776c8..c7bd3015a8 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0291-Improve-death-events.patch b/Spigot-Server-Patches/0290-Improve-death-events.patch
similarity index 98%
rename from Spigot-Server-Patches/0291-Improve-death-events.patch
rename to Spigot-Server-Patches/0290-Improve-death-events.patch
index b90173ab6f..8ea15c0ffd 100644
--- a/Spigot-Server-Patches/0291-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0290-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From 03d1317242420df40cad6417971e8dfa7791c318 Mon Sep 17 00:00:00 2001
+From 368cd7d7cc190d3cc714dc97b217f09fa9c0c393 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 6daa400d..38fe29f8 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 33cd7f7b40..09c5760571 100644
+index 33cd7f7b..09c57605 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 33cd7f7b40..09c5760571 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 42b9a339..8ad131e4 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 2be6c7bd..82a32d5d 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 80717ad9..53aac5bc 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 fa097e05..eed3e7c5 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 12ba65ed..e6a4defd 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 90fdf89c..b761a41d 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 c7bd3015a8..823dba0143 100644
+index c7bd3015..823dba01 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1698,7 +1698,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -378,7 +378,7 @@ index c7bd3015a8..823dba0143 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 f006b441..39ce40bd 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0292-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0291-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 91%
rename from Spigot-Server-Patches/0292-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0291-Allow-chests-to-be-placed-with-NBT-data.patch
index c52c37a8df..6249164033 100644
--- a/Spigot-Server-Patches/0292-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0291-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -1,11 +1,11 @@
-From 8d04bf71f2799f76748dda29368b353de66a2da0 Mon Sep 17 00:00:00 2001
+From 6e4fca561d5f911253c660b4a0efa1651ac22608 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 0b0c3c681c..d953cdef14 100644
+index 0b0c3c68..d953cdef 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 {
@@ -17,7 +17,7 @@ index 0b0c3c681c..d953cdef14 100644
                      for (BlockState blockstate : blocks) {
                          blockstate.update(true, false);
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index c4766f729f..b22bd06e27 100644
+index c4766f72..b22bd06e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -292,7 +292,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
@@ -30,5 +30,5 @@ index c4766f729f..b22bd06e27 100644
      // CraftBukkit end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0293-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0292-Mob-Pathfinding-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0293-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0292-Mob-Pathfinding-API.patch
index e4bbfc9b87..39dc122e41 100644
--- a/Spigot-Server-Patches/0293-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0292-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From bc7c2e7e49e26c3c2070d414fa8453c50468abff Mon Sep 17 00:00:00 2001
+From c1aa632f06a543b640466a0914defd71cd868916 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
@@ -7,7 +7,7 @@ Implements Pathfinding API for mobs
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 new file mode 100644
-index 0000000000..f68a07cb96
+index 00000000..f68a07cb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 @@ -0,0 +1,111 @@
@@ -123,7 +123,7 @@ index 0000000000..f68a07cb96
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index bdd092e49d..f06764973f 100644
+index bdd092e4..f0676497 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -80,7 +80,7 @@ public abstract class NavigationAbstract {
@@ -170,7 +170,7 @@ index bdd092e49d..f06764973f 100644
          this.c = null;
      }
 diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java
-index 312352ef84..dcb4e25080 100644
+index 312352ef..dcb4e250 100644
 --- a/src/main/java/net/minecraft/server/PathEntity.java
 +++ b/src/main/java/net/minecraft/server/PathEntity.java
 @@ -5,13 +5,14 @@ import javax.annotation.Nullable;
@@ -210,7 +210,7 @@ index 312352ef84..dcb4e25080 100644
  
          return new Vec3D((double) pathpoint.a, (double) pathpoint.b, (double) pathpoint.c);
 diff --git a/src/main/java/net/minecraft/server/PathPoint.java b/src/main/java/net/minecraft/server/PathPoint.java
-index b1db95daa9..18cdd2a6f2 100644
+index b1db95da..18cdd2a6 100644
 --- a/src/main/java/net/minecraft/server/PathPoint.java
 +++ b/src/main/java/net/minecraft/server/PathPoint.java
 @@ -2,9 +2,9 @@ package net.minecraft.server;
@@ -227,7 +227,7 @@ index b1db95daa9..18cdd2a6f2 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 90e63fbf29..c89bc7024b 100644
+index 90e63fbf..c89bc702 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 90e63fbf29..c89bc7024b 100644
      public void setTarget(LivingEntity target) {
          EntityInsentient entity = getHandle();
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0294-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0293-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 97%
rename from Spigot-Server-Patches/0294-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0293-Prevent-chunk-loading-from-Fluid-Flowing.patch
index c7c1a3204a..cf3b971e99 100644
--- a/Spigot-Server-Patches/0294-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0293-Prevent-chunk-loading-from-Fluid-Flowing.patch
@@ -1,11 +1,11 @@
-From 9ce6409bc92570018aff1d20ccf60dc430b76b88 Mon Sep 17 00:00:00 2001
+From cd5e978ef109b1f4f9893313c4d1649bc673507d 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
 
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
-index 3099a5e654..376dca1889 100644
+index 3099a5e6..376dca18 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 @@ -178,7 +178,8 @@ public abstract class FluidTypeFlowing extends FluidType {
@@ -74,5 +74,5 @@ index 3099a5e654..376dca1889 100644
              Fluid fluid = (Fluid) pair.getSecond();
              Fluid fluid1 = this.a(iworldreader, blockposition1, iblockdata1);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0295-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0294-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 99%
rename from Spigot-Server-Patches/0295-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0294-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 52cb69f8a2..aa52f09b3c 100644
--- a/Spigot-Server-Patches/0295-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0294-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -1,11 +1,11 @@
-From 4d15c26db34cd2a7a986333bf5c9c651ad0ad7f5 Mon Sep 17 00:00:00 2001
+From 7f50ea4acc7bed222f5809dbec932bbe1657ea73 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 005ebec2..97d85f84 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 0682c6e859..cdd262d86c 100644
+index 0682c6e8..cdd262d8 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 0682c6e859..cdd262d86c 100644
 +    // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0296-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0296-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index dae6057f88..ce771a7235 100644
--- a/Spigot-Server-Patches/0296-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -1,11 +1,11 @@
-From 58c7ca3b9948d2c9baaf262cef5eff7028eacc55 Mon Sep 17 00:00:00 2001
+From 73807d6a1e1c09a01de6f4c8320c9d33b8ad5bf1 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
-index bf8ca9b32a..7ccb3d5c06 100644
+index bf8ca9b3..7ccb3d5c 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 @@ -12,11 +12,13 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
@@ -52,7 +52,7 @@ index bf8ca9b32a..7ccb3d5c06 100644
          return ichunkaccess == null ? false : ichunkaccess.getType(blockposition).getBlock() == this.g && ichunkaccess.getType(blockposition.up()).isAir() && ichunkaccess.getType(blockposition.up(2)).isAir();
      }
 diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
-index d4cd50918b..d6a3b99339 100644
+index d4cd5091..d6a3b993 100644
 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 @@ -109,6 +109,7 @@ public class RandomPositionGenerator {
@@ -74,5 +74,5 @@ index d4cd50918b..d6a3b99339 100644
  
                          if (entitycreature.a(pathtype) == 0.0F) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0297-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0296-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0297-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0296-Prevent-mob-spawning-from-loading-generating-chunks.patch
index fedfec6c85..de7f66e564 100644
--- a/Spigot-Server-Patches/0297-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0296-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -1,4 +1,4 @@
-From 62a5fbd83eb1ff11054f452ffcaae5ac6765c40e Mon Sep 17 00:00:00 2001
+From 6021ab3aee3fc3c4ca4c8f47288501cc78907389 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks
 also prevents if out of world border bounds
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 224443e03c..fdac5bb3a2 100644
+index 224443e0..fdac5bb3 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -25,9 +25,9 @@ public final class SpawnerCreature {
@@ -31,5 +31,5 @@ index 224443e03c..fdac5bb3a2 100644
  
                                          if (Objects.equals(chunkcoordintpair, chunk.getPos()) || worldserver.getChunkProvider().a(chunkcoordintpair)) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0298-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0297-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 96%
rename from Spigot-Server-Patches/0298-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0297-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 2288a6cad8..d55d5b7bd3 100644
--- a/Spigot-Server-Patches/0298-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0297-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -1,4 +1,4 @@
-From 12f2a8dde886fa81a863880a11ae83f1e5c7773e Mon Sep 17 00:00:00 2001
+From 4e1809b36c121e90921dd49148bfd940913925d0 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
 Uses an EnumMap as well as a Set paired List for O(1) contains calls.
 
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 253890e537..0102a170dc 100644
+index 253890e5..0102a170 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -40,7 +40,7 @@ public abstract class BiomeBase {
@@ -67,5 +67,5 @@ index 253890e537..0102a170dc 100644
  
          @Nullable
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0299-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0298-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0299-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0298-Implement-furnace-cook-speed-multiplier-API.patch
index 2f3124f383..b45aa40d6a 100644
--- a/Spigot-Server-Patches/0299-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0298-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From bca5d9e6222ebe8e36e70c5ee952bbf8074c200f Mon Sep 17 00:00:00 2001
+From d7ffcb646629d9798e43fcec8f2b30853bca1db8 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API
 Signed-off-by: Tassu <git@tassu.me>
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index 560e2f42b7..d5432bfeb7 100644
+index 560e2f42..d5432bfe 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -8,6 +8,7 @@ import java.util.Map;
@@ -57,7 +57,7 @@ index 560e2f42b7..d5432bfeb7 100644
                          this.cookTimeTotal = this.getRecipeCookingTime();
                          this.burn(irecipe);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
-index 9cc67915ca..1ce10ea049 100644
+index 9cc67915..1ce10ea0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 @@ -63,4 +63,18 @@ public class CraftFurnace<T extends TileEntityFurnace> extends CraftContainer<T>
@@ -80,5 +80,5 @@ index 9cc67915ca..1ce10ea049 100644
 +    // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0300-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0299-Support-Overriding-World-Seeds.patch
similarity index 95%
rename from Spigot-Server-Patches/0300-Support-Overriding-World-Seeds.patch
rename to Spigot-Server-Patches/0299-Support-Overriding-World-Seeds.patch
index 233d7647f3..13c7f5f1d6 100644
--- a/Spigot-Server-Patches/0300-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0299-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From 7e93a6e76fe86b6d50d0dcc9a60f12e0da99d8fc Mon Sep 17 00:00:00 2001
+From 83dcfa541d103b236a0b0e832cd09481e17fcc2a 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
@@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is
 a permanent change in that it won't go back if you remove it from paper.yml
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 214b577b32..559e6b42ba 100644
+index 214b577b..559e6b42 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
@@ -59,7 +59,7 @@ index 214b577b32..559e6b42ba 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9e5fe97947..52ec526fc6 100644
+index 1bbe4fd8..6c6e8eae 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -378,7 +378,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -72,7 +72,7 @@ index 9e5fe97947..52ec526fc6 100644
  
              if (j == 0) {
 diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
-index 561b6d9469..95518e54d1 100644
+index 561b6d94..95518e54 100644
 --- a/src/main/java/net/minecraft/server/WorldData.java
 +++ b/src/main/java/net/minecraft/server/WorldData.java
 @@ -127,7 +127,7 @@ public class WorldData {
@@ -85,7 +85,7 @@ index 561b6d9469..95518e54d1 100644
              String s = nbttagcompound.getString("generatorName");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4cf2887904..f36b642466 100644
+index 4cf28879..f36b6424 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1015,7 +1015,7 @@ public final class CraftServer implements Server {
@@ -98,5 +98,5 @@ index 4cf2887904..f36b642466 100644
              if (parsedSettings.isJsonObject()) {
                  worldSettings.setGeneratorSettings(parsedSettings.getAsJsonObject());
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0301-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0300-Optimize-Server-World-Map.patch
similarity index 98%
rename from Spigot-Server-Patches/0301-Optimize-Server-World-Map.patch
rename to Spigot-Server-Patches/0300-Optimize-Server-World-Map.patch
index d60ba3dc9e..3ef435711c 100644
--- a/Spigot-Server-Patches/0301-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0300-Optimize-Server-World-Map.patch
@@ -1,4 +1,4 @@
-From a4cf872539ce7580502003219769c1fdad3d2700 Mon Sep 17 00:00:00 2001
+From cff5d9292ccb5e528a27ab5afcc8959958842286 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
@@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 new file mode 100644
-index 0000000000..6bb2f98b45
+index 00000000..6bb2f98b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 @@ -0,0 +1,191 @@
@@ -217,7 +217,7 @@ index 0000000000..6bb2f98b45
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 52ec526fc6..a3156d0034 100644
+index 6c6e8eae..e7197f20 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -88,7 +88,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -247,5 +247,5 @@ index 52ec526fc6..a3156d0034 100644
              DimensionManager dimensionmanager = worldserver.worldProvider.getDimensionManager();
              ForcedChunk forcedchunk = (ForcedChunk) worldserver.getWorldPersistentData().b(ForcedChunk::new, "chunks");
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0302-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0301-PreSpawnerSpawnEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0302-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0301-PreSpawnerSpawnEvent.patch
index c420824e65..681b833b34 100644
--- a/Spigot-Server-Patches/0302-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0301-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From f88d977fa19df0f4beddb9a9cca47ac9f91945cd Mon Sep 17 00:00:00 2001
+From 8b387d169ccfa45563cf644a30f0b3b67b6a0d0f 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 43c491f71b..cb7cb789b8 100644
+index 43c491f7..cb7cb789 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 43c491f71b..cb7cb789b8 100644
                              if (!event.callEvent()) {
                                  flag = true;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0303-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0302-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 94%
rename from Spigot-Server-Patches/0303-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0302-Catch-JsonParseException-in-Entity-and-TE-names.patch
index d1d730eeb2..d8cca769e3 100644
--- a/Spigot-Server-Patches/0303-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0302-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From bb11bd0089f09b31285aba9951950aa71652e52f Mon Sep 17 00:00:00 2001
+From 3a7c408083a0e6bcb430d26dfa7471c7700a7f1f 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 78671229..ef2a496e 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 09c5760571..d1ab124fe1 100644
+index 09c57605..d1ab124f 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 09c5760571..d1ab124fe1 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 9d0b0c9fc3..3342278bcd 100644
+index 9d0b0c9f..3342278b 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -437,4 +437,19 @@ public final class MCUtil {
@@ -63,7 +63,7 @@ index 9d0b0c9fc3..3342278bcd 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 93911a82..d35604ed 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 473ec2cb..ab6b86e4 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0304-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0303-Avoid-dimension-id-collisions.patch
similarity index 90%
rename from Spigot-Server-Patches/0304-Avoid-dimension-id-collisions.patch
rename to Spigot-Server-Patches/0303-Avoid-dimension-id-collisions.patch
index 798109a0f8..b2be022d6d 100644
--- a/Spigot-Server-Patches/0304-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0303-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From fa42338dad126ebf5de33faa164321e0c4262811 Mon Sep 17 00:00:00 2001
+From 1f356bdd9299e51edb45240987e154788130888f 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
@@ -8,7 +8,7 @@ we would reuse an existing dimension id, if some other dimension was
 unloaded before.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f36b642466..4289d029c2 100644
+index f36b6424..4289d029 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1001,7 +1001,7 @@ public final class CraftServer implements Server {
@@ -21,5 +21,5 @@ index f36b642466..4289d029c2 100644
                      dimension++;
                      break;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0305-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0304-Honor-EntityAgeable.ageLock.patch
similarity index 84%
rename from Spigot-Server-Patches/0305-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0304-Honor-EntityAgeable.ageLock.patch
index 50430cb16f..9feb705846 100644
--- a/Spigot-Server-Patches/0305-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0304-Honor-EntityAgeable.ageLock.patch
@@ -1,11 +1,11 @@
-From 7e39e279493c6f61eb99fd3cd85df24f637e5610 Mon Sep 17 00:00:00 2001
+From 300de9c618a02d1da412658208b03742479959f9 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
-index cec938436d..3d27f0964a 100644
+index cec93843..3d27f096 100644
 --- a/src/main/java/net/minecraft/server/EntityAgeable.java
 +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
 @@ -101,6 +101,7 @@ public abstract class EntityAgeable extends EntityCreature {
@@ -17,5 +17,5 @@ index cec938436d..3d27f0964a 100644
          int k = j;
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0306-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0305-Configurable-connection-throttle-kick-message.patch
similarity index 93%
rename from Spigot-Server-Patches/0306-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0305-Configurable-connection-throttle-kick-message.patch
index d76a2a3991..c2be311dd1 100644
--- a/Spigot-Server-Patches/0306-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0305-Configurable-connection-throttle-kick-message.patch
@@ -1,11 +1,11 @@
-From baa13d99b6486a715485bc884a8fbb46fb8b4b72 Mon Sep 17 00:00:00 2001
+From 58a0ed1dff62d1555b8ec0fb242a201daf078077 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 559e6b42ba..092bff78ab 100644
+index 559e6b42..092bff78 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -274,6 +274,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 559e6b42ba..092bff78ab 100644
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 8928d93e49..0532f975b7 100644
+index 8928d93e..0532f975 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -38,7 +38,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -34,5 +34,5 @@ index 8928d93e49..0532f975b7 100644
                              this.b.close(chatmessage);
                              return;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0307-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0306-Hook-into-CB-plugin-rewrites.patch
similarity index 98%
rename from Spigot-Server-Patches/0307-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0306-Hook-into-CB-plugin-rewrites.patch
index e17df9149d..2f6dfbd038 100644
--- a/Spigot-Server-Patches/0307-Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/0306-Hook-into-CB-plugin-rewrites.patch
@@ -1,4 +1,4 @@
-From 7135a3b8ff00bb8d89cc92d2042a1e8584bef361 Mon Sep 17 00:00:00 2001
+From 7fbced0cdb08c7054eac75e95fc41851dbc20426 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 2d334a5944..79c9489c09 100644
+index 2d334a59..79c9489c 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 2d334a5944..79c9489c09 100644
                          {
                              if ( owner.equals( "org/bukkit/Material" ) )
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0308-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0307-Allow-setting-the-vex-s-summoner.patch
similarity index 90%
rename from Spigot-Server-Patches/0308-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0307-Allow-setting-the-vex-s-summoner.patch
index 6741e44336..b993340006 100644
--- a/Spigot-Server-Patches/0308-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/0307-Allow-setting-the-vex-s-summoner.patch
@@ -1,11 +1,11 @@
-From 8e566fa097a632ed13c96649953fece395650d19 Mon Sep 17 00:00:00 2001
+From 373a890a522dad9ebad8b778f93eff7f3e339a55 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index a46730460e..cf274666c7 100644
+index a4673046..cf274666 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -133,6 +133,7 @@ public class EntityVex extends EntityMonster {
@@ -17,7 +17,7 @@ index a46730460e..cf274666c7 100644
          this.c = entityinsentient;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 169c951ec3..2f7df3074f 100644
+index 169c951e..2f7df307 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex {
@@ -32,5 +32,5 @@ index 169c951ec3..2f7df3074f 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0309-Add-sun-related-API.patch b/Spigot-Server-Patches/0308-Add-sun-related-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0309-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0308-Add-sun-related-API.patch
index b61357d6b3..021ff93293 100644
--- a/Spigot-Server-Patches/0309-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0308-Add-sun-related-API.patch
@@ -1,11 +1,11 @@
-From f61767388b25a94579dfd532dd2ce11b65870c3f Mon Sep 17 00:00:00 2001
+From c40bedc48e521d9c3b9326da8026583615f05667 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 b5816dc8..bed15873 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 6e1ae94cea..06b2e8b910 100644
+index 6e1ae94c..06b2e8b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -856,6 +856,13 @@ public class CraftWorld implements World {
@@ -35,7 +35,7 @@ index 6e1ae94cea..06b2e8b910 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 c89bc702..eaad222f 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0310-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0309-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 92%
rename from Spigot-Server-Patches/0310-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0309-Check-Drowned-for-Villager-Aggression-Config.patch
index 53962686ed..cbf22592b6 100644
--- a/Spigot-Server-Patches/0310-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/0309-Check-Drowned-for-Villager-Aggression-Config.patch
@@ -1,11 +1,11 @@
-From eab9f638506950fbaf6c57a3abbde9981bcbfdbd Mon Sep 17 00:00:00 2001
+From 012140bfe4d41e36b163c7a27f200413683ec3a4 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 70c06ca775..77885f67ff 100644
+index 70c06ca7..77885f67 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -29,7 +29,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@@ -18,5 +18,5 @@ index 70c06ca775..77885f67ff 100644
          this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bw));
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0311-Here-s-Johnny.patch b/Spigot-Server-Patches/0310-Here-s-Johnny.patch
similarity index 91%
rename from Spigot-Server-Patches/0311-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0310-Here-s-Johnny.patch
index 0903eb9229..d7d6650633 100644
--- a/Spigot-Server-Patches/0311-Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/0310-Here-s-Johnny.patch
@@ -1,11 +1,11 @@
-From 05a987e75e5b75f12edb023cf70737020f1748b1 Mon Sep 17 00:00:00 2001
+From c59690eed8ad60eb841233b638fb0d95c85de0e4 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!
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index 73ecdd22ea..c974c02e92 100644
+index 73ecdd22..c974c02e 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -18,7 +18,7 @@ index 73ecdd22ea..c974c02e92 100644
      public EntityVindicator(EntityTypes<? extends EntityVindicator> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
-index 951d479298..5ff957ced7 100644
+index 951d4792..5ff957ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
 @@ -25,4 +25,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator {
@@ -37,5 +37,5 @@ index 951d479298..5ff957ced7 100644
 +    // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0312-Turtle-API.patch b/Spigot-Server-Patches/0311-Turtle-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0312-Turtle-API.patch
rename to Spigot-Server-Patches/0311-Turtle-API.patch
index 42dd42fdf5..fcee8d7743 100644
--- a/Spigot-Server-Patches/0312-Turtle-API.patch
+++ b/Spigot-Server-Patches/0311-Turtle-API.patch
@@ -1,11 +1,11 @@
-From 98df26a22cd07c9cfb2394c69888a7305456d715 Mon Sep 17 00:00:00 2001
+From 8cad9ca1f86f66b4a61c7d2d623d0aee7207a14d 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 76296119a1..dd02cb3485 100644
+index 76296119..dd02cb34 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal {
@@ -103,7 +103,7 @@ index 76296119a1..dd02cb3485 100644
  
          @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
-index 123a2c75ca..8edcf7af65 100644
+index 123a2c75..8edcf7af 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 @@ -1,6 +1,8 @@
@@ -153,5 +153,5 @@ index 123a2c75ca..8edcf7af65 100644
 +    // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0313-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0312-Limit-lightning-strike-effect-distance.patch
similarity index 96%
rename from Spigot-Server-Patches/0313-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0312-Limit-lightning-strike-effect-distance.patch
index 5797398012..077cf3d74c 100644
--- a/Spigot-Server-Patches/0313-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0312-Limit-lightning-strike-effect-distance.patch
@@ -1,11 +1,11 @@
-From 7aa6bb5c04a2ef405ebf63c82a6fc3e1e5698227 Mon Sep 17 00:00:00 2001
+From 192c8957493a4417522392c8fc399551b121c017 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 487b0d5cd..b8789c8ec 100644
+index 487b0d5c..b8789c8e 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 487b0d5cd..b8789c8ec 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 7c518983a..bdb534deb 100644
+index 7c518983..bdb534de 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 7c518983a..bdb534deb 100644
  
          --this.lifeTicks;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 09176e604..43565dd92 100644
+index 09176e60..43565dd9 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1290,7 +1290,7 @@ public class WorldServer extends World {
@@ -82,5 +82,5 @@ index 09176e604..43565dd92 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0314-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0313-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 93%
rename from Spigot-Server-Patches/0314-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0313-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index ad4ad22676..9b4e02bf92 100644
--- a/Spigot-Server-Patches/0314-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/Spigot-Server-Patches/0313-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@@ -1,4 +1,4 @@
-From b202ec7c549246810a3383a5808201ec16d9d7f3 Mon Sep 17 00:00:00 2001
+From 17221c4cbed3895c74b4a7283c51c6ff54325d38 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
@@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check
 other worlds.
 
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 9eed1dce3e..6c091b6808 100644
+index 9eed1dce..6c091b68 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -209,6 +209,16 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -32,5 +32,5 @@ index 9eed1dce3e..6c091b6808 100644
              if (entity instanceof EntityLiving) {
                  this.shooter = (EntityLiving) entity;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0315-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0314-Call-player-spectator-target-events.patch
similarity index 93%
rename from Spigot-Server-Patches/0315-Call-player-spectator-target-events.patch
rename to Spigot-Server-Patches/0314-Call-player-spectator-target-events.patch
index e9e654b633..62404898f8 100644
--- a/Spigot-Server-Patches/0315-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0314-Call-player-spectator-target-events.patch
@@ -1,11 +1,11 @@
-From 095ce8a4d451ea69a0a90b675c452d149e5e16bf Mon Sep 17 00:00:00 2001
+From 77c97810a804f4f686a5e3ea7742a6643e3e6a23 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 e6a4defd..d63ab3e2 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 {
@@ -17,7 +17,7 @@ index 4b40ffa978..bf21fb69a5 100644
      public boolean worldChangeInvuln;
      private boolean cm; private void setHasSeenCredits(boolean has) { this.cm = has; } // Paper - OBFHELPER
      private final RecipeBookServer recipeBook;
-@@ -1591,15 +1591,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1584,15 +1584,35 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          return (Entity) (this.spectatedEntity == null ? this : this.spectatedEntity);
      }
  
@@ -58,7 +58,7 @@ index 4b40ffa978..bf21fb69a5 100644
      }
  
      @Override
-@@ -1607,7 +1627,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1600,7 +1620,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (this.portalCooldown > 0 && !this.worldChangeInvuln) {
              --this.portalCooldown;
          }
@@ -67,5 +67,5 @@ index 4b40ffa978..bf21fb69a5 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0316-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0315-Add-Velocity-IP-Forwarding-Support.patch
similarity index 97%
rename from Spigot-Server-Patches/0316-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0315-Add-Velocity-IP-Forwarding-Support.patch
index 77f5998b87..5661a375d8 100644
--- a/Spigot-Server-Patches/0316-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0315-Add-Velocity-IP-Forwarding-Support.patch
@@ -1,4 +1,4 @@
-From 92f5e873a95b17352ff6ae5aa9208ee84bdb9d8a Mon Sep 17 00:00:00 2001
+From 5068d40d1c6384382106cf9df4289f84f17f9d28 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
@@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
 login plugin message packet.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 092bff78ab..79cf4e598f 100644
+index 092bff78..79cf4e59 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -8,6 +8,7 @@ import java.io.IOException;
@@ -58,7 +58,7 @@ index 092bff78ab..79cf4e598f 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 new file mode 100644
-index 0000000000..fdd8708f97
+index 00000000..fdd8708f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 @@ -0,0 +1,67 @@
@@ -130,7 +130,7 @@ index 0000000000..fdd8708f97
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 1c4ac7bf7a..47cf105019 100644
+index 1c4ac7bf..47cf1050 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener {
@@ -206,7 +206,7 @@ index 1c4ac7bf7a..47cf105019 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 08e314af7c..046196d54d 100644
+index 08e314af..046196d5 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -44,7 +44,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -219,7 +219,7 @@ index 08e314af7c..046196d54d 100644
      public java.util.UUID spoofedUUID;
      public com.mojang.authlib.properties.Property[] spoofedProfile;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index 93ae6dcd78..fb9186b3f5 100644
+index 93ae6dcd..fb9186b3 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf {
@@ -247,7 +247,7 @@ index 93ae6dcd78..fb9186b3f5 100644
          int j = this.i();
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
-index 4d1f441395..c1ca6f9501 100644
+index 4d1f4413..c1ca6f95 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 @@ -4,8 +4,8 @@ import java.io.IOException;
@@ -262,7 +262,7 @@ index 4d1f441395..c1ca6f9501 100644
      public PacketLoginInCustomPayload() {}
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
-index ae74dc9e18..7eb230f1b2 100644
+index ae74dc9e..7eb230f1 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 @@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
@@ -281,7 +281,7 @@ index ae74dc9e18..7eb230f1b2 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 4289d029c2..fa35b84597 100644
+index 4289d029..fa35b845 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 {
@@ -294,5 +294,5 @@ index 4289d029c2..fa35b84597 100644
          } else {
              return this.configuration.getInt("settings.connection-throttle");
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0317-Add-more-Witch-API.patch b/Spigot-Server-Patches/0316-Add-more-Witch-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0317-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0316-Add-more-Witch-API.patch
index 2c81d6b834..3cc27b0657 100644
--- a/Spigot-Server-Patches/0317-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0316-Add-more-Witch-API.patch
@@ -1,11 +1,11 @@
-From 6aa29962c816baf7a46b97c736bad234ce2ec55d Mon Sep 17 00:00:00 2001
+From 59cc2d462a4a127b0fd640f234e53c85b0c57f27 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index be6ecfb08a..7b6b1ad17b 100644
+index be6ecfb0..7b6b1ad1 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -1,5 +1,11 @@
@@ -97,7 +97,7 @@ index be6ecfb08a..7b6b1ad17b 100644
      public SoundEffect eq() {
          return SoundEffects.ENTITY_WITCH_CELEBRATE;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index bae107e76e..b43a2bbd5b 100644
+index bae107e7..b43a2bbd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 @@ -1,12 +1,18 @@
@@ -146,5 +146,5 @@ index bae107e76e..b43a2bbd5b 100644
 +    // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0318-Fix-MC-93764.patch b/Spigot-Server-Patches/0317-Fix-MC-93764.patch
similarity index 84%
rename from Spigot-Server-Patches/0318-Fix-MC-93764.patch
rename to Spigot-Server-Patches/0317-Fix-MC-93764.patch
index bfcecb07e0..2249628c42 100644
--- a/Spigot-Server-Patches/0318-Fix-MC-93764.patch
+++ b/Spigot-Server-Patches/0317-Fix-MC-93764.patch
@@ -1,11 +1,11 @@
-From 47dfcc3fd16277c4472ec1912ea2006f2da19e09 Mon Sep 17 00:00:00 2001
+From 55b2fbe434ab670294e3cb8ed6a65197380c66c0 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
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
-index 9d4fcf8bcf..4b9760709d 100644
+index 9d4fcf8b..4b976070 100644
 --- a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
 +++ b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
 @@ -27,7 +27,7 @@ public class WorldProviderTheEnd extends WorldProvider {
@@ -18,5 +18,5 @@ index 9d4fcf8bcf..4b9760709d 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0319-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0318-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 96%
rename from Spigot-Server-Patches/0319-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0318-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 28ed9b346a..a8a94bc1d1 100644
--- a/Spigot-Server-Patches/0319-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0318-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -1,4 +1,4 @@
-From 53224f0dc8fd78c98a02c57d270a2c2593f767c0 Mon Sep 17 00:00:00 2001
+From e096218a75ae477d0f19cc12f797709eb34b229d 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b8789c8ecc..0862a1d629 100644
+index b8789c8e..0862a1d6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -427,4 +427,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index b8789c8ecc..0862a1d629 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6627d8402f..bde60377ee 100644
+index 6627d840..bde60377 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 6627d8402f..bde60377ee 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0320-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0319-Reset-players-airTicks-on-respawn.patch
similarity index 83%
rename from Spigot-Server-Patches/0320-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0319-Reset-players-airTicks-on-respawn.patch
index b6c0091035..7957b8a3c4 100644
--- a/Spigot-Server-Patches/0320-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0319-Reset-players-airTicks-on-respawn.patch
@@ -1,11 +1,11 @@
-From e54c8056fb073740526d17f1794828961f8dc842 Mon Sep 17 00:00:00 2001
+From 1c0b2ac1832dbc7be6317a5febfb3a5e57fcb94f 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 d1ab124fe1..3a3e491aff 100644
+index d1ab124f..3a3e491a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2330,6 +2330,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,10 +17,10 @@ index d1ab124fe1..3a3e491aff 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 d63ab3e2..bb9a2476 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 {
+@@ -1860,6 +1860,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
  
          this.setHealth(this.getMaxHealth());
@@ -29,5 +29,5 @@ index bf21fb69a5..e91938b54c 100644
          this.fallDistance = 0;
          this.foodData = new FoodMetaData(this);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0321-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0320-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 93%
rename from Spigot-Server-Patches/0321-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0320-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index f46323e9c4..9b4500f360 100644
--- a/Spigot-Server-Patches/0321-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0320-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -1,4 +1,4 @@
-From 813471f797a35fb892b11b8089776bc36edce6dc Mon Sep 17 00:00:00 2001
+From fd7ce798a224b71e55dffca4fc0574cac9cb3b23 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
@@ -7,7 +7,7 @@ Mojang was sleeping even if we had no more requests to go after
 the current one finished, resulting in 100ms lost per profile lookup
 
 diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
-index 71e48e87b4..23f1447cfc 100644
+index 71e48e87..23f1447c 100644
 --- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 +++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 @@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
@@ -32,5 +32,5 @@ index 71e48e87b4..23f1447cfc 100644
                      try {
                          Thread.sleep(DELAY_BETWEEN_PAGES);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0322-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0321-Use-more-reasonable-thread-count-default-for-bootstr.patch
similarity index 87%
rename from Spigot-Server-Patches/0322-Use-more-reasonable-thread-count-default-for-bootstr.patch
rename to Spigot-Server-Patches/0321-Use-more-reasonable-thread-count-default-for-bootstr.patch
index 6ebdbb1eca..e0137d976b 100644
--- a/Spigot-Server-Patches/0322-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0321-Use-more-reasonable-thread-count-default-for-bootstr.patch
@@ -1,11 +1,11 @@
-From 41e625fe50d2add3c4e9744d6b5270b1bde3ac3f Mon Sep 17 00:00:00 2001
+From 61e890d07fb29e8986c3e371263e26ca1db4fddd 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
 
 
 diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
-index 7e224ebeff..dc6d030621 100644
+index 7e224ebe..dc6d0306 100644
 --- a/src/main/java/net/minecraft/server/SystemUtils.java
 +++ b/src/main/java/net/minecraft/server/SystemUtils.java
 @@ -66,7 +66,7 @@ public class SystemUtils {
@@ -18,5 +18,5 @@ index 7e224ebeff..dc6d030621 100644
  
          if (i <= 0) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0323-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0322-Optimize-World-Time-Updates.patch
similarity index 95%
rename from Spigot-Server-Patches/0323-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0322-Optimize-World-Time-Updates.patch
index a3571f7493..f4bbab815a 100644
--- a/Spigot-Server-Patches/0323-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0322-Optimize-World-Time-Updates.patch
@@ -1,4 +1,4 @@
-From 4d5cb83b71c21ca399fa9f8c55f8040cc1cbb986 Mon Sep 17 00:00:00 2001
+From 0ba45a336be648a77a19ac85a38592499dc56dfd 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
@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e7197f20e..4d604bd0e 100644
+index e7197f20..4d604bd0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1164,12 +1164,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -41,5 +41,5 @@ index e7197f20e..4d604bd0e 100644
  
          while (iterator.hasNext()) {
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0324-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0323-Restore-custom-InventoryHolder-support.patch
similarity index 94%
rename from Spigot-Server-Patches/0324-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0323-Restore-custom-InventoryHolder-support.patch
index 8b0da674db..373e5e80b6 100644
--- a/Spigot-Server-Patches/0324-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0323-Restore-custom-InventoryHolder-support.patch
@@ -1,4 +1,4 @@
-From c0dcec02da12365b74f7f2b0170dd1899fc14bb7 Mon Sep 17 00:00:00 2001
+From 26f4f7687fbc57b3cab238e25aee1018f90ff602 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
@@ -17,7 +17,7 @@ will always work as intended in the past, those without will create implementati
 based inventories.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
-index 9957ed0402..ae280dd40b 100644
+index 9957ed04..ae280dd4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
 @@ -39,10 +39,20 @@ public final class CraftInventoryCreator {
@@ -42,5 +42,5 @@ index 9957ed0402..ae280dd40b 100644
      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0325-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0324-Use-Vanilla-Minecart-Speeds.patch
similarity index 90%
rename from Spigot-Server-Patches/0325-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0324-Use-Vanilla-Minecart-Speeds.patch
index 8f2985b4e8..7e1b4de2e1 100644
--- a/Spigot-Server-Patches/0325-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0324-Use-Vanilla-Minecart-Speeds.patch
@@ -1,4 +1,4 @@
-From 332cf801b21dadd3c77412f1d3cc3ca6d6a25d6d Mon Sep 17 00:00:00 2001
+From 393c109b256966d94522ece6225f5b0d3d7ae1e5 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds
 CraftBukkit changed the values on flying speed, restore back to vanilla
 
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index c2843d5d60..665bbe07fa 100644
+index c2843d5d..665bbe07 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -59,9 +59,9 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -23,5 +23,5 @@ index c2843d5d60..665bbe07fa 100644
      // CraftBukkit end
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0326-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0325-Fix-SpongeAbsortEvent-handling.patch
similarity index 93%
rename from Spigot-Server-Patches/0326-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0325-Fix-SpongeAbsortEvent-handling.patch
index 7731f550f9..9b3cfc66f4 100644
--- a/Spigot-Server-Patches/0326-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0325-Fix-SpongeAbsortEvent-handling.patch
@@ -1,4 +1,4 @@
-From ac16b004e207f9a86e29ac11ea2392a9fe275be5 Mon Sep 17 00:00:00 2001
+From 520be988fa876b725e039e91c57f47efe6d4097b 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix SpongeAbsortEvent handling
 Only process drops when the block is actually going to be removed
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index b9b750c369..540fcce1dd 100644
+index b9b750c3..540fcce1 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -472,7 +472,7 @@ public class Block implements IMaterial {
@@ -19,7 +19,7 @@ index b9b750c369..540fcce1dd 100644
          if (world instanceof WorldServer) {
              a(iblockdata, (WorldServer) world, blockposition, tileentity).forEach((itemstack) -> {
 diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java
-index 685a30f3f1..9edf937a65 100644
+index 685a30f3..9edf937a 100644
 --- a/src/main/java/net/minecraft/server/BlockSponge.java
 +++ b/src/main/java/net/minecraft/server/BlockSponge.java
 @@ -115,8 +115,11 @@ public class BlockSponge extends Block {
@@ -37,5 +37,5 @@ index 685a30f3f1..9edf937a65 100644
                  }
                  world.setTypeAndData(blockposition2, block.getHandle(), block.getFlag());
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0327-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0326-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0327-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0326-Don-t-allow-digging-into-unloaded-chunks.patch
index b315113aad..5b033f7e54 100644
--- a/Spigot-Server-Patches/0327-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0326-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -1,11 +1,11 @@
-From 5cc6e94e8ff0ce6d1921fde051ff102140c7b0f3 Mon Sep 17 00:00:00 2001
+From 4bf4eb755781e0e5bccec65f2e5f63f92f99d03d 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bde60377e..b21fca9e5 100644
+index bde60377..b21fca9e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1272,6 +1272,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -21,7 +21,7 @@ index bde60377e..b21fca9e5 100644
                  return;
              default:
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index e2e5c17c2..17b7eddac 100644
+index e2e5c17c..17b7edda 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -253,10 +253,12 @@ public class PlayerInteractManager {
@@ -41,5 +41,5 @@ index e2e5c17c2..17b7eddac 100644
  
                  this.world.a(this.player.getId(), blockposition, -1);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0328-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0327-Optimize-redstone-algorithm.patch
similarity index 99%
rename from Spigot-Server-Patches/0328-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0327-Optimize-redstone-algorithm.patch
index 4c521a6bd9..6160e876bb 100644
--- a/Spigot-Server-Patches/0328-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0327-Optimize-redstone-algorithm.patch
@@ -1,4 +1,4 @@
-From a8c80c7d1e2066c0a2aed62b8fa0efccc37ef66a Mon Sep 17 00:00:00 2001
+From a842524bd4b511777907563e1c3b06fc5d8eddef 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
@@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0862a1d629..4ba72275b9 100644
+index 0862a1d6..4ba72275 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -432,4 +432,14 @@ public class PaperWorldConfig {
@@ -39,7 +39,7 @@ index 0862a1d629..4ba72275b9 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 new file mode 100644
-index 0000000000..b69803cbf2
+index 00000000..b69803cb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 @@ -0,0 +1,915 @@
@@ -959,7 +959,7 @@ index 0000000000..b69803cbf2
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index 5bf2fc0b3f..52a4982ecd 100644
+index 5bf2fc0b..52a4982e 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 @@ -1,5 +1,7 @@
@@ -1127,7 +1127,7 @@ index 5bf2fc0b3f..52a4982ecd 100644
                  c(iblockdata, world, blockposition);
                  world.a(blockposition, false);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 378ac5ae86..f861957842 100644
+index 378ac5ae..f8619578 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -522,6 +522,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1147,5 +1147,5 @@ index 378ac5ae86..f861957842 100644
          int i = 0;
          EnumDirection[] aenumdirection = World.a;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0329-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0328-force-entity-dismount-during-teleportation.patch
similarity index 96%
rename from Spigot-Server-Patches/0329-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0328-force-entity-dismount-during-teleportation.patch
index 6f0ebd1913..a6c095824a 100644
--- a/Spigot-Server-Patches/0329-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0328-force-entity-dismount-during-teleportation.patch
@@ -1,4 +1,4 @@
-From ed8345957ab34aedb3eb62c8cf3d9dc962f0cd9e Mon Sep 17 00:00:00 2001
+From 5290c4b714fe7a7bef8fb0a2ba0a0c165cb29aa7 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 3a3e491aff..725fa9501a 100644
+index 3a3e491a..725fa950 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2031,12 +2031,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -72,7 +72,7 @@ index 3a3e491aff..725fa9501a 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 308ac18f..584166f2 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 eed3e7c5..4e64a80a 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 bb9a2476..ad40c254 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0330-Book-Size-Limits.patch b/Spigot-Server-Patches/0329-Book-Size-Limits.patch
similarity index 96%
rename from Spigot-Server-Patches/0330-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0329-Book-Size-Limits.patch
index 35371bf7ea..b1878e336b 100644
--- a/Spigot-Server-Patches/0330-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0329-Book-Size-Limits.patch
@@ -1,4 +1,4 @@
-From db659b4e9b70634837cf09d17cb6e055b7ad668a Mon Sep 17 00:00:00 2001
+From c44f7c4272eab2b128fc19fdc0ba6aedbb52ef87 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 79cf4e598f..6d069c73d0 100644
+index 79cf4e59..6d069c73 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -354,4 +354,11 @@ public class PaperConfig {
@@ -22,7 +22,7 @@ index 79cf4e598f..6d069c73d0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b21fca9e5c..784f0a3f22 100644
+index b21fca9e..784f0a3f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -14,6 +14,7 @@ import java.util.Iterator;
@@ -77,5 +77,5 @@ index b21fca9e5c..784f0a3f22 100644
          // CraftBukkit start
          if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0331-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0330-Make-the-default-permission-message-configurable.patch
similarity index 93%
rename from Spigot-Server-Patches/0331-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0330-Make-the-default-permission-message-configurable.patch
index b0db1aa28c..d028e68710 100644
--- a/Spigot-Server-Patches/0331-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0330-Make-the-default-permission-message-configurable.patch
@@ -1,11 +1,11 @@
-From da76f31bf800fea5577d30739e3f68517a74ec91 Mon Sep 17 00:00:00 2001
+From 759d73d323748afb8da0c1436449c4ed0c221fef 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6d069c73d0..dbd1439970 100644
+index 6d069c73..dbd14399 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -20,6 +20,7 @@ import java.util.regex.Pattern;
@@ -29,7 +29,7 @@ index 6d069c73d0..dbd1439970 100644
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fa35b84597..30dd66b81a 100644
+index fa35b845..30dd66b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2179,6 +2179,11 @@ public final class CraftServer implements Server {
@@ -45,5 +45,5 @@ index fa35b84597..30dd66b81a 100644
      public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull UUID uuid) {
          return createProfile(uuid, null);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0332-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0331-Add-more-Zombie-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0332-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0331-Add-more-Zombie-API.patch
index 9d33875e40..d2ad5adf08 100644
--- a/Spigot-Server-Patches/0332-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0331-Add-more-Zombie-API.patch
@@ -1,11 +1,11 @@
-From 175e7af024d3ae22be48e4d67c4b237f087e9306 Mon Sep 17 00:00:00 2001
+From 8a9dfa5617d4d665d739b3b13c1004e905191094 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 bed15873..6d53254f 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 31aba6bf..2d4f8aac 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 0429cf02..c4320dbb 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0333-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0332-Prevent-rayTrace-from-loading-chunks.patch
similarity index 92%
rename from Spigot-Server-Patches/0333-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0332-Prevent-rayTrace-from-loading-chunks.patch
index 563a4509e3..6078a558a2 100644
--- a/Spigot-Server-Patches/0333-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0332-Prevent-rayTrace-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 5985527f4345b183208d5a6f326a4336eb810416 Mon Sep 17 00:00:00 2001
+From 5db13565bc74817a456fc21947d38a0eff4b2e38 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
@@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss
 this saves a ton of lag for when AI tries to raytrace near unloaded chunks.
 
 diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java
-index 0dff023529..29cdc00875 100644
+index 0dff0235..29cdc008 100644
 --- a/src/main/java/net/minecraft/server/IBlockAccess.java
 +++ b/src/main/java/net/minecraft/server/IBlockAccess.java
 @@ -41,7 +41,15 @@ public interface IBlockAccess {
@@ -28,5 +28,5 @@ index 0dff023529..29cdc00875 100644
              Vec3D vec3d = raytrace1.b();
              Vec3D vec3d1 = raytrace1.a();
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0334-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0333-Handle-Large-Packets-disconnecting-client.patch
similarity index 94%
rename from Spigot-Server-Patches/0334-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0333-Handle-Large-Packets-disconnecting-client.patch
index 35d041abdc..b7816aa4d9 100644
--- a/Spigot-Server-Patches/0334-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0333-Handle-Large-Packets-disconnecting-client.patch
@@ -1,4 +1,4 @@
-From 38c5ca35ef0e93061e3572da435d968100aead5c Mon Sep 17 00:00:00 2001
+From 3fb7f3f507c5af8c22c8b3ecb3ca32f5618c4767 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
@@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet,
 split the inventory set into multiple packets instead.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 046196d54d..d4aad8a5b7 100644
+index 046196d5..d4aad8a5 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -97,6 +97,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -27,7 +27,7 @@ index 046196d54d..d4aad8a5b7 100644
              NetworkManager.LOGGER.debug("Skipping packet due to errors", throwable.getCause());
          } else {
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 601d4d0fa2..2d8e6a2f4a 100644
+index 601d4d0f..2d8e6a2f 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
 @@ -10,6 +10,12 @@ public interface Packet<T extends PacketListener> {
@@ -44,7 +44,7 @@ index 601d4d0fa2..2d8e6a2f4a 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index 63c4dbd327..b0cfef52cb 100644
+index 63c4dbd3..b0cfef52 100644
 --- a/src/main/java/net/minecraft/server/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/server/PacketEncoder.java
 @@ -49,7 +49,31 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
@@ -80,7 +80,7 @@ index 63c4dbd327..b0cfef52cb 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 1fcbbd698a..a0b87f89df 100644
+index 1fcbbd69..a0b87f89 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -79,7 +79,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -93,7 +93,7 @@ index 1fcbbd698a..a0b87f89df 100644
          } else {
              this.f = new byte[i];
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
-index f7c3655671..631234324d 100644
+index f7c36556..63123432 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 @@ -9,6 +9,15 @@ public class PacketPlayOutWindowItems implements Packet<PacketListenerPlayOut> {
@@ -113,5 +113,5 @@ index f7c3655671..631234324d 100644
  
      public PacketPlayOutWindowItems(int i, NonNullList<ItemStack> nonnulllist) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0335-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0334-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
similarity index 95%
rename from Spigot-Server-Patches/0335-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
rename to Spigot-Server-Patches/0334-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
index 86b667b2a0..3992335bda 100644
--- a/Spigot-Server-Patches/0335-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0334-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@@ -1,4 +1,4 @@
-From a64eb1d41d7d75ceeceadb4dfe0307e231b60e50 Mon Sep 17 00:00:00 2001
+From ceddb143ea54a9658742d72aee156890cfb269c3 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
@@ -8,7 +8,7 @@ worlds loaded. This is typically a rare occurrence but probably one that
 should be covered as best we can.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 58e10381c8..0e8a21b803 100644
+index 58e10381..0e8a21b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -29,12 +29,12 @@ import org.bukkit.plugin.Plugin;
@@ -61,5 +61,5 @@ index 58e10381c8..0e8a21b803 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0336-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0335-Add-PlayerConnectionCloseEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0336-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0335-Add-PlayerConnectionCloseEvent.patch
index 7bfa171115..95fb5abeea 100644
--- a/Spigot-Server-Patches/0336-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0335-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From 39cd996cf4bcdece253f77243ecf6638af78ff74 Mon Sep 17 00:00:00 2001
+From 79baca93f93133cafd97a71c374109f2a7415828 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
@@ -34,7 +34,7 @@ how PlayerPreLoginEvent interacts with PlayerConnectionCloseEvent
 is undefined.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 47cf105019..f1222fcb2b 100644
+index 47cf1050..f1222fcb 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -35,9 +35,9 @@ public class LoginListener implements PacketLoginInListener {
@@ -50,7 +50,7 @@ index 47cf105019..f1222fcb2b 100644
      private SecretKey loginKey;
      private EntityPlayer l;
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index d4aad8a5b7..b1dededc15 100644
+index d4aad8a5..b1dededc 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -336,6 +336,26 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -81,5 +81,5 @@ index d4aad8a5b7..b1dededc15 100644
  
          }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0337-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0336-Prevent-Enderman-from-loading-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0337-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0336-Prevent-Enderman-from-loading-chunks.patch
index 14b2e60f9b..247318ec3f 100644
--- a/Spigot-Server-Patches/0337-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0336-Prevent-Enderman-from-loading-chunks.patch
@@ -1,11 +1,11 @@
-From 38489df9a2a4dd7caedc7b5385749d1e7fb78703 Mon Sep 17 00:00:00 2001
+From 21183b34c10a9a2ae9a416f2598d81723423fc76 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index d86f76f30b..212636dcb2 100644
+index d86f76f3..212636dc 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -344,7 +344,8 @@ public class EntityEnderman extends EntityMonster {
@@ -29,5 +29,5 @@ index d86f76f30b..212636dcb2 100644
              IBlockData iblockdata1 = world.getType(blockposition1);
              IBlockData iblockdata2 = Block.getValidBlockForPosition(getEnderman().getCarried(), getEnderman().world, blockposition); // Paper - Fix MC-124320
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0338-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0337-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 96%
rename from Spigot-Server-Patches/0338-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0337-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index d315eab1f3..729de91a8d 100644
--- a/Spigot-Server-Patches/0338-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0337-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From af96603b4d31b17edc58d90400da2df981b4932c Mon Sep 17 00:00:00 2001
+From cfb0c229b20c89a4c8deff7ea4d2d2b6e44e0d9a 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 ad40c254..fd7d2fb1 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 36d31d271c..4d6ac8f85c 100644
+index 6b672018..e148940a 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 36d31d271c..4d6ac8f85c 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 0e8a21b803..32e02af96e 100644
+index 0e8a21b8..32e02af9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -260,6 +260,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -106,7 +106,7 @@ index 0e8a21b803..32e02af96e 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 823dba0143..21aaacc13d 100644
+index 823dba01..21aaacc1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -139,6 +139,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -163,5 +163,5 @@ index 823dba0143..21aaacc13d 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0339-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0338-Fix-PlayerEditBookEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0339-Fix-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0338-Fix-PlayerEditBookEvent.patch
index f1e1fcc866..05965318dc 100644
--- a/Spigot-Server-Patches/0339-Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/0338-Fix-PlayerEditBookEvent.patch
@@ -1,4 +1,4 @@
-From cb895d9ef28baa9eca87bf0ab6c4ffc5d49eff14 Mon Sep 17 00:00:00 2001
+From fe6190c533e4206ff46b0e9c3e7570f74cc31a64 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
@@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta
 cancelled writing
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 784f0a3f22..4b3ddfd990 100644
+index 784f0a3f..4b3ddfd9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -871,9 +871,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -29,5 +29,5 @@ index 784f0a3f22..4b3ddfd990 100644
                  }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0340-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 82%
rename from Spigot-Server-Patches/0340-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index cbaadc6be7..7269db5dd6 100644
--- a/Spigot-Server-Patches/0340-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -1,14 +1,14 @@
-From fac0d7bfd9a2c93b2a61baa37d7cee02aec014e7 Mon Sep 17 00:00:00 2001
+From 80c540434a5694c897aa6e092ceadf571b309f92 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 fd7d2fb1..cd981e0a 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 {
+@@ -1289,6 +1289,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public void n() {
          this.cq = true;
          this.ejectPassengers();
@@ -23,5 +23,5 @@ index 4cff86b9a5..f788e7eff0 100644
              this.wakeup(true, false);
          }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0341-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0340-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 95%
rename from Spigot-Server-Patches/0341-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to Spigot-Server-Patches/0340-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
index 21faa7e2c8..2597979f58 100644
--- a/Spigot-Server-Patches/0341-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
+++ b/Spigot-Server-Patches/0340-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
@@ -1,4 +1,4 @@
-From ebc1eb3de305cf0b98f73393720644ea03401224 Mon Sep 17 00:00:00 2001
+From e4d61360072c669cca7b0e0bc26be0bfaff1504a 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
@@ -24,7 +24,7 @@ Instead we opt to remove the check entirely so that the event fires for
 all piston types.
 
 diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
-index 1170a28107..b29525c40d 100644
+index 1170a281..b29525c4 100644
 --- a/src/main/java/net/minecraft/server/BlockPiston.java
 +++ b/src/main/java/net/minecraft/server/BlockPiston.java
 @@ -122,7 +122,7 @@ public class BlockPiston extends BlockDirectional {
@@ -46,5 +46,5 @@ index 1170a28107..b29525c40d 100644
              // CraftBukkit end
              world.playBlockAction(blockposition, this, b0, enumdirection.b());
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0342-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0341-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 92%
rename from Spigot-Server-Patches/0342-Block-Entity-remove-from-being-called-on-Players.patch
rename to Spigot-Server-Patches/0341-Block-Entity-remove-from-being-called-on-Players.patch
index 7926f1c720..97a9b8ad79 100644
--- a/Spigot-Server-Patches/0342-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/Spigot-Server-Patches/0341-Block-Entity-remove-from-being-called-on-Players.patch
@@ -1,4 +1,4 @@
-From c2ac22ee75bd70d2152f658ddca26413cc42205d Mon Sep 17 00:00:00 2001
+From a1a450ce5d84a5aaed071bfaea4439d3c83560f9 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 21aaacc13d..344e9e9b48 100644
+index 21aaacc1..344e9e9b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1950,6 +1950,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -32,5 +32,5 @@ index 21aaacc13d..344e9e9b48 100644
  
      // Spigot start
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0343-BlockDestroyEvent.patch b/Spigot-Server-Patches/0342-BlockDestroyEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0343-BlockDestroyEvent.patch
rename to Spigot-Server-Patches/0342-BlockDestroyEvent.patch
index 07277dd94c..43b6ae1514 100644
--- a/Spigot-Server-Patches/0343-BlockDestroyEvent.patch
+++ b/Spigot-Server-Patches/0342-BlockDestroyEvent.patch
@@ -1,4 +1,4 @@
-From 930523925b6c5f64a063b4eb2df1370df5e8d88d Mon Sep 17 00:00:00 2001
+From 290a78bfde385d87da94fac86f66f7a64767d282 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f861957842..a3fbdf5db5 100644
+index f8619578..a3fbdf5d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -452,8 +452,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -37,5 +37,5 @@ index f861957842..a3fbdf5db5 100644
                  TileEntity tileentity = iblockdata.getBlock().isTileEntity() ? this.getTileEntity(blockposition) : null;
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0344-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0343-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 96%
rename from Spigot-Server-Patches/0344-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to Spigot-Server-Patches/0343-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 896a6728b2..472af452a0 100644
--- a/Spigot-Server-Patches/0344-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/Spigot-Server-Patches/0343-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
@@ -1,4 +1,4 @@
-From 79da921ef85c44ed1bc70889ac955d542f0fb452 Mon Sep 17 00:00:00 2001
+From e68eac847ee9351dbee70bda0c537f7cfcf0e028 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
@@ -10,7 +10,7 @@ This made the Bukkit RecipeChoice API not work for Shapeless.
 This reimplements vanilla logic using the same test logic as Shaped
 
 diff --git a/src/main/java/net/minecraft/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java
-index fe03a35cc8..fb481e6586 100644
+index fe03a35c..fb481e65 100644
 --- a/src/main/java/net/minecraft/server/ShapelessRecipes.java
 +++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java
 @@ -63,16 +63,46 @@ public class ShapelessRecipes implements RecipeCrafting {
@@ -64,5 +64,5 @@ index fe03a35cc8..fb481e6586 100644
  
      public ItemStack a(InventoryCrafting inventorycrafting) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0345-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0344-Fix-sign-edit-memory-leak.patch
similarity index 93%
rename from Spigot-Server-Patches/0345-Fix-sign-edit-memory-leak.patch
rename to Spigot-Server-Patches/0344-Fix-sign-edit-memory-leak.patch
index ba39df2c73..381a9535bb 100644
--- a/Spigot-Server-Patches/0345-Fix-sign-edit-memory-leak.patch
+++ b/Spigot-Server-Patches/0344-Fix-sign-edit-memory-leak.patch
@@ -1,4 +1,4 @@
-From 38b2e675fc3e77dacdf24eb33857598447942b39 Mon Sep 17 00:00:00 2001
+From a69f4c530e32e263ca5bd30b9327f0e3c1754b45 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix sign edit memory leak
 when a player edits a sign, a reference to their Entity is never cleand up.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4b3ddfd990..2c94ca6a8e 100644
+index 4b3ddfd9..2c94ca6a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2546,7 +2546,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -19,7 +19,7 @@ index 4b3ddfd990..2c94ca6a8e 100644
                  this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit
                  return;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 03f6ddf000..a934020190 100644
+index 03f6ddf0..a9340201 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -10,6 +10,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -43,5 +43,5 @@ index 03f6ddf000..a934020190 100644
  
      public EntityHuman f() {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0346-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0345-Limit-Client-Sign-length-more.patch
similarity index 96%
rename from Spigot-Server-Patches/0346-Limit-Client-Sign-length-more.patch
rename to Spigot-Server-Patches/0345-Limit-Client-Sign-length-more.patch
index c3118c832c..9f97cbe6f6 100644
--- a/Spigot-Server-Patches/0346-Limit-Client-Sign-length-more.patch
+++ b/Spigot-Server-Patches/0345-Limit-Client-Sign-length-more.patch
@@ -1,4 +1,4 @@
-From 96d0de5d2d8d82e89bfdb3af9ed885034516c34c Mon Sep 17 00:00:00 2001
+From 4b71c78bbf78a41d0445285a759d8291e89a1d48 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
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2c94ca6a8e..94d3d602cc 100644
+index 2c94ca6a..94d3d602 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -103,6 +103,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -50,5 +50,5 @@ index 2c94ca6a8e..94d3d602cc 100644
              }
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0347-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0346-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 91%
rename from Spigot-Server-Patches/0347-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to Spigot-Server-Patches/0346-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 88efe9b8e9..9a4e2ead64 100644
--- a/Spigot-Server-Patches/0347-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/Spigot-Server-Patches/0346-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@@ -1,4 +1,4 @@
-From 5d8bd0865903c86671778b54e097386e96e13210 Mon Sep 17 00:00:00 2001
+From e9fb4fbbaa2762920a65a926f082e2db3d95b8a5 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
@@ -7,7 +7,7 @@ property lookups arent super cheap. they synchronize, validate
 and check security managers.
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index a934020190..0e9a90b70f 100644
+index a9340201..0e9a90b7 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -11,6 +11,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -28,5 +28,5 @@ index a934020190..0e9a90b70f 100644
          }
          // CraftBukkit end
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0348-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0347-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
similarity index 95%
rename from Spigot-Server-Patches/0348-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
rename to Spigot-Server-Patches/0347-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
index c925ece514..ee9fe5a6bc 100644
--- a/Spigot-Server-Patches/0348-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
+++ b/Spigot-Server-Patches/0347-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
@@ -1,4 +1,4 @@
-From 2a1d90013689f1f5bed00af8adc6806b3b1a4db8 Mon Sep 17 00:00:00 2001
+From 79ade9ae1bc8cd18f26cb92d1e3bafb3a2541844 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
@@ -11,7 +11,7 @@ Use -DPaper.excessiveSignsLimit=500 to configure that limit, or -1
 to disable the limit and let your players be abused.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index b1dededc15..e156804f7a 100644
+index b1dededc..e156804f 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -212,6 +212,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -31,7 +31,7 @@ index b1dededc15..e156804f7a 100644
  
      private void sendPacketQueue() { this.o(); } // Paper - OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 2d8e6a2f4a..8d0965a053 100644
+index 2d8e6a2f..8d0965a0 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
 @@ -11,6 +11,7 @@ public interface Packet<T extends PacketListener> {
@@ -43,7 +43,7 @@ index 2d8e6a2f4a..8d0965a053 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index a0b87f89df..47710067a6 100644
+index a0b87f89..47710067 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -23,6 +23,15 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -86,5 +86,5 @@ index a0b87f89df..47710067a6 100644
                  if (tileentity instanceof TileEntitySkull) { TileEntitySkull.sanitizeTileEntityUUID(nbttagcompound); } // Paper
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0348-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 95%
rename from Spigot-Server-Patches/0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0348-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
index f4bdd4e845..8716c1b008 100644
--- a/Spigot-Server-Patches/0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/0348-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@@ -1,4 +1,4 @@
-From 1d088d17e9e9e57ed6e7b53b0d076d37f8f64229 Mon Sep 17 00:00:00 2001
+From 0a473ae60a871cfc7ba74a90fe048bce11eadcb9 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
@@ -11,7 +11,7 @@ everything to the Whitelist object.
 https://github.com/PaperMC/Paper/issues/1880
 
 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 8570e38f4..c97be42dd 100644
+index 8570e38f..c97be42d 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -64,6 +64,7 @@ public class JsonList<K, V extends JsonListEntry<K>> {
@@ -23,7 +23,7 @@ index 8570e38f4..c97be42dd 100644
          this.e = flag;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e148940ab..f71c9f4a8 100644
+index e148940a..f71c9f4a 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -62,7 +62,7 @@ public abstract class PlayerList {
@@ -62,5 +62,5 @@ index e148940ab..f71c9f4a8 100644
  
      public List<EntityPlayer> b(String s) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0349-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 87%
rename from Spigot-Server-Patches/0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0349-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index a576985b9e..74cdf4e946 100644
--- a/Spigot-Server-Patches/0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/Spigot-Server-Patches/0349-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -1,4 +1,4 @@
-From d33081d4c7e3db6105cc7ded22015021b6bb8e3c Mon Sep 17 00:00:00 2001
+From 401d79b1752af4a7ca46293379f65d0b4456fb20 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Set Zombie last tick at start of drowning process
 Fixes GH-1887
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 2d4f8aac8f..8635d4f40c 100644
+index 2d4f8aac..8635d4f4 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -169,6 +169,7 @@ public class EntityZombie extends EntityMonster {
@@ -18,5 +18,5 @@ index 2d4f8aac8f..8635d4f40c 100644
                  } else {
                      this.bC = -1;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0351-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0350-Allow-Saving-of-Oversized-Chunks.patch
similarity index 98%
rename from Spigot-Server-Patches/0351-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0350-Allow-Saving-of-Oversized-Chunks.patch
index 8b62c04713..ee87f10727 100644
--- a/Spigot-Server-Patches/0351-Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/0350-Allow-Saving-of-Oversized-Chunks.patch
@@ -1,4 +1,4 @@
-From 4da595d4d95ebd293ece231aab793da63c791c42 Mon Sep 17 00:00:00 2001
+From 7c976b229c03c5067ad212d6821eb2c774d6ed66 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
@@ -31,7 +31,7 @@ this fix, as the data will remain in the oversized file. Once the server returns
 to a jar with this fix, the data will be restored.
 
 diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
-index db66d4ac7d..2322c0c8c5 100644
+index db66d4ac..2322c0c8 100644
 --- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 @@ -69,6 +69,7 @@ public class NBTCompressedStreamTools {
@@ -51,7 +51,7 @@ index db66d4ac7d..2322c0c8c5 100644
          a((NBTBase) nbttagcompound, dataoutput);
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index cee1ea8f43..6b543f89d4 100644
+index cee1ea8f..6b543f89 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -17,6 +17,8 @@ import java.nio.file.Files;
@@ -156,7 +156,7 @@ index cee1ea8f43..6b543f89d4 100644
  
          private final ChunkCoordIntPair b;
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 57ce53cfdc..b3d1bb5fd8 100644
+index 57ce53cf..b3d1bb5f 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -42,10 +42,84 @@ public final class RegionFileCache implements AutoCloseable {
@@ -253,5 +253,5 @@ index 57ce53cfdc..b3d1bb5fd8 100644
              throwable = throwable1;
              throw throwable1;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0351-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 85%
rename from Spigot-Server-Patches/0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0351-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 0f864985b8..a0657393e9 100644
--- a/Spigot-Server-Patches/0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/0351-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -1,11 +1,11 @@
-From 7f579601fff507e69ba5af5cf92a42a4c882f8e3 Mon Sep 17 00:00:00 2001
+From 085048c4c7fba75dd004f62b842230c5e2ce45bd 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f71c9f4a8..e9908cd01 100644
+index f71c9f4a..e9908cd0 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1022,6 +1022,7 @@ public abstract class PlayerList {
@@ -17,5 +17,5 @@ index f71c9f4a8..e9908cd01 100644
      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0353-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0352-Add-LivingEntity-getTargetEntity.patch
similarity index 96%
rename from Spigot-Server-Patches/0353-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0352-Add-LivingEntity-getTargetEntity.patch
index 280c12702f..2f4e0f4dae 100644
--- a/Spigot-Server-Patches/0353-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0352-Add-LivingEntity-getTargetEntity.patch
@@ -1,11 +1,11 @@
-From e8a3c851fb314410e9040714cc6f447d11bee638 Mon Sep 17 00:00:00 2001
+From 1da143dfb35fd5d19afedeaae1fde0054b3dabe6 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 f427953a8..3fdb52007 100644
+index f427953a..3fdb5200 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 f427953a8..3fdb52007 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 725fa9501..427d66ed0 100644
+index 725fa950..427d66ed 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 725fa9501..427d66ed0 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 4e64a80a8..af79b6e37 100644
+index 4e64a80a..af79b6e3 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 4e64a80a8..af79b6e37 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 c1f462d9d..498f38109 100644
+index c1f462d9..498f3810 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 c1f462d9d..498f38109 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 d197094f5..6de01e4f0 100644
+index d197094f..6de01e4f 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 d197094f5..6de01e4f0 100644
  
      @Override
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0353-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 94%
rename from Spigot-Server-Patches/0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to Spigot-Server-Patches/0353-Use-proper-max-length-when-serialising-BungeeCord-te.patch
index b856c131d3..129bb4949c 100644
--- a/Spigot-Server-Patches/0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch
+++ b/Spigot-Server-Patches/0353-Use-proper-max-length-when-serialising-BungeeCord-te.patch
@@ -1,4 +1,4 @@
-From 08b268c6de6abaff45d1253df1932a1894679bd4 Mon Sep 17 00:00:00 2001
+From c8a5c264dd04d38563325b637bd7daeb16d89221 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Use proper max length when serialising BungeeCord text
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
-index 0ab611564e..f7b2095bb7 100644
+index 0ab61156..f7b2095b 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 @@ -3,7 +3,7 @@ package net.minecraft.server;
@@ -31,5 +31,5 @@ index 0ab611564e..f7b2095bb7 100644
              // Paper end
          } else {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0355-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0354-Entity-getEntitySpawnReason.patch
similarity index 96%
rename from Spigot-Server-Patches/0355-Entity-getEntitySpawnReason.patch
rename to Spigot-Server-Patches/0354-Entity-getEntitySpawnReason.patch
index 2a0611db3e..bac74e3f03 100644
--- a/Spigot-Server-Patches/0355-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0354-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From 493d4f36505b5c70909429472e606f468ffdc0d8 Mon Sep 17 00:00:00 2001
+From 0afaa0297d1a19f756c2d235d708378878d0751a 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 427d66ed0..bb1fd6e46 100644
+index 427d66ed..bb1fd6e4 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 427d66ed0..bb1fd6e46 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 e9908cd01..7745e70d2 100644
+index e9908cd0..7745e70d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -238,7 +238,7 @@ public abstract class PlayerList {
@@ -72,7 +72,7 @@ index e9908cd01..7745e70d2 100644
              });
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 43565dd92..f7a1fad9c 100644
+index 43565dd9..f7a1fad9 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1001,6 +1001,7 @@ public class WorldServer extends World {
@@ -84,7 +84,7 @@ index 43565dd92..f7a1fad9c 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 915ccb180..dfa15372b 100644
+index 915ccb18..dfa15372 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 915ccb180..dfa15372b 100644
      // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0356-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0355-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 92%
rename from Spigot-Server-Patches/0356-Update-entity-Metadata-for-all-tracked-players.patch
rename to Spigot-Server-Patches/0355-Update-entity-Metadata-for-all-tracked-players.patch
index e0f171fe48..bb2198fb30 100644
--- a/Spigot-Server-Patches/0356-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/Spigot-Server-Patches/0355-Update-entity-Metadata-for-all-tracked-players.patch
@@ -1,11 +1,11 @@
-From 11b9ee1047c2291b8e8f991ae05c1bacd92d9a63 Mon Sep 17 00:00:00 2001
+From 4526182f1a02ee548d2f7fa856a0ce04fdb81d0c 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 3ff7a7b4a8..3a88c9a670 100644
+index 3ff7a7b4..3a88c9a6 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -387,6 +387,12 @@ public class EntityTrackerEntry {
@@ -22,7 +22,7 @@ index 3ff7a7b4a8..3a88c9a670 100644
          this.f.accept(packet);
          if (this.tracker instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 94d3d602cc..eee96c3a1c 100644
+index 94d3d602..eee96c3a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2006,7 +2006,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -35,5 +35,5 @@ index 94d3d602cc..eee96c3a1c 100644
  
                      if (event.isCancelled()) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0357-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0356-Fire-event-on-GS4-query.patch
similarity index 98%
rename from Spigot-Server-Patches/0357-Fire-event-on-GS4-query.patch
rename to Spigot-Server-Patches/0356-Fire-event-on-GS4-query.patch
index 6a51ffd851..50d0403b33 100644
--- a/Spigot-Server-Patches/0357-Fire-event-on-GS4-query.patch
+++ b/Spigot-Server-Patches/0356-Fire-event-on-GS4-query.patch
@@ -1,11 +1,11 @@
-From 3f0676ca98dc3ff25441c09cabd17cbc1855313c Mon Sep 17 00:00:00 2001
+From 661b2ce09e95f94fa0fffa59708e5d2b28c61b9c 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
 
 
 diff --git a/src/main/java/net/minecraft/server/RemoteConnectionThread.java b/src/main/java/net/minecraft/server/RemoteConnectionThread.java
-index 66bfbcf02b..d821ef9a75 100644
+index 66bfbcf0..d821ef9a 100644
 --- a/src/main/java/net/minecraft/server/RemoteConnectionThread.java
 +++ b/src/main/java/net/minecraft/server/RemoteConnectionThread.java
 @@ -15,7 +15,7 @@ public abstract class RemoteConnectionThread implements Runnable {
@@ -26,7 +26,7 @@ index 66bfbcf02b..d821ef9a75 100644
          return this.b.getPlayerCount();
      }
 diff --git a/src/main/java/net/minecraft/server/RemoteStatusListener.java b/src/main/java/net/minecraft/server/RemoteStatusListener.java
-index f4f4e31d3c..d502593847 100644
+index f4f4e31d..d5025938 100644
 --- a/src/main/java/net/minecraft/server/RemoteStatusListener.java
 +++ b/src/main/java/net/minecraft/server/RemoteStatusListener.java
 @@ -21,19 +21,19 @@ public class RemoteStatusListener extends RemoteConnectionThread {
@@ -184,7 +184,7 @@ index f4f4e31d3c..d502593847 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/RemoteStatusReply.java b/src/main/java/net/minecraft/server/RemoteStatusReply.java
-index 848b5c3f0e..73efea7e13 100644
+index 848b5c3f..73efea7e 100644
 --- a/src/main/java/net/minecraft/server/RemoteStatusReply.java
 +++ b/src/main/java/net/minecraft/server/RemoteStatusReply.java
 @@ -18,15 +18,27 @@ public class RemoteStatusReply {
@@ -216,5 +216,5 @@ index 848b5c3f0e..73efea7e13 100644
          this.b.writeShort(Short.reverseBytes(short0));
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0358-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0357-Implement-PlayerPostRespawnEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0358-Implement-PlayerPostRespawnEvent.patch
rename to Spigot-Server-Patches/0357-Implement-PlayerPostRespawnEvent.patch
index f220f88664..850c6a64fc 100644
--- a/Spigot-Server-Patches/0358-Implement-PlayerPostRespawnEvent.patch
+++ b/Spigot-Server-Patches/0357-Implement-PlayerPostRespawnEvent.patch
@@ -1,11 +1,11 @@
-From 00d7e661a3d63f623484a36ba413fc4e2e9d0454 Mon Sep 17 00:00:00 2001
+From 38f581e7c99c67fc727ae99afdcf741ddbeeba8d 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7745e70d2..765ebe2cc 100644
+index 7745e70d..765ebe2c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -625,9 +625,14 @@ public abstract class PlayerList {
@@ -47,5 +47,5 @@ index 7745e70d2..765ebe2cc 100644
          return entityplayer1;
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0358-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 92%
rename from Spigot-Server-Patches/0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to Spigot-Server-Patches/0358-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 2641e4c996..499d5444bf 100644
--- a/Spigot-Server-Patches/0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/Spigot-Server-Patches/0358-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -1,4 +1,4 @@
-From 69e0e85fd31309f4c7ade11a217a4def957b78af Mon Sep 17 00:00:00 2001
+From 9a41b21eb77033d74bc2b5150ac987fa4a3fec3d 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
@@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
 vanilla checks for == 0
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index e5c9bac88a..ef2cf6565b 100644
+index e5c9bac8..ef2cf656 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -60,6 +60,7 @@ public class EntityItem extends Entity {
@@ -26,5 +26,5 @@ index e5c9bac88a..ef2cf6565b 100644
          this.lastTick = MinecraftServer.currentTick;
          // CraftBukkit end
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0359-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 92%
rename from Spigot-Server-Patches/0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-Server-Patches/0359-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index 8b3cd51521..fc8dbd56a3 100644
--- a/Spigot-Server-Patches/0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/0359-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From 9c2b27fc37317aaf12277c08ca07644b995b8dee Mon Sep 17 00:00:00 2001
+From 604551926888206fa0b23fd3f0d8f21ae4bba7bd 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 3f552b5905..cb756b1ba0 100644
+index 3f552b59..cb756b1b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -8,6 +8,11 @@ import org.bukkit.entity.EntityType;
@@ -51,5 +51,5 @@ index 3f552b5905..cb756b1ba0 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0361-Server-Tick-Events.patch b/Spigot-Server-Patches/0360-Server-Tick-Events.patch
similarity index 92%
rename from Spigot-Server-Patches/0361-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0360-Server-Tick-Events.patch
index be45702b09..870e3918df 100644
--- a/Spigot-Server-Patches/0361-Server-Tick-Events.patch
+++ b/Spigot-Server-Patches/0360-Server-Tick-Events.patch
@@ -1,4 +1,4 @@
-From 335fc27d048916fe0dead7f191e5af9c18f5b4ba Mon Sep 17 00:00:00 2001
+From d5938a4f8bed275a0bf78723ef2e8ed82f8bdeb0 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4d604bd0e..2a8e097f9 100644
+index 4d604bd0..2a8e097f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1087,6 +1087,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -31,5 +31,5 @@ index 4d604bd0e..2a8e097f9 100644
          long l = this.f[this.ticks % 100] = SystemUtils.getMonotonicNanos() - i;
  
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0362-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0361-PlayerDeathEvent-getItemsToKeep.patch
similarity index 96%
rename from Spigot-Server-Patches/0362-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0361-PlayerDeathEvent-getItemsToKeep.patch
index 00ed48f995..74d82c15e8 100644
--- a/Spigot-Server-Patches/0362-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0361-PlayerDeathEvent-getItemsToKeep.patch
@@ -1,4 +1,4 @@
-From cfa54b0815b077321661dcbaf49d41c2e16eb497 Mon Sep 17 00:00:00 2001
+From 9ed408500b8b1ed52a10f61596a563b2cfbc11a5 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 cd981e0a..82a80e34 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0363-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0362-Optimize-Captured-TileEntity-Lookup.patch
similarity index 92%
rename from Spigot-Server-Patches/0363-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0362-Optimize-Captured-TileEntity-Lookup.patch
index b045374870..8c07d4e53e 100644
--- a/Spigot-Server-Patches/0363-Optimize-Captured-TileEntity-Lookup.patch
+++ b/Spigot-Server-Patches/0362-Optimize-Captured-TileEntity-Lookup.patch
@@ -1,4 +1,4 @@
-From 6ba90383f58206d360a8043e7927113239b436f4 Mon Sep 17 00:00:00 2001
+From 146abc015bbb13fcf164daee7a480c858c210ff7 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
@@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a3fbdf5db5..f797d737a3 100644
+index a3fbdf5d..f797d737 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -998,12 +998,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -31,5 +31,5 @@ index a3fbdf5db5..f797d737a3 100644
              if (this.tickingTileEntities) {
                  tileentity = this.e(blockposition);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0364-Add-Heightmap-API.patch b/Spigot-Server-Patches/0363-Add-Heightmap-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0364-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0363-Add-Heightmap-API.patch
index 1d1f0d29ec..6e50b801b1 100644
--- a/Spigot-Server-Patches/0364-Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/0363-Add-Heightmap-API.patch
@@ -1,11 +1,11 @@
-From 407a6470c7e6faa1b563a16712aba379398990ac Mon Sep 17 00:00:00 2001
+From b8b5ea0419fd601e91208f44afdbda79e21e679f 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
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f797d737a3..983bc1c7d9 100644
+index f797d737..983bc1c7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -573,8 +573,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -20,7 +20,7 @@ index f797d737a3..983bc1c7d9 100644
  
          if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 06b2e8b910..693dc983cd 100644
+index 06b2e8b9..693dc983 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -339,6 +339,29 @@ public class CraftWorld implements World {
@@ -54,5 +54,5 @@ index 06b2e8b910..693dc983cd 100644
      public Location getSpawnLocation() {
          BlockPosition spawn = world.getSpawn();
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0365-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0364-Mob-Spawner-API-Enhancements.patch
similarity index 97%
rename from Spigot-Server-Patches/0365-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0364-Mob-Spawner-API-Enhancements.patch
index 0ece25b73d..70832c23f1 100644
--- a/Spigot-Server-Patches/0365-Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-Server-Patches/0364-Mob-Spawner-API-Enhancements.patch
@@ -1,11 +1,11 @@
-From a4d72597610be0cfb08ccf73fd863892731d46e9 Mon Sep 17 00:00:00 2001
+From 4f3ca22407e9288985fb6bfec250f8694f64679c 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 cb7cb789..41001b02 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 5c4c3c70..e78e3804 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0366-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0365-Per-Player-View-Distance-API-placeholders.patch
similarity index 95%
rename from Spigot-Server-Patches/0366-Per-Player-View-Distance-API-placeholders.patch
rename to Spigot-Server-Patches/0365-Per-Player-View-Distance-API-placeholders.patch
index 20e593a0f6..141db12ebb 100644
--- a/Spigot-Server-Patches/0366-Per-Player-View-Distance-API-placeholders.patch
+++ b/Spigot-Server-Patches/0365-Per-Player-View-Distance-API-placeholders.patch
@@ -1,4 +1,4 @@
-From d5fe9fe9b7f7ed62789c6eaa9a67510eef7d2dd8 Mon Sep 17 00:00:00 2001
+From 1daf15ade3bfe0ef9e8324577f3f187bc9e9688a 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 6a4ccaeb..af10fc36 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 2e95069c..8977c351 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 344e9e9b48..33cac5fcb1 100644
+index 344e9e9b..33cac5fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1959,6 +1959,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -60,5 +60,5 @@ index 344e9e9b48..33cac5fcb1 100644
  
      // Spigot start
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0367-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0366-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 87%
rename from Spigot-Server-Patches/0367-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to Spigot-Server-Patches/0366-Fix-CB-call-to-changed-postToMainThread-method.patch
index fbcb6216f4..7f23e13d98 100644
--- a/Spigot-Server-Patches/0367-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/Spigot-Server-Patches/0366-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -1,11 +1,11 @@
-From e96270768357f78e042b5ee4143cc6a95fd562ca Mon Sep 17 00:00:00 2001
+From d9f46969684c3996ce3683e374288454e9af07f0 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index eee96c3a1c..691331217b 100644
+index eee96c3a..69133121 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -286,7 +286,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -18,5 +18,5 @@ index eee96c3a1c..691331217b 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 91%
rename from Spigot-Server-Patches/0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to Spigot-Server-Patches/0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index dced1c60d9..e49212c0cd 100644
--- a/Spigot-Server-Patches/0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/Spigot-Server-Patches/0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
@@ -1,4 +1,4 @@
-From 5fb55d4d75761439ea15bfa10059465998b930f0 Mon Sep 17 00:00:00 2001
+From d65be54697edd9be2d020a1e7201ed1df21dd616 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)
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
 This also fixes the adding sound playing when the item frame direction is changed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
-index 9b1e07452f..f8a2f32f1d 100644
+index 9b1e0745..f8a2f32f 100644
 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java
 +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
 @@ -224,7 +224,7 @@ public class EntityItemFrame extends EntityHanging {
@@ -19,7 +19,7 @@ index 9b1e07452f..f8a2f32f1d 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
-index 799036f268..9ad180d946 100644
+index 799036f2..9ad180d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 @@ -49,7 +49,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
@@ -32,5 +32,5 @@ index 799036f268..9ad180d946 100644
          this.entity = frame;
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 93%
rename from Spigot-Server-Patches/0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to Spigot-Server-Patches/0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index 0d2837fa6c..be45ddbcc1 100644
--- a/Spigot-Server-Patches/0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/Spigot-Server-Patches/0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@@ -1,4 +1,4 @@
-From 320210a73ad0e0c324fd29d09da9b7f901af29ee Mon Sep 17 00:00:00 2001
+From 6464e6fdba6fb4db306218b2e5f9073ba75c2131 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
@@ -16,7 +16,7 @@ handling that should have been handled synchronously will be handled
 synchronously when the server gets shut down.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2a8e097f9..91af25632 100644
+index 2a8e097f..91af2563 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2215,7 +2215,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -29,7 +29,7 @@ index 2a8e097f9..91af25632 100644
  
      @Deprecated
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 30dd66b81..0df49581f 100644
+index 30dd66b8..0df49581 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1705,7 +1705,7 @@ public final class CraftServer implements Server {
@@ -42,5 +42,5 @@ index 30dd66b81..0df49581f 100644
  
      @Override
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
index e25cad221b..7b259442c4 100644
--- a/Spigot-Server-Patches/0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From f28f9895015697f5e61f96c16a5cdd4d3b233b89 Mon Sep 17 00:00:00 2001
+From abb9b457b22548308cfdab21f0e4470b3e519f33 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
@@ -19,7 +19,7 @@ This change ensures the chunks are always loaded when entities are
 added to the world, or a valid entity moves between chunks.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 64bd41f1e3..1221c30a99 100644
+index f7a1fad9..e34ea3d0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -707,7 +707,7 @@ public class WorldServer extends World {
@@ -41,5 +41,5 @@ index 64bd41f1e3..1221c30a99 100644
              if (!(ichunkaccess instanceof Chunk)) {
                  return false;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0371-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0370-Duplicate-UUID-Resolve-Option.patch
similarity index 98%
rename from Spigot-Server-Patches/0371-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0370-Duplicate-UUID-Resolve-Option.patch
index b633737909..d75b26fbfa 100644
--- a/Spigot-Server-Patches/0371-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0370-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From 7d7fb0beb9848e04b69115199bb267aff122cbd2 Mon Sep 17 00:00:00 2001
+From dea664111743b5a739f4b4c12c6cb4551f867878 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 4ba72275b..572679e4d 100644
+index 4ba72275..572679e4 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 4ba72275b..572679e4d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 8d6c5d18e..23cc0c360 100644
+index 8d6c5d18..23cc0c36 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -478,6 +478,7 @@ public class Chunk implements IChunkAccess {
@@ -93,7 +93,7 @@ index 8d6c5d18e..23cc0c360 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 bb1fd6e46..0900db052 100644
+index bb1fd6e4..0900db05 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2747,6 +2747,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -105,7 +105,7 @@ index bb1fd6e46..0900db052 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 f640d2ac7..863c47b76 100644
+index f640d2ac..863c47b7 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,6 +1,7 @@
@@ -197,7 +197,7 @@ index f640d2ac7..863c47b76 100644
          ChunkCoordIntPair chunkcoordintpair = playerchunk.i();
          CompletableFuture<Either<List<IChunkAccess>, PlayerChunk.Failure>> completablefuture = this.a(chunkcoordintpair, 1, (i) -> {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e34ea3d09..f9ee9afe3 100644
+index e34ea3d0..f9ee9afe 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;
@@ -236,5 +236,5 @@ index e34ea3d09..f9ee9afe3 100644
          }
      }
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0372-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0371-improve-CraftWorld-isChunkLoaded.patch
similarity index 93%
rename from Spigot-Server-Patches/0372-improve-CraftWorld-isChunkLoaded.patch
rename to Spigot-Server-Patches/0371-improve-CraftWorld-isChunkLoaded.patch
index 66cc86930e..ecbeac44e2 100644
--- a/Spigot-Server-Patches/0372-improve-CraftWorld-isChunkLoaded.patch
+++ b/Spigot-Server-Patches/0371-improve-CraftWorld-isChunkLoaded.patch
@@ -1,4 +1,4 @@
-From 2f00323ef6fcbc1b61c76194e2ce8a58135d3f1e Mon Sep 17 00:00:00 2001
+From e5c6cc0ae662261db0ce8a54e103a7a480c74613 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 693dc983cd..8b6d22e710 100644
+index 693dc983..8b6d22e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -403,14 +403,13 @@ public class CraftWorld implements World {
@@ -30,5 +30,5 @@ index 693dc983cd..8b6d22e710 100644
              throw new RuntimeException(ex);
          }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0372-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 97%
rename from Spigot-Server-Patches/0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0372-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 28caaab8ba..ba5659e4cc 100644
--- a/Spigot-Server-Patches/0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0372-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From bfe6cddf13d2147c867daaf847b14e99371d5d5f Mon Sep 17 00:00:00 2001
+From d35736b1430f4309466273e1833791124c64c638 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 572679e4d1..071e5e7f72 100644
+index 572679e4..071e5e7f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -481,4 +481,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 572679e4d1..071e5e7f72 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 91af256323..e9841ef58d 100644
+index 91af2563..e9841ef5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -586,6 +586,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -60,7 +60,7 @@ index 91af256323..e9841ef58d 100644
          // CraftBukkit start
          // this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
 diff --git a/src/main/java/net/minecraft/server/WorldLoadListener.java b/src/main/java/net/minecraft/server/WorldLoadListener.java
-index d6762d3853..7b6f5b2da0 100644
+index d6762d38..7b6f5b2d 100644
 --- a/src/main/java/net/minecraft/server/WorldLoadListener.java
 +++ b/src/main/java/net/minecraft/server/WorldLoadListener.java
 @@ -9,4 +9,6 @@ public interface WorldLoadListener {
@@ -71,7 +71,7 @@ index d6762d3853..7b6f5b2da0 100644
 +    void setChunkRadius(int radius); // Paper - allow changing chunk radius
  }
 diff --git a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
-index 3868572aed..ae77805f71 100644
+index 3868572a..ae77805f 100644
 --- a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
 +++ b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
 @@ -7,16 +7,24 @@ import org.apache.logging.log4j.Logger;
@@ -102,7 +102,7 @@ index 3868572aed..ae77805f71 100644
      @Override
      public void a(ChunkCoordIntPair chunkcoordintpair) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f9ee9afe3a..389c9d03a1 100644
+index f9ee9afe..389c9d03 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1598,13 +1598,89 @@ public class WorldServer extends World {
@@ -199,7 +199,7 @@ index f9ee9afe3a..389c9d03a1 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 8b6d22e710..661a89c5d6 100644
+index 8b6d22e7..661a89c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1928,15 +1928,21 @@ public class CraftWorld implements World {
@@ -229,5 +229,5 @@ index 8b6d22e710..661a89c5d6 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0374-Fix-some-generation-concurrency-issues.patch b/Spigot-Server-Patches/0373-Fix-some-generation-concurrency-issues.patch
similarity index 98%
rename from Spigot-Server-Patches/0374-Fix-some-generation-concurrency-issues.patch
rename to Spigot-Server-Patches/0373-Fix-some-generation-concurrency-issues.patch
index af9e510f98..681131baa7 100644
--- a/Spigot-Server-Patches/0374-Fix-some-generation-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0373-Fix-some-generation-concurrency-issues.patch
@@ -1,11 +1,11 @@
-From be5f000f5c59b88258d9b1273007515bda9836f4 Mon Sep 17 00:00:00 2001
+From fc822e35af3dd267d5cd2d2ef11f8d245d35ea01 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
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 983bc1c7d9..8cf3c10274 100644
+index 983bc1c7..8cf3c102 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -86,6 +86,23 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -33,7 +33,7 @@ index 983bc1c7d9..8cf3c10274 100644
      public CraftWorld getWorld() {
          return this.world;
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java
-index 22e14fe1e9..e2af6d43b2 100644
+index 22e14fe1..e2af6d43 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java
 @@ -23,18 +23,18 @@ public class WorldGenFeatureStateProviderWeighted extends WorldGenFeatureStatePr
@@ -59,7 +59,7 @@ index 22e14fe1e9..e2af6d43b2 100644
  
          builder.put(dynamicops.createString("type"), dynamicops.createString(IRegistry.t.getKey(this.a).toString())).put(dynamicops.createString("entries"), this.b.a(dynamicops, (iblockdata) -> {
 diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-index fc4348b602..44be7169ff 100644
+index fc4348b6..44be7169 100644
 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
 +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
 @@ -10,10 +10,12 @@ import javax.annotation.Nullable;
@@ -222,5 +222,5 @@ index fc4348b602..44be7169ff 100644
      }
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0374-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
similarity index 88%
rename from Spigot-Server-Patches/0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
rename to Spigot-Server-Patches/0374-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
index 7fe342100e..2e7101b292 100644
--- a/Spigot-Server-Patches/0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
+++ b/Spigot-Server-Patches/0374-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
@@ -1,4 +1,4 @@
-From 9c8ad00d6f2c35c90a6ea7456dbd66c157506fd6 Mon Sep 17 00:00:00 2001
+From 77d23c7037cd3437e1dfd1fd4de8523709d1477d 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
@@ -6,7 +6,7 @@ Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
-index e8f3e55fd3..44289c2301 100644
+index e8f3e55f..44289c23 100644
 --- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
 +++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
 @@ -175,6 +175,12 @@ public class EntityAreaEffectCloud extends Entity {
@@ -23,5 +23,5 @@ index e8f3e55fd3..44289c2301 100644
          if (this.world.isClientSide) {
              ParticleParam particleparam = this.getParticle();
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0376-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0375-ChunkMapDistance-CME.patch
similarity index 95%
rename from Spigot-Server-Patches/0376-ChunkMapDistance-CME.patch
rename to Spigot-Server-Patches/0375-ChunkMapDistance-CME.patch
index 16ad2326cf..e0ca89aee4 100644
--- a/Spigot-Server-Patches/0376-ChunkMapDistance-CME.patch
+++ b/Spigot-Server-Patches/0375-ChunkMapDistance-CME.patch
@@ -1,11 +1,11 @@
-From b9c0bd9dfda24d2d8db34b601dabbb466639cf6c Mon Sep 17 00:00:00 2001
+From 03ffe41a9f33838c3870ccaa2da222b88edea438 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
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index ae66129777..0244768f76 100644
+index ae661297..0244768f 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -33,7 +33,7 @@ public abstract class ChunkMapDistance {
@@ -50,5 +50,5 @@ index ae66129777..0244768f76 100644
          } else {
              if (!this.l.isEmpty()) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0377-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0376-Implement-CraftBlockSoundGroup.patch
similarity index 95%
rename from Spigot-Server-Patches/0377-Implement-CraftBlockSoundGroup.patch
rename to Spigot-Server-Patches/0376-Implement-CraftBlockSoundGroup.patch
index e022d2a31b..82c755c3e4 100644
--- a/Spigot-Server-Patches/0377-Implement-CraftBlockSoundGroup.patch
+++ b/Spigot-Server-Patches/0376-Implement-CraftBlockSoundGroup.patch
@@ -1,4 +1,4 @@
-From 39473cb0f58e3e9b728d37631b40a72cb89d6387 Mon Sep 17 00:00:00 2001
+From d448c0b0eefa84d6cf7e032387816ff8db2a8eef 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement CraftBlockSoundGroup
 
 diff --git a/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java
 new file mode 100644
-index 0000000000..99f99330d0
+index 00000000..99f99330
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java
 @@ -0,0 +1,38 @@
@@ -49,7 +49,7 @@ index 0000000000..99f99330d0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index c1ff62aa52..de43881653 100644
+index c1ff62aa..de438816 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -275,6 +275,7 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
@@ -61,7 +61,7 @@ index c1ff62aa52..de43881653 100644
          return this.getBlock().getStepSound(this);
      }
 diff --git a/src/main/java/net/minecraft/server/SoundEffectType.java b/src/main/java/net/minecraft/server/SoundEffectType.java
-index b774d2d8d9..0184bf3fc9 100644
+index b774d2d8..0184bf3f 100644
 --- a/src/main/java/net/minecraft/server/SoundEffectType.java
 +++ b/src/main/java/net/minecraft/server/SoundEffectType.java
 @@ -27,10 +27,10 @@ public class SoundEffectType {
@@ -96,7 +96,7 @@ index b774d2d8d9..0184bf3fc9 100644
          return this.D;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 1354d949c1..aae818674f 100644
+index 1354d949..aae81867 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -704,4 +704,11 @@ public class CraftBlock implements Block {
@@ -112,5 +112,5 @@ index 1354d949c1..aae818674f 100644
 +    // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0378-Chunk-debug-command.patch b/Spigot-Server-Patches/0377-Chunk-debug-command.patch
similarity index 98%
rename from Spigot-Server-Patches/0378-Chunk-debug-command.patch
rename to Spigot-Server-Patches/0377-Chunk-debug-command.patch
index b925b2a2a5..b9e09d82c8 100644
--- a/Spigot-Server-Patches/0378-Chunk-debug-command.patch
+++ b/Spigot-Server-Patches/0377-Chunk-debug-command.patch
@@ -1,4 +1,4 @@
-From 29a8bf9a030ea8b9bf1ead669e972a2075f008c2 Mon Sep 17 00:00:00 2001
+From 3fb7636d7645f03eb8391bfa41ed461005a94fc6 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
@@ -32,7 +32,7 @@ https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528273&page=com.atlass
 https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528577&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-528577
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 5acad8e44f..af81098784 100644
+index 5acad8e4..af810987 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -28,14 +28,14 @@ public class PaperCommand extends Command {
@@ -185,7 +185,7 @@ index 5acad8e44f..af81098784 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 96ac76c134..0db7b88bdd 100644
+index 05534126..c7e86488 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;
@@ -198,7 +198,7 @@ index 96ac76c134..0db7b88bdd 100644
      public final ChunkGenerator<?> chunkGenerator;
      private final WorldServer world;
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 3342278bcd..2dcecc1bbd 100644
+index 3342278b..2dcecc1b 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -4,7 +4,13 @@ import com.destroystokyo.paper.block.TargetBlockInfo;
@@ -399,7 +399,7 @@ index 3342278bcd..2dcecc1bbd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index c4bbee7d6a..b6d3870063 100644
+index 6e9f402f..a640cb38 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 c4bbee7d6a..b6d3870063 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 863c47b761..cdab5ab6be 100644
+index 863c47b7..cdab5ab6 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 {
@@ -434,7 +434,7 @@ index 863c47b761..cdab5ab6be 100644
      private final DefinedStructureManager definedStructureManager;
      private final File w;
 diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java
-index 77bb6b092a..7a8397815a 100644
+index 77bb6b09..7a839781 100644
 --- a/src/main/java/net/minecraft/server/Ticket.java
 +++ b/src/main/java/net/minecraft/server/Ticket.java
 @@ -6,8 +6,8 @@ public final class Ticket<T> implements Comparable<Ticket<?>> {
@@ -457,5 +457,5 @@ index 77bb6b092a..7a8397815a 100644
          return this.b;
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0379-incremental-chunk-saving.patch b/Spigot-Server-Patches/0378-incremental-chunk-saving.patch
similarity index 97%
rename from Spigot-Server-Patches/0379-incremental-chunk-saving.patch
rename to Spigot-Server-Patches/0378-incremental-chunk-saving.patch
index 4a333e0e1d..6f9b219ffb 100644
--- a/Spigot-Server-Patches/0379-incremental-chunk-saving.patch
+++ b/Spigot-Server-Patches/0378-incremental-chunk-saving.patch
@@ -1,11 +1,11 @@
-From 701400c53b8656076b71f4027e94e50b0b8f8775 Mon Sep 17 00:00:00 2001
+From 24f31d237a2e8bb14ce2bbc184190599107ef63d 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 071e5e7f7..486761521 100644
+index 071e5e7f..48676152 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -487,4 +487,19 @@ public class PaperWorldConfig {
@@ -29,7 +29,7 @@ index 071e5e7f7..486761521 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 23cc0c360..d6637f3dd 100644
+index 23cc0c36..d6637f3d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -42,7 +42,7 @@ public class Chunk implements IChunkAccess {
@@ -42,7 +42,7 @@ index 23cc0c360..d6637f3dd 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 c7e864888..d41316c43 100644
+index c7e86488..d41316c4 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -513,6 +513,15 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -62,7 +62,7 @@ index c7e864888..d41316c43 100644
      public void close() throws IOException {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e9841ef58..7ca4a7cca 100644
+index e9841ef5..7ca4a7cc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -168,6 +168,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -108,7 +108,7 @@ index e9841ef58..7ca4a7cca 100644
          this.methodProfiler.enter("snooper");
          if (((DedicatedServer) this).getDedicatedServerProperties().snooperEnabled && !this.snooper.d() && this.ticks > 100) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index a640cb384..3d255b196 100644
+index a640cb38..3d255b19 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -40,6 +40,9 @@ public class PlayerChunk {
@@ -175,7 +175,7 @@ index a640cb384..3d255b196 100644
      public void a(ProtoChunkExtension protochunkextension) {
          for (int i = 0; i < this.statusFutures.length(); ++i) {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index cdab5ab6b..18c71609c 100644
+index cdab5ab6..18c71609 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -331,6 +331,64 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -261,7 +261,7 @@ index cdab5ab6b..18c71609c 100644
                      return PlayerChunk.getChunkState(playerchunk.getTicketLevel());
                  });
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 389c9d03a..62c227509 100644
+index 389c9d03..62c22750 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -814,11 +814,44 @@ public class WorldServer extends World {
@@ -319,5 +319,5 @@ index 389c9d03a..62c227509 100644
          this.checkSession();
          this.worldProvider.i();
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0380-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0379-Catch-exceptions-from-dispenser-entity-spawns.patch
similarity index 91%
rename from Spigot-Server-Patches/0380-Catch-exceptions-from-dispenser-entity-spawns.patch
rename to Spigot-Server-Patches/0379-Catch-exceptions-from-dispenser-entity-spawns.patch
index e45fb90e90..95b98270de 100644
--- a/Spigot-Server-Patches/0380-Catch-exceptions-from-dispenser-entity-spawns.patch
+++ b/Spigot-Server-Patches/0379-Catch-exceptions-from-dispenser-entity-spawns.patch
@@ -1,11 +1,11 @@
-From 3bb7c7752643d0567ddf3e1c62772718ea61082d Mon Sep 17 00:00:00 2001
+From 81e83ca23bd256517829c75517a0c78c9e2f010e 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
 
 
 diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java
-index 5a8c4dc6ba..b6b7e3c6c9 100644
+index 5a8c4dc6..b6b7e3c6 100644
 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java
 +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java
 @@ -163,7 +163,14 @@ public interface IDispenseBehavior {
@@ -24,5 +24,5 @@ index 5a8c4dc6ba..b6b7e3c6c9 100644
                  // CraftBukkit end
                  return itemstack;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0381-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0380-Fix-World-isChunkGenerated-calls.patch
similarity index 97%
rename from Spigot-Server-Patches/0381-Fix-World-isChunkGenerated-calls.patch
rename to Spigot-Server-Patches/0380-Fix-World-isChunkGenerated-calls.patch
index 24c4d33c83..3790269be4 100644
--- a/Spigot-Server-Patches/0381-Fix-World-isChunkGenerated-calls.patch
+++ b/Spigot-Server-Patches/0380-Fix-World-isChunkGenerated-calls.patch
@@ -1,4 +1,4 @@
-From 2333fe5e9dcb1fd367a1fbeecfa1d72d3503d25a Mon Sep 17 00:00:00 2001
+From ae592aa30cc3b397c74926c89b7a4ae4682ab2cb 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 d41316c43..262055fcc 100644
+index d41316c4..262055fc 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 {
@@ -43,7 +43,7 @@ index d41316c43..262055fcc 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 83bcef7e6..47e074a12 100644
+index 83bcef7e..47e074a1 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -403,6 +403,17 @@ public class ChunkRegionLoader {
@@ -65,7 +65,7 @@ index 83bcef7e6..47e074a12 100644
          if (nbttagcompound != null) {
              ChunkStatus chunkstatus = ChunkStatus.a(nbttagcompound.getCompound("Level").getString("Status"));
 diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java
-index efdf611e6..134a4f0b7 100644
+index efdf611e..134a4f0b 100644
 --- a/src/main/java/net/minecraft/server/ChunkStatus.java
 +++ b/src/main/java/net/minecraft/server/ChunkStatus.java
 @@ -176,6 +176,7 @@ public class ChunkStatus {
@@ -95,7 +95,7 @@ index efdf611e6..134a4f0b7 100644
          return (ChunkStatus) IRegistry.CHUNK_STATUS.get(MinecraftKey.a(s));
      }
 diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
-index f0a052eec..2f95174fc 100644
+index f0a052ee..2f95174f 100644
 --- a/src/main/java/net/minecraft/server/IChunkLoader.java
 +++ b/src/main/java/net/minecraft/server/IChunkLoader.java
 @@ -8,7 +8,7 @@ import javax.annotation.Nullable;
@@ -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 3d255b196..040d4b41e 100644
+index 3d255b19..040d4b41 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 3d255b196..040d4b41e 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 18c71609c..57b1341b5 100644
+index 18c71609..57b1341b 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -968,12 +968,62 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -201,7 +201,7 @@ index 18c71609c..57b1341b5 100644
          // Spigot start
          return isOutsideOfRange(chunkcoordintpair, false);
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 6b543f89d..d37abf2cf 100644
+index 6b543f89..d37abf2c 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -36,6 +36,30 @@ public class RegionFile implements AutoCloseable {
@@ -250,7 +250,7 @@ index 6b543f89d..d37abf2cf 100644
              this.c();
          } finally {
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index b3d1bb5fd..e07ae9854 100644
+index b3d1bb5f..e07ae985 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -18,7 +18,14 @@ public final class RegionFileCache implements AutoCloseable {
@@ -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 661a89c5d..a71bb8650 100644
+index 661a89c5..a71bb865 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 661a89c5d..a71bb8650 100644
  
      @Override
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0382-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0381-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 92%
rename from Spigot-Server-Patches/0382-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to Spigot-Server-Patches/0381-Show-blockstate-location-if-we-failed-to-read-it.patch
index 8058b30dd6..f3e2d23160 100644
--- a/Spigot-Server-Patches/0382-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/Spigot-Server-Patches/0381-Show-blockstate-location-if-we-failed-to-read-it.patch
@@ -1,11 +1,11 @@
-From 38f140a4ea31987265cf2094a6c6362628208d25 Mon Sep 17 00:00:00 2001
+From 9eb59758d579f44e9161e1ff2a814083939732d9 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index f6401e2cde..3e22d558ea 100644
+index f6401e2c..3e22d558 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -19,6 +19,8 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -33,5 +33,5 @@ index f6401e2cde..3e22d558ea 100644
  
      public final boolean snapshotDisabled; // Paper
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch b/Spigot-Server-Patches/0382-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
similarity index 95%
rename from Spigot-Server-Patches/0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
rename to Spigot-Server-Patches/0382-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
index 1c2a271b2f..ab2c7e9480 100644
--- a/Spigot-Server-Patches/0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
+++ b/Spigot-Server-Patches/0382-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
@@ -1,4 +1,4 @@
-From 5a41ad7f8e1268ded303d8ba566a40502433e7bf Mon Sep 17 00:00:00 2001
+From b2f4f87cf389858166da4612e94d01deb9fd6844 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Log other thread in DataPaletteBlock lock failure
 
 diff --git a/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java
 new file mode 100644
-index 0000000000..a3b174618d
+index 00000000..a3b17461
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java
 @@ -0,0 +1,11 @@
@@ -22,7 +22,7 @@ index 0000000000..a3b174618d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index d5f5a51872..2c1d1b1a55 100644
+index d5f5a518..2c1d1b1a 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -22,14 +22,17 @@ public class DataPaletteBlock<T> implements DataPaletteExpandable<T> {
@@ -47,5 +47,5 @@ index d5f5a51872..2c1d1b1a55 100644
  
              crashreportsystemdetails.a("Thread dumps", (Object) s);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch b/Spigot-Server-Patches/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch
similarity index 91%
rename from Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch
rename to Spigot-Server-Patches/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch
index 2bb295e2f6..01bea8c048 100644
--- a/Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch
+++ b/Spigot-Server-Patches/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch
@@ -1,4 +1,4 @@
-From bbbed5212480412ebe981d0b25cbd1ef9d4941ff Mon Sep 17 00:00:00 2001
+From eb891508576479e5570e9277ff43aaa53af0c7ee 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 57b1341b5a..5ac370720c 100644
+index 57b1341b..5ac37072 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -844,8 +844,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -24,5 +24,5 @@ index 57b1341b5a..5ac370720c 100644
                      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0385-Anti-Xray.patch b/Spigot-Server-Patches/0384-Anti-Xray.patch
similarity index 99%
rename from Spigot-Server-Patches/0385-Anti-Xray.patch
rename to Spigot-Server-Patches/0384-Anti-Xray.patch
index 0cafd8646e..b7778fe2bc 100644
--- a/Spigot-Server-Patches/0385-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0384-Anti-Xray.patch
@@ -1,11 +1,11 @@
-From 904aede5990f211eafbc650a0f03b97b4f3decf3 Mon Sep 17 00:00:00 2001
+From 92488927543b5f3df2f3833f2d179fb8c8059ecc 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 486761521..df24e3297 100644
+index 48676152..df24e329 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,7 +1,11 @@
@@ -66,7 +66,7 @@ index 486761521..df24e3297 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
 new file mode 100644
-index 000000000..f7e376ce6
+index 00000000..f7e376ce
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
 @@ -0,0 +1,46 @@
@@ -118,7 +118,7 @@ index 000000000..f7e376ce6
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 new file mode 100644
-index 000000000..23626bef3
+index 00000000..23626bef
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 @@ -0,0 +1,782 @@
@@ -906,7 +906,7 @@ index 000000000..23626bef3
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java
 new file mode 100644
-index 000000000..a68bace35
+index 00000000..a68bace3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java
 @@ -0,0 +1,81 @@
@@ -993,7 +993,7 @@ index 000000000..a68bace35
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java
 new file mode 100644
-index 000000000..067dfb2f1
+index 00000000..067dfb2f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java
 @@ -0,0 +1,31 @@
@@ -1030,7 +1030,7 @@ index 000000000..067dfb2f1
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
 new file mode 100644
-index 000000000..cc586827a
+index 00000000..cc586827
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
 @@ -0,0 +1,56 @@
@@ -1092,7 +1092,7 @@ index 000000000..cc586827a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
 new file mode 100644
-index 000000000..37093419c
+index 00000000..37093419
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
 @@ -0,0 +1,84 @@
@@ -1181,7 +1181,7 @@ index 000000000..37093419c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index d6637f3dd..bdd04305f 100644
+index d6637f3d..bdd04305 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -402,7 +402,7 @@ public class Chunk implements IChunkAccess {
@@ -1194,7 +1194,7 @@ index d6637f3dd..bdd04305f 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 47e074a12..8816c90e2 100644
+index 47e074a1..8816c90e 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -57,7 +57,7 @@ public class ChunkRegionLoader {
@@ -1216,7 +1216,7 @@ index 47e074a12..8816c90e2 100644
              protochunk.a(biomestorage);
              object = protochunk;
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 0d5deee36..4526527ac 100644
+index 0d5deee3..4526527a 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -6,21 +6,31 @@ public class ChunkSection {
@@ -1255,7 +1255,7 @@ index 0d5deee36..4526527ac 100644
  
      public IBlockData getType(int i, int j, int k) {
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 2c1d1b1a5..44aed6727 100644
+index 2c1d1b1a..44aed672 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -1377,7 +1377,7 @@ index 2c1d1b1a5..44aed6727 100644
  
          if (this.h == this.b) {
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index e156804f7..96a785af2 100644
+index e156804f..96a785af 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -42,7 +42,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -1440,7 +1440,7 @@ index e156804f7..96a785af2 100644
      public void a() {
          this.o();
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 47710067a..ef7ade797 100644
+index 47710067..ef7ade79 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -1,5 +1,6 @@
@@ -1533,7 +1533,7 @@ index 47710067a..ef7ade797 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 040d4b41e..f1620ba80 100644
+index 040d4b41..f1620ba8 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -223,6 +223,11 @@ public class PlayerChunk {
@@ -1558,7 +1558,7 @@ index 040d4b41e..f1620ba80 100644
                  this.a(new PacketPlayOutMultiBlockChange(this.dirtyCount, this.dirtyBlocks, chunk), false);
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 5ac370720..b4c9d544f 100644
+index 5ac37072..b4c9d544 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -603,7 +603,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1580,7 +1580,7 @@ index 5ac370720..b4c9d544f 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 17b7eddac..ce66090b8 100644
+index 17b7edda..ce66090b 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -266,6 +266,8 @@ public class PlayerInteractManager {
@@ -1593,7 +1593,7 @@ index 17b7eddac..ce66090b8 100644
  
      public void a(BlockPosition blockposition, PacketPlayInBlockDig.EnumPlayerDigType packetplayinblockdig_enumplayerdigtype, String s) {
 diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java
-index 39339fa27..f376e2106 100644
+index 39339fa2..f376e210 100644
 --- a/src/main/java/net/minecraft/server/ProtoChunk.java
 +++ b/src/main/java/net/minecraft/server/ProtoChunk.java
 @@ -45,16 +45,28 @@ public class ProtoChunk implements IChunkAccess {
@@ -1636,7 +1636,7 @@ index 39339fa27..f376e2106 100644
  
          return this.j[i];
 diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java
-index 75ab9f185..4cf28bc2d 100644
+index 75ab9f18..4cf28bc2 100644
 --- a/src/main/java/net/minecraft/server/TicketType.java
 +++ b/src/main/java/net/minecraft/server/TicketType.java
 @@ -22,6 +22,7 @@ public class TicketType<T> {
@@ -1648,7 +1648,7 @@ index 75ab9f185..4cf28bc2d 100644
      public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
          return new TicketType<>(s, comparator, 0L);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8cf3c1027..0bde17174 100644
+index 8cf3c102..0bde1717 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -1685,7 +1685,7 @@ index 8cf3c1027..0bde17174 100644
              if (iblockdata1 == null) {
                  // CraftBukkit start - remove blockstate if failed (or the same)
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
-index 8191e7c34..969d548de 100644
+index 8191e7c3..969d548d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
 @@ -21,9 +21,11 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData {
@@ -1710,5 +1710,5 @@ index 8191e7c34..969d548de 100644
          return section;
      }
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0385-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 94%
rename from Spigot-Server-Patches/0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to Spigot-Server-Patches/0385-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index a02457282b..b82ac4881b 100644
--- a/Spigot-Server-Patches/0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/Spigot-Server-Patches/0385-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -1,4 +1,4 @@
-From 8a3cab357aaf9232a086f008f2158887c257d1b0 Mon Sep 17 00:00:00 2001
+From 5e4e2326df2b5c668c1bf9259b0ac774836ebdc9 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
@@ -17,7 +17,7 @@ This should fully solve all of the issues around it so that only natural
 influences natural spawns.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index df24e3297b..4c50109365 100644
+index df24e329..4c501093 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -507,6 +507,16 @@ public class PaperWorldConfig {
@@ -38,7 +38,7 @@ index df24e3297b..4c50109365 100644
      public boolean asynchronous;
      public EngineMode engineMode;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 741d76967c..4b65a232ff 100644
+index 62c22750..6654b919 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -957,6 +957,13 @@ public class WorldServer extends World {
@@ -56,5 +56,5 @@ index 741d76967c..4b65a232ff 100644
              }
          }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0387-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0386-Configurable-projectile-relative-velocity.patch
similarity index 95%
rename from Spigot-Server-Patches/0387-Configurable-projectile-relative-velocity.patch
rename to Spigot-Server-Patches/0386-Configurable-projectile-relative-velocity.patch
index fbb5604841..f3c0bf6bc9 100644
--- a/Spigot-Server-Patches/0387-Configurable-projectile-relative-velocity.patch
+++ b/Spigot-Server-Patches/0386-Configurable-projectile-relative-velocity.patch
@@ -1,4 +1,4 @@
-From 9c600848edf2e857b7707069147b95a898360396 Mon Sep 17 00:00:00 2001
+From 3a6c4838819ae04871ee80d8c940bdc3783e373e 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
@@ -25,7 +25,7 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this
 server-internal fix makes this change future-proof.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4c50109365..a09282e00e 100644
+index 4c501093..a09282e0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -555,4 +555,9 @@ public class PaperWorldConfig {
@@ -39,7 +39,7 @@ index 4c50109365..a09282e00e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 634e2bd304..9c97edf9c9 100644
+index 634e2bd3..9c97edf9 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -85,7 +85,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -52,7 +52,7 @@ index 634e2bd304..9c97edf9c9 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 6c091b6808..f5c8074dcf 100644
+index 6c091b68..f5c8074d 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -43,7 +43,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -65,5 +65,5 @@ index 6c091b6808..f5c8074dcf 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0387-Mark-entities-as-being-ticked-when-notifying-navigat.patch
similarity index 89%
rename from Spigot-Server-Patches/0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch
rename to Spigot-Server-Patches/0387-Mark-entities-as-being-ticked-when-notifying-navigat.patch
index a03678e905..62182b7fa3 100644
--- a/Spigot-Server-Patches/0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch
+++ b/Spigot-Server-Patches/0387-Mark-entities-as-being-ticked-when-notifying-navigat.patch
@@ -1,11 +1,11 @@
-From 4017cfdb78a0758a5b0310724c0d3eab3be0cc99 Mon Sep 17 00:00:00 2001
+From db89e84499020ae2000c5f4405903dd7f31c5b73 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
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 00379f0a6..a79ccad0b 100644
+index 6654b919..e3913952 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1412,6 +1412,7 @@ public class WorldServer extends World {
@@ -25,5 +25,5 @@ index 00379f0a6..a79ccad0b 100644
      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0389-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0388-offset-item-frame-ticking.patch
similarity index 87%
rename from Spigot-Server-Patches/0389-offset-item-frame-ticking.patch
rename to Spigot-Server-Patches/0388-offset-item-frame-ticking.patch
index e95cc5ecbd..6ce82be940 100644
--- a/Spigot-Server-Patches/0389-offset-item-frame-ticking.patch
+++ b/Spigot-Server-Patches/0388-offset-item-frame-ticking.patch
@@ -1,11 +1,11 @@
-From 22a45ee7caf6a6cca7a4f7ca181420942dfee4cb Mon Sep 17 00:00:00 2001
+From 841aa2b0479198505c44364b6c0f74f76fe3b408 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java
-index 21dbc9b2ab..ef9c4717c3 100644
+index 21dbc9b2..ef9c4717 100644
 --- a/src/main/java/net/minecraft/server/EntityHanging.java
 +++ b/src/main/java/net/minecraft/server/EntityHanging.java
 @@ -15,7 +15,7 @@ public abstract class EntityHanging extends Entity {
@@ -18,5 +18,5 @@ index 21dbc9b2ab..ef9c4717c3 100644
      protected EnumDirection direction;
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0390-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0389-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 96%
rename from Spigot-Server-Patches/0390-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0389-Avoid-hopper-searches-if-there-are-no-items.patch
index d52550f361..e6defa3898 100644
--- a/Spigot-Server-Patches/0390-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0389-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From 66d74d811391f575701465a31099b5d51b2d0a8b Mon Sep 17 00:00:00 2001
+From 1bb7437c18fb1205e811164d1fc7a0bf1a8a7c4d 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 bdd04305f..03c25eae7 100644
+index bdd04305..03c25eae 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 {
@@ -85,7 +85,7 @@ index bdd04305f..03c25eae7 100644
                  T t0 = (T) iterator.next(); // CraftBukkit - decompile error
                  if (t0.shouldBeRemoved) continue; // Paper
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 498f38109..a2d1ef360 100644
+index 498f3810..a2d1ef36 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -11,6 +11,7 @@ public final class IEntitySelector {
@@ -97,5 +97,5 @@ index 498f38109..a2d1ef360 100644
          return entity instanceof IInventory && entity.isAlive();
      };
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0391-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch
similarity index 99%
rename from Spigot-Server-Patches/0391-Asynchronous-chunk-IO-and-loading.patch
rename to Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch
index f873289e76..76cb500e43 100644
--- a/Spigot-Server-Patches/0391-Asynchronous-chunk-IO-and-loading.patch
+++ b/Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch
@@ -1,4 +1,4 @@
-From 419f115d796424a848ba775b72f611180680b128 Mon Sep 17 00:00:00 2001
+From 69897be16837751a2d87f41c6fb978442000b145 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
@@ -121,7 +121,7 @@ tasks required to be executed by the chunk load task (i.e lighting
 and some poi tasks).
 
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
-index 27ce4a828..30bafb214 100644
+index 27ce4a82..30bafb21 100644
 --- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -61,6 +61,17 @@ public class WorldTimingsHandler {
@@ -161,7 +161,7 @@ index 27ce4a828..30bafb214 100644
  
      public static Timing getTickList(WorldServer worldserver, String timingsType) {
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index dbd143997..6916ed30c 100644
+index dbd14399..6916ed30 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -237,7 +237,7 @@ index dbd143997..6916ed30c 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
-index 23626bef3..1edcecd2e 100644
+index 23626bef..1edcecd2 100644
 --- a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 @@ -9,6 +9,7 @@ import java.util.concurrent.Executors;
@@ -318,7 +318,7 @@ index 23626bef3..1edcecd2e 100644
  
 diff --git a/src/main/java/com/destroystokyo/paper/io/IOUtil.java b/src/main/java/com/destroystokyo/paper/io/IOUtil.java
 new file mode 100644
-index 000000000..5af0ac3d9
+index 00000000..5af0ac3d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/IOUtil.java
 @@ -0,0 +1,62 @@
@@ -386,7 +386,7 @@ index 000000000..5af0ac3d9
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java b/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java
 new file mode 100644
-index 000000000..4f10a8311
+index 00000000..4f10a831
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java
 @@ -0,0 +1,661 @@
@@ -1053,7 +1053,7 @@ index 000000000..4f10a8311
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java b/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java
 new file mode 100644
-index 000000000..97f2e433c
+index 00000000..97f2e433
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java
 @@ -0,0 +1,277 @@
@@ -1336,7 +1336,7 @@ index 000000000..97f2e433c
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/QueueExecutorThread.java b/src/main/java/com/destroystokyo/paper/io/QueueExecutorThread.java
 new file mode 100644
-index 000000000..ee906b594
+index 00000000..ee906b59
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/QueueExecutorThread.java
 @@ -0,0 +1,241 @@
@@ -1583,7 +1583,7 @@ index 000000000..ee906b594
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java
 new file mode 100644
-index 000000000..305da4786
+index 00000000..305da478
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java
 @@ -0,0 +1,149 @@
@@ -1738,7 +1738,7 @@ index 000000000..305da4786
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java
 new file mode 100644
-index 000000000..60312b85f
+index 00000000..60312b85
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java
 @@ -0,0 +1,112 @@
@@ -1856,7 +1856,7 @@ index 000000000..60312b85f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTask.java
 new file mode 100644
-index 000000000..1dfa8abfd
+index 00000000..1dfa8abf
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTask.java
 @@ -0,0 +1,40 @@
@@ -1902,7 +1902,7 @@ index 000000000..1dfa8abfd
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java
 new file mode 100644
-index 000000000..2b20c159f
+index 00000000..2b20c159
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java
 @@ -0,0 +1,492 @@
@@ -2399,7 +2399,7 @@ index 000000000..2b20c159f
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 262055fcc..68bac9a3c 100644
+index 262055fc..68bac9a3 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -297,11 +297,137 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -2569,7 +2569,7 @@ index 262055fcc..68bac9a3c 100644
          } finally {
              playerChunkMap.callbackExecutor.run();
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 8816c90e2..1298a07dc 100644
+index 8816c90e..1298a07d 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
@@ -2834,7 +2834,7 @@ index 8816c90e2..1298a07dc 100644
  
          nbttagcompound1.set("PostProcessing", a(ichunkaccess.l()));
 diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java
-index 134a4f0b7..40ce30cdc 100644
+index 134a4f0b..40ce30cd 100644
 --- a/src/main/java/net/minecraft/server/ChunkStatus.java
 +++ b/src/main/java/net/minecraft/server/ChunkStatus.java
 @@ -153,6 +153,7 @@ public class ChunkStatus {
@@ -2870,7 +2870,7 @@ index 134a4f0b7..40ce30cdc 100644
          return this.c() >= chunkstatus.c();
      }
 diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
-index 7e5ece9d5..cfe43e882 100644
+index 7e5ece9d..cfe43e88 100644
 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 @@ -91,7 +91,7 @@ public abstract class IAsyncTaskHandler<R extends Runnable> implements Mailbox<R
@@ -2883,7 +2883,7 @@ index 7e5ece9d5..cfe43e882 100644
              ;
          }
 diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
-index 2f95174fc..134c76065 100644
+index 2f95174f..134c7606 100644
 --- a/src/main/java/net/minecraft/server/IChunkLoader.java
 +++ b/src/main/java/net/minecraft/server/IChunkLoader.java
 @@ -3,37 +3,49 @@ package net.minecraft.server;
@@ -3008,7 +3008,7 @@ index 2f95174fc..134c76065 100644
 +//    Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 2dcecc1bb..d9941b38c 100644
+index 2dcecc1b..d9941b38 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -627,4 +627,9 @@ public final class MCUtil {
@@ -3022,7 +3022,7 @@ index 2dcecc1bb..d9941b38c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7ca4a7cca..61fc659ed 100644
+index 7ca4a7cc..61fc659e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -777,6 +777,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -3034,7 +3034,7 @@ index 7ca4a7cca..61fc659ed 100644
  
      public String getServerIp() {
 diff --git a/src/main/java/net/minecraft/server/NextTickListEntry.java b/src/main/java/net/minecraft/server/NextTickListEntry.java
-index e9c405fb5..33cfeabde 100644
+index e9c405fb..33cfeabd 100644
 --- a/src/main/java/net/minecraft/server/NextTickListEntry.java
 +++ b/src/main/java/net/minecraft/server/NextTickListEntry.java
 @@ -4,7 +4,7 @@ import java.util.Comparator;
@@ -3056,7 +3056,7 @@ index e9c405fb5..33cfeabde 100644
          this.e = t0;
          this.b = i;
 diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java
-index ed8c4a87b..996c83263 100644
+index ed8c4a87..996c8326 100644
 --- a/src/main/java/net/minecraft/server/NibbleArray.java
 +++ b/src/main/java/net/minecraft/server/NibbleArray.java
 @@ -71,6 +71,7 @@ public class NibbleArray {
@@ -3068,7 +3068,7 @@ index ed8c4a87b..996c83263 100644
          return this.a == null ? new NibbleArray() : new NibbleArray((byte[]) this.a.clone());
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index f1620ba80..74e6b8b97 100644
+index f1620ba8..74e6b8b9 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -127,6 +127,18 @@ public class PlayerChunk {
@@ -3113,7 +3113,7 @@ index f1620ba80..74e6b8b97 100644
                  completablefuture = (CompletableFuture) this.statusFutures.get(i);
                  if (completablefuture != null) {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index b4c9d544f..7e5fa016c 100644
+index b4c9d544..7e5fa016 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -63,7 +63,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -3596,7 +3596,7 @@ index b4c9d544f..7e5fa016c 100644
          return this.m;
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index d37abf2cf..df728e2c0 100644
+index d37abf2c..df728e2c 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -36,6 +36,8 @@ public class RegionFile implements AutoCloseable {
@@ -3641,7 +3641,7 @@ index d37abf2cf..df728e2c0 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index e07ae9854..0f201000f 100644
+index e07ae985..0f201000 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -9,7 +9,7 @@ import java.io.File;
@@ -3746,7 +3746,7 @@ index e07ae9854..0f201000f 100644
  
          return regionfile != null ? regionfile.chunkExists(pos) : false;
 diff --git a/src/main/java/net/minecraft/server/RegionFileSection.java b/src/main/java/net/minecraft/server/RegionFileSection.java
-index db9f0196b..a6d8ef5eb 100644
+index db9f0196..a6d8ef5e 100644
 --- a/src/main/java/net/minecraft/server/RegionFileSection.java
 +++ b/src/main/java/net/minecraft/server/RegionFileSection.java
 @@ -20,28 +20,29 @@ import javax.annotation.Nullable;
@@ -3882,7 +3882,7 @@ index db9f0196b..a6d8ef5eb 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java
-index 4cf28bc2d..6e0d0a54a 100644
+index 4cf28bc2..6e0d0a54 100644
 --- a/src/main/java/net/minecraft/server/TicketType.java
 +++ b/src/main/java/net/minecraft/server/TicketType.java
 @@ -23,6 +23,7 @@ public class TicketType<T> {
@@ -3894,7 +3894,7 @@ index 4cf28bc2d..6e0d0a54a 100644
      public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
          return new TicketType<>(s, comparator, 0L);
 diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java
-index c999f8c9b..b59ef1a63 100644
+index c999f8c9..b59ef1a6 100644
 --- a/src/main/java/net/minecraft/server/VillagePlace.java
 +++ b/src/main/java/net/minecraft/server/VillagePlace.java
 @@ -24,8 +24,16 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -3983,7 +3983,7 @@ index c999f8c9b..b59ef1a63 100644
  
          HAS_SPACE(VillagePlaceRecord::d), IS_OCCUPIED(VillagePlaceRecord::e), ANY((villageplacerecord) -> {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e3913952d..b967f6a15 100644
+index e3913952..b967f6a1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -82,6 +82,79 @@ public class WorldServer extends World {
@@ -4085,7 +4085,7 @@ index e3913952d..b967f6a15 100644
      }
      public void removeTicketsForSpawn(int radiusInBlocks, BlockPosition spawn) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a71bb8650..1d275520f 100644
+index a71bb865..1d275520 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -554,22 +554,23 @@ public class CraftWorld implements World {
@@ -4146,7 +4146,7 @@ index a71bb8650..1d275520f 100644
      // Spigot start
      @Override
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 07936eeba..5bdcdcf9e 100644
+index 07936eeb..5bdcdcf9 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -6,6 +6,7 @@ import java.lang.management.ThreadInfo;
@@ -4166,5 +4166,5 @@ index 07936eeba..5bdcdcf9e 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0392-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0391-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 96%
rename from Spigot-Server-Patches/0392-Use-getChunkIfLoadedImmediately-in-places.patch
rename to Spigot-Server-Patches/0391-Use-getChunkIfLoadedImmediately-in-places.patch
index 19aa24198d..a7c60a733b 100644
--- a/Spigot-Server-Patches/0392-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/Spigot-Server-Patches/0391-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -1,4 +1,4 @@
-From fd02b1c0ca26abfaf871efe7c26a20e2514c5279 Mon Sep 17 00:00:00 2001
+From dda783c45cf1ec51ff0039bb5528281ed983ef67 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
@@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 691331217b..f88bcb29db 100644
+index 69133121..f88bcb29 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -989,7 +989,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -21,7 +21,7 @@ index 691331217b..f88bcb29db 100644
                                  return;
                              }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0bde171743..90f60dfd47 100644
+index 0bde1717..90f60dfd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -116,8 +116,16 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -60,7 +60,7 @@ index 0bde171743..90f60dfd47 100644
              return ichunkaccess == null ? false : ichunkaccess.getType(blockposition).a((IBlockAccess) this, blockposition, entity);
          }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index f86404f83a..92601c581c 100644
+index f86404f8..92601c58 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -143,9 +143,10 @@ public class ActivationRange
@@ -77,5 +77,5 @@ index f86404f83a..92601c581c 100644
                  }
              }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0393-Reduce-sync-loads.patch b/Spigot-Server-Patches/0392-Reduce-sync-loads.patch
similarity index 98%
rename from Spigot-Server-Patches/0393-Reduce-sync-loads.patch
rename to Spigot-Server-Patches/0392-Reduce-sync-loads.patch
index ab8bf60528..0700e8c076 100644
--- a/Spigot-Server-Patches/0393-Reduce-sync-loads.patch
+++ b/Spigot-Server-Patches/0392-Reduce-sync-loads.patch
@@ -1,4 +1,4 @@
-From 8d2f6773c49ff20e2076b58c03571edc8b86f2be Mon Sep 17 00:00:00 2001
+From 2b629be0b349e3cafe093b09706a413a219fd172 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
@@ -11,7 +11,7 @@ it must be enabled by setting the startup flag -Dpaper.debug-sync-loads=true
 To get a debug log for sync loads, the command is /paper syncloadinfo
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index af8109878..dfe92780a 100644
+index af810987..dfe92780 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -1,9 +1,13 @@
@@ -91,7 +91,7 @@ index af8109878..dfe92780a 100644
          if (args.length < 2 || args[1].equals("*")) {
 diff --git a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
 new file mode 100644
-index 000000000..59aec1032
+index 00000000..59aec103
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
 @@ -0,0 +1,172 @@
@@ -268,7 +268,7 @@ index 000000000..59aec1032
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 68bac9a3c..dd4bb664a 100644
+index 68bac9a3..dd4bb664 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -457,6 +457,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -280,7 +280,7 @@ index 68bac9a3c..dd4bb664a 100644
              this.serverThreadQueue.awaitTasks(completablefuture::isDone);
                  com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 90f60dfd4..48c75af82 100644
+index 90f60dfd..48c75af8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1173,7 +1173,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -311,7 +311,7 @@ index 90f60dfd4..48c75af82 100644
                  if (chunk != null) {
                      chunk.a(oclass, axisalignedbb, list, predicate);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index b967f6a15..0d25529b3 100644
+index b967f6a1..0d25529b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -154,6 +154,12 @@ public class WorldServer extends World {
@@ -328,5 +328,5 @@ index b967f6a15..0d25529b3 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.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0394-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0393-Implement-alternative-item-despawn-rate.patch
similarity index 97%
rename from Spigot-Server-Patches/0394-Implement-alternative-item-despawn-rate.patch
rename to Spigot-Server-Patches/0393-Implement-alternative-item-despawn-rate.patch
index 87327a53ff..66491aa2d3 100644
--- a/Spigot-Server-Patches/0394-Implement-alternative-item-despawn-rate.patch
+++ b/Spigot-Server-Patches/0393-Implement-alternative-item-despawn-rate.patch
@@ -1,11 +1,11 @@
-From 9e6a651010098df37353f4d2f6f3c6ce89182cb9 Mon Sep 17 00:00:00 2001
+From 8db8675c79cb610fc4ffd87362cb112e9ea4b223 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a09282e00e..9d9260ad07 100644
+index a09282e0..9d9260ad 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,12 +1,17 @@
@@ -80,7 +80,7 @@ index a09282e00e..9d9260ad07 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index ef2cf6565b..507627a29f 100644
+index ef2cf656..507627a2 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -6,6 +6,7 @@ import java.util.Objects;
@@ -128,5 +128,5 @@ index ef2cf6565b..507627a29f 100644
      public Packet<?> L() {
          return new PacketPlayOutSpawnEntity(this);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0394-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 96%
rename from Spigot-Server-Patches/0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to Spigot-Server-Patches/0394-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
index 41437bbc90..2fe3b8ebb3 100644
--- a/Spigot-Server-Patches/0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
+++ b/Spigot-Server-Patches/0394-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
@@ -1,4 +1,4 @@
-From 3474c24b380f6df551116da960d0ed8fe062f0bc Mon Sep 17 00:00:00 2001
+From d5d999e4e41fe0d27c29e380a93ed4cb2d01df23 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
@@ -7,7 +7,7 @@ If the Bukkit generator already has a spawn, use it immediately instead
 of spending time generating one that we won't use
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7088dbf6a2..08e9444fad 100644
+index 0d25529b..149600ae 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -811,12 +811,13 @@ public class WorldServer extends World {
@@ -45,5 +45,5 @@ index 7088dbf6a2..08e9444fad 100644
                  WorldServer.LOGGER.warn("Unable to find spawn biome");
              }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0396-Fix-MC-158900.patch b/Spigot-Server-Patches/0395-Fix-MC-158900.patch
similarity index 92%
rename from Spigot-Server-Patches/0396-Fix-MC-158900.patch
rename to Spigot-Server-Patches/0395-Fix-MC-158900.patch
index 9abe6ffde8..a269fae36a 100644
--- a/Spigot-Server-Patches/0396-Fix-MC-158900.patch
+++ b/Spigot-Server-Patches/0395-Fix-MC-158900.patch
@@ -1,4 +1,4 @@
-From 08f3fda4bdeb4d4ef372f3bc092a72443ef2f2d0 Mon Sep 17 00:00:00 2001
+From 50d56c93f1111f23a0a36d4b426933801998c826 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
@@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 765ebe2cc..0ccfd8de0 100644
+index 765ebe2c..0ccfd8de 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -500,8 +500,10 @@ public abstract class PlayerList {
@@ -24,5 +24,5 @@ index 765ebe2cc..0ccfd8de0 100644
              chatmessage = new ChatMessage("multiplayer.disconnect.banned.reason", new Object[]{gameprofilebanentry.getReason()});
              if (gameprofilebanentry.getExpires() != null) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0397-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0396-implement-optional-per-player-mob-spawns.patch
similarity index 98%
rename from Spigot-Server-Patches/0397-implement-optional-per-player-mob-spawns.patch
rename to Spigot-Server-Patches/0396-implement-optional-per-player-mob-spawns.patch
index 7aa0c48fb0..40b1bd3bde 100644
--- a/Spigot-Server-Patches/0397-implement-optional-per-player-mob-spawns.patch
+++ b/Spigot-Server-Patches/0396-implement-optional-per-player-mob-spawns.patch
@@ -1,11 +1,11 @@
-From 2bc7396ac5f5c494f26a1a0fe4373b5fb51ab1d7 Mon Sep 17 00:00:00 2001
+From 56a70e238a04999209b1b0d75b00f23a7f904e7c 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
 
 
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
-index 30bafb214..c9a3ba4bf 100644
+index 30bafb21..c9a3ba4b 100644
 --- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -60,6 +60,7 @@ public class WorldTimingsHandler {
@@ -25,7 +25,7 @@ index 30bafb214..c9a3ba4bf 100644
          poiUnload = Timings.ofSafe(name + "Chunk unload - POI");
          chunkUnload = Timings.ofSafe(name + "Chunk unload - Chunk");
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9d9260ad0..fd3dbea62 100644
+index 9d9260ad..fd3dbea6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -613,4 +613,9 @@ public class PaperWorldConfig {
@@ -40,7 +40,7 @@ index 9d9260ad0..fd3dbea62 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java
 new file mode 100644
-index 000000000..9ebd7ecb7
+index 00000000..9ebd7ecb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java
 @@ -0,0 +1,253 @@
@@ -299,7 +299,7 @@ index 000000000..9ebd7ecb7
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java b/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java
 new file mode 100644
-index 000000000..4f13d3ff8
+index 00000000..4f13d3ff
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java
 @@ -0,0 +1,241 @@
@@ -545,7 +545,7 @@ index 000000000..4f13d3ff8
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index dd4bb664a..d06027438 100644
+index dd4bb664..d0602743 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -739,7 +739,22 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -599,7 +599,7 @@ index dd4bb664a..d06027438 100644
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d00b687d2..07a2310b1 100644
+index 82a80e34..3d0316e9 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -81,6 +81,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -622,7 +622,7 @@ index d00b687d2..07a2310b1 100644
      }
  
      // Yes, this doesn't match Vanilla, but it's the best we can do for now.
-@@ -1771,6 +1777,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1764,6 +1770,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      }
  
@@ -631,7 +631,7 @@ index d00b687d2..07a2310b1 100644
          return this.cs;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 8427ee2ee..0f04bcc8b 100644
+index 8427ee2e..0f04bcc8 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -254,6 +254,7 @@ public class EntityTypes<T extends Entity> {
@@ -643,7 +643,7 @@ index 8427ee2ee..0f04bcc8b 100644
          return this.bb;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 7e5fa016c..f564502f8 100644
+index 7e5fa016..f564502f 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -78,7 +78,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -682,7 +682,7 @@ index 7e5fa016c..f564502f8 100644
  
      private static double a(ChunkCoordIntPair chunkcoordintpair, Entity entity) {
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index fdac5bb3a..58bbf2f9d 100644
+index fdac5bb3..58bbf2f9 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -755,7 +755,7 @@ index fdac5bb3a..58bbf2f9d 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 149600ae5..b164ee898 100644
+index 149600ae..b164ee89 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1028,7 +1028,20 @@ public class WorldServer extends World {
@@ -800,5 +800,5 @@ index 149600ae5..b164ee898 100644
  
      @Override
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0398-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0397-Prevent-consuming-the-wrong-itemstack.patch
similarity index 95%
rename from Spigot-Server-Patches/0398-Prevent-consuming-the-wrong-itemstack.patch
rename to Spigot-Server-Patches/0397-Prevent-consuming-the-wrong-itemstack.patch
index 4ce4c9278b..fcccb4b139 100644
--- a/Spigot-Server-Patches/0398-Prevent-consuming-the-wrong-itemstack.patch
+++ b/Spigot-Server-Patches/0397-Prevent-consuming-the-wrong-itemstack.patch
@@ -1,11 +1,11 @@
-From fdd66862c76fa14fd7cd5f9449fbce1cec56f601 Mon Sep 17 00:00:00 2001
+From 06fef9e33f696f66f882239bedd06bbcee8de481 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index af79b6e378..b098cd6d77 100644
+index af79b6e3..b098cd6d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2893,10 +2893,13 @@ public abstract class EntityLiving extends Entity {
@@ -44,5 +44,5 @@ index af79b6e378..b098cd6d77 100644
                  }
                  // Paper end
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0399-only-add-passanger-entities-once-from-spawners.patch b/Spigot-Server-Patches/0398-only-add-passanger-entities-once-from-spawners.patch
similarity index 88%
rename from Spigot-Server-Patches/0399-only-add-passanger-entities-once-from-spawners.patch
rename to Spigot-Server-Patches/0398-only-add-passanger-entities-once-from-spawners.patch
index b2c1065ca2..b897e0bc1a 100644
--- a/Spigot-Server-Patches/0399-only-add-passanger-entities-once-from-spawners.patch
+++ b/Spigot-Server-Patches/0398-only-add-passanger-entities-once-from-spawners.patch
@@ -1,11 +1,11 @@
-From 90d9dab79320f5b466ca585c1f4ea44ed260c5f5 Mon Sep 17 00:00:00 2001
+From 176dd584e7bd6449290e4fd2623491269521e870 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 41001b02..df494d37 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0400-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0399-Fix-nether-portal-creation.patch
similarity index 90%
rename from Spigot-Server-Patches/0400-Fix-nether-portal-creation.patch
rename to Spigot-Server-Patches/0399-Fix-nether-portal-creation.patch
index 7c583c24a5..555babc058 100644
--- a/Spigot-Server-Patches/0400-Fix-nether-portal-creation.patch
+++ b/Spigot-Server-Patches/0399-Fix-nether-portal-creation.patch
@@ -1,11 +1,11 @@
-From 52bcf883ebaa9220d2c61e926d828aba017a3ce7 Mon Sep 17 00:00:00 2001
+From 4a82948c37d115ae334953b480d20cf98fa9671a 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
-index 60330f753f..c22dbbfbe8 100644
+index 60330f75..c22dbbfb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
 @@ -38,6 +38,11 @@ public class BlockStateListPopulator extends DummyGeneratorAccess {
@@ -21,5 +21,5 @@ index 60330f753f..c22dbbfbe8 100644
          state.setData(data);
          list.put(position, state);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0401-Generator-Settings.patch b/Spigot-Server-Patches/0400-Generator-Settings.patch
similarity index 95%
rename from Spigot-Server-Patches/0401-Generator-Settings.patch
rename to Spigot-Server-Patches/0400-Generator-Settings.patch
index cfcea2571c..75d5e6fc6a 100644
--- a/Spigot-Server-Patches/0401-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0400-Generator-Settings.patch
@@ -1,11 +1,11 @@
-From 72ac50d4f38a7d0cddf54a8cd65a6f2fe859c3f9 Mon Sep 17 00:00:00 2001
+From 585732923abd12bdc309aa00db38c8ca4c1b5194 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fd3dbea628..e790326c9c 100644
+index fd3dbea6..e790326c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -618,4 +618,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index fd3dbea628..e790326c9c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
-index af81a84142..2268fbdd87 100644
+index af81a841..2268fbdd 100644
 --- a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
 +++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
 @@ -211,8 +211,8 @@ public abstract class ChunkGeneratorAbstract<T extends GeneratorSettingsDefault>
@@ -52,5 +52,5 @@ index af81a84142..2268fbdd87 100644
                      }
                  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch b/Spigot-Server-Patches/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch
similarity index 94%
rename from Spigot-Server-Patches/0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch
rename to Spigot-Server-Patches/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch
index 5f4ce02036..5835953994 100644
--- a/Spigot-Server-Patches/0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch
+++ b/Spigot-Server-Patches/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch
@@ -1,11 +1,11 @@
-From 711007d790acf13e0b26d42ce75eab081a256429 Mon Sep 17 00:00:00 2001
+From 246b338a2cd3c52c808e21959f343c04968e1b9c 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e790326c9c..c37a0f035d 100644
+index e790326c..c37a0f03 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -566,6 +566,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index e790326c9c..c37a0f035d 100644
      public Map<Material, Integer> altItemDespawnRateMap;
      private void altItemDespawnRate() {
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 540fcce1dd..e29ec958b3 100644
+index 540fcce1..e29ec958 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -46,6 +46,7 @@ public class Block implements IMaterial {
@@ -33,7 +33,7 @@ index 540fcce1dd..e29ec958b3 100644
      private final boolean i;
      private final boolean j;
 diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java
-index c482aad3e3..02c548dd9c 100644
+index c482aad3..02c548dd 100644
 --- a/src/main/java/net/minecraft/server/BlockBamboo.java
 +++ b/src/main/java/net/minecraft/server/BlockBamboo.java
 @@ -85,6 +85,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {
@@ -45,7 +45,7 @@ index c482aad3e3..02c548dd9c 100644
                  int i = this.b(worldserver, blockposition) + 1;
  
 diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
-index e0974e256f..3524fcb927 100644
+index e0974e25..3524fcb9 100644
 --- a/src/main/java/net/minecraft/server/BlockCactus.java
 +++ b/src/main/java/net/minecraft/server/BlockCactus.java
 @@ -21,6 +21,7 @@ public class BlockCactus extends Block {
@@ -57,7 +57,7 @@ index e0974e256f..3524fcb927 100644
  
              if (worldserver.isEmpty(blockposition1)) {
 diff --git a/src/main/java/net/minecraft/server/BlockChorusFlower.java b/src/main/java/net/minecraft/server/BlockChorusFlower.java
-index d70b52cadf..b624cf3804 100644
+index d70b52ca..b624cf38 100644
 --- a/src/main/java/net/minecraft/server/BlockChorusFlower.java
 +++ b/src/main/java/net/minecraft/server/BlockChorusFlower.java
 @@ -22,6 +22,7 @@ public class BlockChorusFlower extends Block {
@@ -69,7 +69,7 @@ index d70b52cadf..b624cf3804 100644
  
              if (worldserver.isEmpty(blockposition1) && blockposition1.getY() < 256) {
 diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
-index 55b07444e1..3bc3c5aa29 100644
+index 55b07444..3bc3c5aa 100644
 --- a/src/main/java/net/minecraft/server/BlockReed.java
 +++ b/src/main/java/net/minecraft/server/BlockReed.java
 @@ -23,6 +23,7 @@ public class BlockReed extends Block {
@@ -81,7 +81,7 @@ index 55b07444e1..3bc3c5aa29 100644
  
              for (i = 1; worldserver.getType(blockposition.down(i)).getBlock() == this; ++i) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 1b823bcc08..3d5a0f0a03 100644
+index b164ee89..81590e47 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -589,7 +589,9 @@ public class WorldServer extends World {
@@ -95,5 +95,5 @@ index 1b823bcc08..3d5a0f0a03 100644
  
                          Fluid fluid = iblockdata.getFluid();
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0403-Fix-MC-161754.patch b/Spigot-Server-Patches/0402-Fix-MC-161754.patch
similarity index 89%
rename from Spigot-Server-Patches/0403-Fix-MC-161754.patch
rename to Spigot-Server-Patches/0402-Fix-MC-161754.patch
index d104dc2ee9..64675324f0 100644
--- a/Spigot-Server-Patches/0403-Fix-MC-161754.patch
+++ b/Spigot-Server-Patches/0402-Fix-MC-161754.patch
@@ -1,4 +1,4 @@
-From 77fe3e47d075a5f2c6dac7f8006bfd5e0aa4ae12 Mon Sep 17 00:00:00 2001
+From 7e878cc51acc1dfc7b9623baf17e12afe7f0cc83 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
@@ -9,7 +9,7 @@ We can use an entity valid check since this method is invoked for
 each inventory iteraction (thanks to CB) and on player tick (vanilla).
 
 diff --git a/src/main/java/net/minecraft/server/ContainerHorse.java b/src/main/java/net/minecraft/server/ContainerHorse.java
-index c95ce0124d..18e1ae7f0a 100644
+index c95ce012..18e1ae7f 100644
 --- a/src/main/java/net/minecraft/server/ContainerHorse.java
 +++ b/src/main/java/net/minecraft/server/ContainerHorse.java
 @@ -76,7 +76,7 @@ public class ContainerHorse extends Container {
@@ -22,5 +22,5 @@ index c95ce0124d..18e1ae7f0a 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0404-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0403-Performance-improvement-for-Chunk.getEntities.patch
similarity index 93%
rename from Spigot-Server-Patches/0404-Performance-improvement-for-Chunk.getEntities.patch
rename to Spigot-Server-Patches/0403-Performance-improvement-for-Chunk.getEntities.patch
index 3b1bb587b4..3c217a74c9 100644
--- a/Spigot-Server-Patches/0404-Performance-improvement-for-Chunk.getEntities.patch
+++ b/Spigot-Server-Patches/0403-Performance-improvement-for-Chunk.getEntities.patch
@@ -1,4 +1,4 @@
-From 75355d218f600873bfd21563025d7f360756f61e Mon Sep 17 00:00:00 2001
+From f41b0d11f7ecf75465c8eb5bf49317e6dc662202 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
@@ -10,7 +10,7 @@ operation. This patch will reduce the load of plugins which for example
 implement custom moblimits and depend on Chunk.getEntities().
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 91f2066b12..9cff8b88ba 100644
+index 91f2066b..9cff8b88 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -112,14 +112,14 @@ public class CraftChunk implements Chunk {
@@ -34,5 +34,5 @@ index 91f2066b12..9cff8b88ba 100644
  
          return entities;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 93%
rename from Spigot-Server-Patches/0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to Spigot-Server-Patches/0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
index c2cfdf8b26..8386703f3e 100644
--- a/Spigot-Server-Patches/0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
+++ b/Spigot-Server-Patches/0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
@@ -1,4 +1,4 @@
-From b8d814cbd4832a8f69086c4be4805c9346c91174 Mon Sep 17 00:00:00 2001
+From 70408ce2ca2811f5033d66b2c0a510f5b21fd13a 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 1d275520fb..051506fce8 100644
+index 1d275520..051506fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1846,7 +1846,12 @@ public class CraftWorld implements World {
@@ -24,5 +24,5 @@ index 1d275520fb..051506fce8 100644
              for (BlockFace dir : faces) {
                  IBlockData nmsBlock = world.getType(pos.shift(CraftBlock.blockFaceToNotch(dir)));
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0406-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0405-Expose-the-internal-current-tick.patch
similarity index 86%
rename from Spigot-Server-Patches/0406-Expose-the-internal-current-tick.patch
rename to Spigot-Server-Patches/0405-Expose-the-internal-current-tick.patch
index 31721b6bf0..4ae182e1fb 100644
--- a/Spigot-Server-Patches/0406-Expose-the-internal-current-tick.patch
+++ b/Spigot-Server-Patches/0405-Expose-the-internal-current-tick.patch
@@ -1,11 +1,11 @@
-From ed47733c5d7d9f81a02775f62ba2403a0521307e Mon Sep 17 00:00:00 2001
+From 133c407b698373b6d9b5b679aeac485910ea6499 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0df49581fb..b9a398bc57 100644
+index 0df49581..b9a398bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2202,5 +2202,10 @@ public final class CraftServer implements Server {
@@ -20,5 +20,5 @@ index 0df49581fb..b9a398bc57 100644
      // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 91%
rename from Spigot-Server-Patches/0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to Spigot-Server-Patches/0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
index 2c62aa7e5d..0d7ce94473 100644
--- a/Spigot-Server-Patches/0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
+++ b/Spigot-Server-Patches/0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
@@ -1,11 +1,11 @@
-From ab3c0acbf1f8ad5d37e9c5ed724b31293eb46c8a Mon Sep 17 00:00:00 2001
+From 70175fafb3d228fa1e3ac420c9fc8199a0374607 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 07a2310b1..cb795aa73 100644
+index 3d0316e9..987303e3 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 07a2310b1..cb795aa73 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 0ccfd8de0..01345a62b 100644
+index 0ccfd8de..01345a62 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -716,6 +716,8 @@ public abstract class PlayerList {
@@ -31,5 +31,5 @@ index 0ccfd8de0..01345a62b 100644
          entityplayer.triggerDimensionAdvancements(((CraftWorld) fromWorld).getHandle());
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0408-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0407-Add-option-to-disable-pillager-patrols.patch
similarity index 90%
rename from Spigot-Server-Patches/0408-Add-option-to-disable-pillager-patrols.patch
rename to Spigot-Server-Patches/0407-Add-option-to-disable-pillager-patrols.patch
index 40727b3bc2..ae1df1887b 100644
--- a/Spigot-Server-Patches/0408-Add-option-to-disable-pillager-patrols.patch
+++ b/Spigot-Server-Patches/0407-Add-option-to-disable-pillager-patrols.patch
@@ -1,11 +1,11 @@
-From bca4c8d4e91d59bf919df50953f0d20c81bbce84 Mon Sep 17 00:00:00 2001
+From 5d9dfbce4ffdc4809b44ce4cb27a95deea7a1d5c 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c37a0f035d..3bbf77a8ec 100644
+index c37a0f03..3bbf77a8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -628,4 +628,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index c37a0f035d..3bbf77a8ec 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
-index 33488b37e4..a0f5828076 100644
+index 33488b37..a0f58280 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
 @@ -9,6 +9,7 @@ public class MobSpawnerPatrol {
@@ -31,5 +31,5 @@ index 33488b37e4..a0f5828076 100644
              return 0;
          } else if (!worldserver.getGameRules().getBoolean(GameRules.DO_PATROL_SPAWNING)) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 92%
rename from Spigot-Server-Patches/0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to Spigot-Server-Patches/0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index 16a7207e82..f868960b59 100644
--- a/Spigot-Server-Patches/0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/Spigot-Server-Patches/0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
@@ -1,4 +1,4 @@
-From 647617806e5119fabd4cdf467618f147868ffe40 Mon Sep 17 00:00:00 2001
+From abe0f1c6ac69176ed7035a710b704072175da151 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
@@ -7,7 +7,7 @@ Fixes an AssertionError when setting the player's item in hand to null or a new
 Fixes GH-2718
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b098cd6d77..6184cced73 100644
+index b098cd6d..6184cced 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1888,6 +1888,7 @@ public abstract class EntityLiving extends Entity {
@@ -19,7 +19,7 @@ index b098cd6d77..6184cced73 100644
          if (enumhand == EnumHand.MAIN_HAND) {
              return this.getEquipment(EnumItemSlot.MAINHAND);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f88bcb29db..108377d76e 100644
+index f88bcb29..108377d7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1430,6 +1430,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -34,5 +34,5 @@ index f88bcb29db..108377d76e 100644
              }
              // CraftBukkit end
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0410-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0409-PlayerLaunchProjectileEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0410-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0409-PlayerLaunchProjectileEvent.patch
index 5e6795cd6d..50a40421e9 100644
--- a/Spigot-Server-Patches/0410-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/0409-PlayerLaunchProjectileEvent.patch
@@ -1,11 +1,11 @@
-From f7056ab44ef4c40bef43cbdd770237fe141d1b9c Mon Sep 17 00:00:00 2001
+From 85109661ebc2568c3ba47350f014f0de559e4612 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
 
 
 diff --git a/src/main/java/net/minecraft/server/InteractionResultWrapper.java b/src/main/java/net/minecraft/server/InteractionResultWrapper.java
-index 5cab47a282..886babdcda 100644
+index 5cab47a2..886babdc 100644
 --- a/src/main/java/net/minecraft/server/InteractionResultWrapper.java
 +++ b/src/main/java/net/minecraft/server/InteractionResultWrapper.java
 @@ -10,6 +10,7 @@ public class InteractionResultWrapper<T> {
@@ -17,7 +17,7 @@ index 5cab47a282..886babdcda 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java
-index 6fccd70a03..16f1b734e0 100644
+index 6fccd70a..16f1b734 100644
 --- a/src/main/java/net/minecraft/server/ItemEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemEgg.java
 @@ -16,21 +16,35 @@ public class ItemEgg extends Item {
@@ -61,7 +61,7 @@ index 6fccd70a03..16f1b734e0 100644
          return InteractionResultWrapper.success(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java
-index cab869e8e9..b57e9f7e72 100644
+index cab869e8..b57e9f7e 100644
 --- a/src/main/java/net/minecraft/server/ItemEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java
 @@ -16,22 +16,37 @@ public class ItemEnderPearl extends Item {
@@ -113,7 +113,7 @@ index cab869e8e9..b57e9f7e72 100644
          return InteractionResultWrapper.success(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java
-index 071688b3ab..1d575af526 100644
+index 071688b3..1d575af5 100644
 --- a/src/main/java/net/minecraft/server/ItemExpBottle.java
 +++ b/src/main/java/net/minecraft/server/ItemExpBottle.java
 @@ -15,19 +15,38 @@ public class ItemExpBottle extends Item {
@@ -158,7 +158,7 @@ index 071688b3ab..1d575af526 100644
          return InteractionResultWrapper.success(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
-index c19b678cfb..7672e31fc0 100644
+index c19b678c..7672e31f 100644
 --- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 @@ -8,7 +8,11 @@ public class ItemLingeringPotion extends ItemPotionThrowable {
@@ -176,7 +176,7 @@ index c19b678cfb..7672e31fc0 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/ItemPotionThrowable.java b/src/main/java/net/minecraft/server/ItemPotionThrowable.java
-index 5d1f118c51..d1beab1ab7 100644
+index 5d1f118c..d1beab1a 100644
 --- a/src/main/java/net/minecraft/server/ItemPotionThrowable.java
 +++ b/src/main/java/net/minecraft/server/ItemPotionThrowable.java
 @@ -15,13 +15,31 @@ public class ItemPotionThrowable extends ItemPotion {
@@ -213,7 +213,7 @@ index 5d1f118c51..d1beab1ab7 100644
          return InteractionResultWrapper.success(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java
-index 56ec508959..e6044e654b 100644
+index 56ec5089..e6044e65 100644
 --- a/src/main/java/net/minecraft/server/ItemSnowball.java
 +++ b/src/main/java/net/minecraft/server/ItemSnowball.java
 @@ -17,19 +17,27 @@ public class ItemSnowball extends Item {
@@ -251,7 +251,7 @@ index 56ec508959..e6044e654b 100644
          /*
          if (!entityhuman.abilities.canInstantlyBuild) {
 diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java
-index 18bd846cee..e71e933fff 100644
+index 18bd846c..e71e933f 100644
 --- a/src/main/java/net/minecraft/server/ItemSplashPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java
 @@ -8,7 +8,11 @@ public class ItemSplashPotion extends ItemPotionThrowable {
@@ -269,5 +269,5 @@ index 18bd846cee..e71e933fff 100644
      }
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0410-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 88%
rename from Spigot-Server-Patches/0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to Spigot-Server-Patches/0410-Add-CraftMagicNumbers.isSupportedApiVersion.patch
index e087918b19..9e85c0f4a0 100644
--- a/Spigot-Server-Patches/0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/Spigot-Server-Patches/0410-Add-CraftMagicNumbers.isSupportedApiVersion.patch
@@ -1,11 +1,11 @@
-From 36e38d4d0c8fc1b3d2800a2a9ee5a68ecbaded82 Mon Sep 17 00:00:00 2001
+From 9e7d520c2f3409f7be318b7d57f67172c53d3b8d 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()
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index b1e1b59d45..770375ed42 100644
+index b1e1b59d..770375ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -308,6 +308,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -21,5 +21,5 @@ index b1e1b59d45..770375ed42 100644
  
      /**
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0411-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 91%
rename from Spigot-Server-Patches/0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to Spigot-Server-Patches/0411-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index d7e001e653..0fa4802c41 100644
--- a/Spigot-Server-Patches/0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/Spigot-Server-Patches/0411-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
@@ -1,11 +1,11 @@
-From c13102ae41fc879d4ff91d91ecf9d5bb143542d5 Mon Sep 17 00:00:00 2001
+From 08357981b4601c9f9292514f7fe5307ddbbbc34a 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
 
 
 diff --git a/src/main/java/net/minecraft/server/BehaviorSleep.java b/src/main/java/net/minecraft/server/BehaviorSleep.java
-index fa575dde19..dfe0f66500 100644
+index fa575dde..dfe0f665 100644
 --- a/src/main/java/net/minecraft/server/BehaviorSleep.java
 +++ b/src/main/java/net/minecraft/server/BehaviorSleep.java
 @@ -31,7 +31,8 @@ public class BehaviorSleep extends Behavior<EntityLiving> {
@@ -19,5 +19,5 @@ index fa575dde19..dfe0f66500 100644
                      return globalpos.getBlockPosition().a((IPosition) entityliving.getPositionVector(), 2.0D) && iblockdata.getBlock().a(TagsBlock.BEDS) && !(Boolean) iblockdata.get(BlockBed.OCCUPIED);
                  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0413-Fix-spawn-radius-being-treated-as-0.patch b/Spigot-Server-Patches/0412-Fix-spawn-radius-being-treated-as-0.patch
similarity index 90%
rename from Spigot-Server-Patches/0413-Fix-spawn-radius-being-treated-as-0.patch
rename to Spigot-Server-Patches/0412-Fix-spawn-radius-being-treated-as-0.patch
index 2e81beb7b4..068ae1d07f 100644
--- a/Spigot-Server-Patches/0413-Fix-spawn-radius-being-treated-as-0.patch
+++ b/Spigot-Server-Patches/0412-Fix-spawn-radius-being-treated-as-0.patch
@@ -1,11 +1,11 @@
-From bfdd0144274156e1434535c3a8a6ba9f73d1c4af Mon Sep 17 00:00:00 2001
+From 63cd1ffc0e7c36baf0977d742eac3a5c96af0a90 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 987303e3..f23bf8ce 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0414-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0413-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 94%
rename from Spigot-Server-Patches/0414-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to Spigot-Server-Patches/0413-MC-145656-Fix-Follow-Range-Initial-Target.patch
index f8aa22e3b0..ac25aab1f0 100644
--- a/Spigot-Server-Patches/0414-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/Spigot-Server-Patches/0413-MC-145656-Fix-Follow-Range-Initial-Target.patch
@@ -1,11 +1,11 @@
-From 72ab983023c1c81a21dad07fe7ae8d4e30e7a21b Mon Sep 17 00:00:00 2001
+From bc1304fba1e0192d58da8fb436b5623fe94e4e61 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3bbf77a8ec..f8d8cb8655 100644
+index 3bbf77a8..f8d8cb86 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -633,4 +633,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 3bbf77a8ec..f8d8cb8655 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
-index cd17bf2be5..b85e67a85d 100644
+index cd17bf2b..b85e67a8 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
 @@ -25,6 +25,7 @@ public class PathfinderGoalNearestAttackableTarget<T extends EntityLiving> exten
@@ -31,7 +31,7 @@ index cd17bf2be5..b85e67a85d 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java
-index c76a43837b..e35ec2db07 100644
+index c76a4383..e35ec2db 100644
 --- a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java
 +++ b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java
 @@ -80,7 +80,7 @@ public class PathfinderTargetCondition {
@@ -63,5 +63,5 @@ index c76a43837b..e35ec2db07 100644
 +    // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0415-Optimize-Hoppers.patch b/Spigot-Server-Patches/0414-Optimize-Hoppers.patch
similarity index 98%
rename from Spigot-Server-Patches/0415-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0414-Optimize-Hoppers.patch
index 4b776863f7..21acce06a9 100644
--- a/Spigot-Server-Patches/0415-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0414-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From 546d260be585e0ddd02d3a47101d29409d068f93 Mon Sep 17 00:00:00 2001
+From cacfeaa2e29f0014ceb10caf0fbcf3eb97c00018 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Optimize Hoppers
 * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f8d8cb8655..3b8488d3ff 100644
+index f8d8cb86..3b8488d3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -638,4 +638,13 @@ public class PaperWorldConfig {
@@ -29,7 +29,7 @@ index f8d8cb8655..3b8488d3ff 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index d953cdef14..d6e43313bf 100644
+index d953cdef..d6e43313 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -482,11 +482,12 @@ public final class ItemStack {
@@ -49,7 +49,7 @@ index d953cdef14..d6e43313bf 100644
              itemstack.d(this.C());
              if (this.tag != null) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 61fc659ed2..177d1445ad 100644
+index 61fc659e..177d1445 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1217,6 +1217,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -61,7 +61,7 @@ index 61fc659ed2..177d1445ad 100644
                  this.methodProfiler.a(() -> {
                      return worldserver.getWorldData().getName() + " " + IRegistry.DIMENSION_TYPE.getKey(worldserver.worldProvider.getDimensionManager());
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 958279249f..a8e64dfdab 100644
+index 95827924..a8e64dfd 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -62,6 +62,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -81,7 +81,7 @@ index 958279249f..a8e64dfdab 100644
              this.world.b(this.position, this);
              if (!this.c.isAir()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 907d088c86..4afd33a491 100644
+index 907d088c..4afd33a4 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -168,6 +168,160 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -307,5 +307,5 @@ index 907d088c86..4afd33a491 100644
                  flag = true;
              } else if (a(itemstack1, itemstack)) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0416-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0415-PlayerDeathEvent-shouldDropExperience.patch
similarity index 89%
rename from Spigot-Server-Patches/0416-PlayerDeathEvent-shouldDropExperience.patch
rename to Spigot-Server-Patches/0415-PlayerDeathEvent-shouldDropExperience.patch
index f31d1b53f4..52e3f3d09f 100644
--- a/Spigot-Server-Patches/0416-PlayerDeathEvent-shouldDropExperience.patch
+++ b/Spigot-Server-Patches/0415-PlayerDeathEvent-shouldDropExperience.patch
@@ -1,11 +1,11 @@
-From f69a886da46f2fe2badf02b451da3e405e2deaaa Mon Sep 17 00:00:00 2001
+From 5e96e206c4d525ade6786e7b85d7da4bbfbb8386 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 f23bf8ce..24545b33 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0416-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 89%
rename from Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to Spigot-Server-Patches/0416-Prevent-bees-loading-chunks-checking-hive-position.patch
index fa36a74fa0..7a9c7ec42e 100644
--- a/Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/Spigot-Server-Patches/0416-Prevent-bees-loading-chunks-checking-hive-position.patch
@@ -1,11 +1,11 @@
-From 21817bbd719b9c1953c02f1c73585ce7da13c7f5 Mon Sep 17 00:00:00 2001
+From 3449a78c85b6c23884a62d4c55c9c0630992410c 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
-index b39599654e..73e0162578 100644
+index b3959965..73e01625 100644
 --- a/src/main/java/net/minecraft/server/EntityBee.java
 +++ b/src/main/java/net/minecraft/server/EntityBee.java
 @@ -386,6 +386,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
@@ -17,5 +17,5 @@ index b39599654e..73e0162578 100644
  
              return tileentity != null && tileentity.getTileType() == TileEntityTypes.BEEHIVE;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0417-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 93%
rename from Spigot-Server-Patches/0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0417-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 0a6cb2d3c9..8acd51e0c8 100644
--- a/Spigot-Server-Patches/0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0417-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From b143c1419c9a9926109ad99459dd39a9b9305492 Mon Sep 17 00:00:00 2001
+From 9a4701440bf089d44c12d573f17872d8885396df 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
@@ -13,7 +13,7 @@ This of course is undesirable, so just return the loaded side as "primary"
 and treat it as a single chest if the other sides are unloaded
 
 diff --git a/src/main/java/net/minecraft/server/DoubleBlockFinder.java b/src/main/java/net/minecraft/server/DoubleBlockFinder.java
-index 3cb6e60895..7a16a3e0e2 100644
+index 3cb6e608..7a16a3e0 100644
 --- a/src/main/java/net/minecraft/server/DoubleBlockFinder.java
 +++ b/src/main/java/net/minecraft/server/DoubleBlockFinder.java
 @@ -21,8 +21,12 @@ public class DoubleBlockFinder {
@@ -32,5 +32,5 @@ index 3cb6e60895..7a16a3e0e2 100644
                      DoubleBlockFinder.BlockType doubleblockfinder_blocktype1 = (DoubleBlockFinder.BlockType) function.apply(iblockdata1);
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0419-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0418-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 96%
rename from Spigot-Server-Patches/0419-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to Spigot-Server-Patches/0418-Guard-against-serializing-mismatching-chunk-coordina.patch
index 96447aad52..d9e904986b 100644
--- a/Spigot-Server-Patches/0419-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/Spigot-Server-Patches/0418-Guard-against-serializing-mismatching-chunk-coordina.patch
@@ -1,4 +1,4 @@
-From 4b891aa3952bbe6638b3f53cfdbfac9963beade1 Mon Sep 17 00:00:00 2001
+From 5f3b4b82cea20de797b5bdd036b0644ed2ef7a82 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Guard against serializing mismatching chunk coordinate
 Should help if something dumb happens
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 26f1a4b095..4349d22cc8 100644
+index 1298a07d..57a6e7c1 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -23,6 +23,13 @@ public class ChunkRegionLoader {
@@ -35,7 +35,7 @@ index 26f1a4b095..4349d22cc8 100644
          if (!Objects.equals(chunkcoordintpair, chunkcoordintpair1)) {
              ChunkRegionLoader.LOGGER.error("Chunk file at {} is in the wrong location; relocating. (Expected {}, got {})", chunkcoordintpair, chunkcoordintpair, chunkcoordintpair1);
 diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
-index 134c76065b..25c8b131fe 100644
+index 134c7606..25c8b131 100644
 --- a/src/main/java/net/minecraft/server/IChunkLoader.java
 +++ b/src/main/java/net/minecraft/server/IChunkLoader.java
 @@ -106,6 +106,13 @@ public class IChunkLoader extends RegionFileCache implements AutoCloseable {
@@ -53,5 +53,5 @@ index 134c76065b..25c8b131fe 100644
          if (this.c != null) {
              synchronized (this.persistentDataLock) { // Paper - Async chunk loading
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0420-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0419-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 92%
rename from Spigot-Server-Patches/0420-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to Spigot-Server-Patches/0419-Optimise-IEntityAccess-getPlayerByUUID.patch
index f6fb0dccf2..236674e481 100644
--- a/Spigot-Server-Patches/0420-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/Spigot-Server-Patches/0419-Optimise-IEntityAccess-getPlayerByUUID.patch
@@ -1,4 +1,4 @@
-From c2485e31048f64dd588fb07035d07857eee9a4f9 Mon Sep 17 00:00:00 2001
+From 93f6d4bc8ce214be21ee318b7824bf04dd1af2b1 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID
 Use the world entity map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index d5c284cdd1..4157e50e4d 100644
+index d5c284cd..4157e50e 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -219,6 +219,12 @@ public interface IEntityAccess {
@@ -23,7 +23,7 @@ index d5c284cdd1..4157e50e4d 100644
              EntityHuman entityhuman = (EntityHuman) this.getPlayers().get(i);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 3d5a0f0a03..9211f996c0 100644
+index 81590e47..71f5e3ce 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -82,6 +82,15 @@ public class WorldServer extends World {
@@ -43,5 +43,5 @@ index 3d5a0f0a03..9211f996c0 100644
      public final com.destroystokyo.paper.io.PaperFileIOThread.ChunkDataController poiDataController = new com.destroystokyo.paper.io.PaperFileIOThread.ChunkDataController() {
          @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0421-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0420-Fix-items-not-falling-correctly.patch
similarity index 92%
rename from Spigot-Server-Patches/0421-Fix-items-not-falling-correctly.patch
rename to Spigot-Server-Patches/0420-Fix-items-not-falling-correctly.patch
index 022965e49f..6a6c3f925b 100644
--- a/Spigot-Server-Patches/0421-Fix-items-not-falling-correctly.patch
+++ b/Spigot-Server-Patches/0420-Fix-items-not-falling-correctly.patch
@@ -1,4 +1,4 @@
-From f2f2fa12a9451ecaa6f906dbf3fd3071b811027e Mon Sep 17 00:00:00 2001
+From dc0e3a343fb7cb36bb501364e9a65552ba2be5ac 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
@@ -15,7 +15,7 @@ This patch resolves the conflict by offsetting checking an item's
 move method from Spigot's entity activation range check.
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 507627a29f..2926fbb957 100644
+index 507627a2..2926fbb9 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -86,7 +86,7 @@ public class EntityItem extends Entity {
@@ -28,5 +28,5 @@ index 507627a29f..2926fbb957 100644
                  float f = 0.98F;
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0422-Lag-compensate-eating.patch b/Spigot-Server-Patches/0421-Lag-compensate-eating.patch
similarity index 97%
rename from Spigot-Server-Patches/0422-Lag-compensate-eating.patch
rename to Spigot-Server-Patches/0421-Lag-compensate-eating.patch
index bee19befe5..d7e758c54c 100644
--- a/Spigot-Server-Patches/0422-Lag-compensate-eating.patch
+++ b/Spigot-Server-Patches/0421-Lag-compensate-eating.patch
@@ -1,4 +1,4 @@
-From 213c82c527c37253ab7ba81bbeb47897b795286b Mon Sep 17 00:00:00 2001
+From 1db8f5989f4e84e49a289b49b080b2347d54bb62 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
@@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating.
 Change to also use a time check instead if it passes.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 6184cced73..1b9551ae09 100644
+index 6184cced..1b9551ae 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -113,7 +113,7 @@ public abstract class EntityLiving extends Entity {
@@ -83,5 +83,5 @@ index 6184cced73..1b9551ae09 100644
  
      public boolean isBlocking() {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0423-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0422-Optimize-call-to-getFluid-for-explosions.patch
similarity index 89%
rename from Spigot-Server-Patches/0423-Optimize-call-to-getFluid-for-explosions.patch
rename to Spigot-Server-Patches/0422-Optimize-call-to-getFluid-for-explosions.patch
index b60721071d..6738808501 100644
--- a/Spigot-Server-Patches/0423-Optimize-call-to-getFluid-for-explosions.patch
+++ b/Spigot-Server-Patches/0422-Optimize-call-to-getFluid-for-explosions.patch
@@ -1,11 +1,11 @@
-From 8a3dbc76f917025bdc7428312c606e3d1afac9a1 Mon Sep 17 00:00:00 2001
+From 09de5f6181db4f021d6754ae297210b3f13c46e9 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
 
 
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index d99d2defe9..a353f3d5fa 100644
+index d99d2def..a353f3d5 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -117,7 +117,7 @@ public class Explosion {
@@ -18,5 +18,5 @@ index d99d2defe9..a353f3d5fa 100644
                              if (!iblockdata.isAir() || !fluid.isEmpty()) {
                                  float f2 = Math.max(iblockdata.getBlock().getDurability(), fluid.k());
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0423-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 91%
rename from Spigot-Server-Patches/0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to Spigot-Server-Patches/0423-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index 59ab3bb7a5..2c4557c9ea 100644
--- a/Spigot-Server-Patches/0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/Spigot-Server-Patches/0423-Fix-last-firework-in-stack-not-having-effects-when-d.patch
@@ -1,4 +1,4 @@
-From 43f35bfb65ee5746781bc85d5a0e7a8578f54f17 Mon Sep 17 00:00:00 2001
+From cd6a7bb9f3d55caa170f683532f86b534176c9af 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
@@ -9,7 +9,7 @@ dispensed. The resulting item would have size == 0 and therefore
 be convertered to air, hence why the effects disappeared.
 
 diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java
-index b6b7e3c6c9..3af686c7f1 100644
+index b6b7e3c6..3af686c7 100644
 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java
 +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java
 @@ -265,7 +265,7 @@ public interface IDispenseBehavior {
@@ -22,5 +22,5 @@ index b6b7e3c6c9..3af686c7f1 100644
                  entityfireworks.shoot(d0, d1, d2, 0.5F, 1.0F);
                  isourceblock.getWorld().addEntity(entityfireworks);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0425-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0424-Activation-Range-Improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0425-Activation-Range-Improvements.patch
rename to Spigot-Server-Patches/0424-Activation-Range-Improvements.patch
index de6b28e63a..2876ecc270 100644
--- a/Spigot-Server-Patches/0425-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0424-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From 545151172cb24ae45f5eb924083e8d4088b72d57 Mon Sep 17 00:00:00 2001
+From b7cf9daeb3a69c939ac70de4b8caa88f657b88b1 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
@@ -493,5 +493,5 @@ index 5e932a5d..1b42ba94 100644
          log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Ra " + raiderActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers );
      }
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0426-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0425-Add-effect-to-block-break-naturally.patch
similarity index 92%
rename from Spigot-Server-Patches/0426-Add-effect-to-block-break-naturally.patch
rename to Spigot-Server-Patches/0425-Add-effect-to-block-break-naturally.patch
index 39a2426a48..121e9db751 100644
--- a/Spigot-Server-Patches/0426-Add-effect-to-block-break-naturally.patch
+++ b/Spigot-Server-Patches/0425-Add-effect-to-block-break-naturally.patch
@@ -1,11 +1,11 @@
-From daeb8d3e87a60e271dd268ec936ade1d59498ad5 Mon Sep 17 00:00:00 2001
+From ff7245062fb49b58b677be0b9a3c12e785392a97 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index aae818674f..a25d9d7aa1 100644
+index aae81867..a25d9d7a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -609,12 +609,20 @@ public class CraftBlock implements Block {
@@ -30,5 +30,5 @@ index aae818674f..a25d9d7aa1 100644
          }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0427-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0426-Tracking-Range-Improvements.patch
similarity index 95%
rename from Spigot-Server-Patches/0427-Tracking-Range-Improvements.patch
rename to Spigot-Server-Patches/0426-Tracking-Range-Improvements.patch
index 685c1325a7..7df4f1b635 100644
--- a/Spigot-Server-Patches/0427-Tracking-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0426-Tracking-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From 1f07c6a5d2d4635e93ac87228d4e2e3c7ea61430 Mon Sep 17 00:00:00 2001
+From e0a88576c7e8675a3d748dd802c0f2fde9be1652 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
@@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code
 Also ignores Enderdragon, defaulting it to Mojang's setting
 
 diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java
-index 6f8e6c1d07..46c33e6917 100644
+index 6f8e6c1d..46c33e69 100644
 --- a/src/main/java/org/spigotmc/TrackingRange.java
 +++ b/src/main/java/org/spigotmc/TrackingRange.java
 @@ -1,6 +1,7 @@
@@ -60,5 +60,5 @@ index 6f8e6c1d07..46c33e6917 100644
          }
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch b/Spigot-Server-Patches/0427-Fix-comparator-behavior-for-EntityPhanton-goal.patch
similarity index 88%
rename from Spigot-Server-Patches/0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch
rename to Spigot-Server-Patches/0427-Fix-comparator-behavior-for-EntityPhanton-goal.patch
index 58ac7e4fb0..95ad9f052a 100644
--- a/Spigot-Server-Patches/0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch
+++ b/Spigot-Server-Patches/0427-Fix-comparator-behavior-for-EntityPhanton-goal.patch
@@ -1,11 +1,11 @@
-From 53b723ce4574f5bd4cee02a2cceb3a5d83bcc8e8 Mon Sep 17 00:00:00 2001
+From c569fed0197bce36d4de945e5e4a3b6f257dd520 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 82323bf4ac..90eeddb1af 100644
+index 82323bf4..90eeddb1 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -224,7 +224,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -18,5 +18,5 @@ index 82323bf4ac..90eeddb1af 100644
                      Iterator iterator = list.iterator();
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0428-Fix-items-vanishing-through-end-portal.patch
similarity index 95%
rename from Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch
rename to Spigot-Server-Patches/0428-Fix-items-vanishing-through-end-portal.patch
index 5131902eac..5333a4cc01 100644
--- a/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch
+++ b/Spigot-Server-Patches/0428-Fix-items-vanishing-through-end-portal.patch
@@ -1,4 +1,4 @@
-From 7213710f407a8d44c681ea9422cd09b919499d32 Mon Sep 17 00:00:00 2001
+From 3a9f340f20027f97f530da2ec018d02dbd8d6af7 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
@@ -29,5 +29,5 @@ index 6509463e..a3306c6b 100644
                  EntityPortalEvent event = CraftEventFactory.callEntityPortalEvent(this, worldserver1, worldserver1.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, worldserver1.getSpawn()), 0);
                  if (event == null) {
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0430-Seed-based-feature-search.patch b/Spigot-Server-Patches/0429-Seed-based-feature-search.patch
similarity index 95%
rename from Spigot-Server-Patches/0430-Seed-based-feature-search.patch
rename to Spigot-Server-Patches/0429-Seed-based-feature-search.patch
index f2c4fc6d52..c4651f3520 100644
--- a/Spigot-Server-Patches/0430-Seed-based-feature-search.patch
+++ b/Spigot-Server-Patches/0429-Seed-based-feature-search.patch
@@ -1,4 +1,4 @@
-From 823b5632845b58d065f16e1c394f81f555a5ff54 Mon Sep 17 00:00:00 2001
+From 9383dd8d2a7882e4a8afd1d88d57c953b64556c4 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
@@ -15,7 +15,7 @@ changes but this should usually not happen. A config option to disable
 this improvement is added though in case that should ever be necessary.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3b8488d3ff..bce502181f 100644
+index 3b8488d3..bce50218 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -359,6 +359,12 @@ public class PaperWorldConfig {
@@ -32,7 +32,7 @@ index 3b8488d3ff..bce502181f 100644
      private void maxEntityCollision() {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
 diff --git a/src/main/java/net/minecraft/server/BiomeManager.java b/src/main/java/net/minecraft/server/BiomeManager.java
-index e96f544f12..68423645df 100644
+index e96f544f..68423645 100644
 --- a/src/main/java/net/minecraft/server/BiomeManager.java
 +++ b/src/main/java/net/minecraft/server/BiomeManager.java
 @@ -12,10 +12,12 @@ public class BiomeManager {
@@ -49,7 +49,7 @@ index e96f544f12..68423645df 100644
          return this.c.a(this.b, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this.a);
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
-index f2a19acd84..09f1308b0d 100644
+index f2a19acd..09f1308b 100644
 --- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
 +++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
 @@ -64,10 +64,12 @@ public class ChunkCoordIntPair {
@@ -66,7 +66,7 @@ index f2a19acd84..09f1308b0d 100644
          return this.z << 4;
      }
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index e8ce2ecf23..acfe732af5 100644
+index e8ce2ecf..acfe732a 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -109,6 +109,15 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
@@ -94,7 +94,7 @@ index e8ce2ecf23..acfe732af5 100644
  
      public abstract StructureGenerator.a a();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 48c75af827..79d8c7ba31 100644
+index 48c75af8..79d8c7ba 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1563,8 +1563,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -109,5 +109,5 @@ index 48c75af827..79d8c7ba31 100644
      }
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0430-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 93%
rename from Spigot-Server-Patches/0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to Spigot-Server-Patches/0430-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index da18f6ea82..9705eae1bf 100644
--- a/Spigot-Server-Patches/0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/Spigot-Server-Patches/0430-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
@@ -1,11 +1,11 @@
-From 2cacd4e68e9aabc007d3c824d5cb8a33861e9271 Mon Sep 17 00:00:00 2001
+From 8150fb3b05f49c5a58499854934147edad3504b6 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
 
 
 diff --git a/src/main/java/net/minecraft/server/ControllerMove.java b/src/main/java/net/minecraft/server/ControllerMove.java
-index 7e3671dae6..a5c4cbb67f 100644
+index 7e3671da..a5c4cbb6 100644
 --- a/src/main/java/net/minecraft/server/ControllerMove.java
 +++ b/src/main/java/net/minecraft/server/ControllerMove.java
 @@ -2,7 +2,7 @@ package net.minecraft.server;
@@ -18,7 +18,7 @@ index 7e3671dae6..a5c4cbb67f 100644
      protected double c;
      protected double d;
 diff --git a/src/main/java/net/minecraft/server/ControllerMoveFlying.java b/src/main/java/net/minecraft/server/ControllerMoveFlying.java
-index 2b6ac2eeb0..0496c0c5db 100644
+index 2b6ac2ee..0496c0c5 100644
 --- a/src/main/java/net/minecraft/server/ControllerMoveFlying.java
 +++ b/src/main/java/net/minecraft/server/ControllerMoveFlying.java
 @@ -12,7 +12,7 @@ public class ControllerMoveFlying extends ControllerMove {
@@ -31,7 +31,7 @@ index 2b6ac2eeb0..0496c0c5db 100644
              this.h = ControllerMove.Operation.WAIT;
              this.a.setNoGravity(true);
 diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
-index 73e0162578..c7d79efdf6 100644
+index 73e01625..c7d79efd 100644
 --- a/src/main/java/net/minecraft/server/EntityBee.java
 +++ b/src/main/java/net/minecraft/server/EntityBee.java
 @@ -36,7 +36,17 @@ public class EntityBee extends EntityAnimal implements EntityBird {
@@ -54,5 +54,5 @@ index 73e0162578..c7d79efdf6 100644
          this.a(PathType.WATER, -1.0F);
          this.a(PathType.COCOA, -1.0F);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0431-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to Spigot-Server-Patches/0431-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index c0517cb7e6..9ba3376399 100644
--- a/Spigot-Server-Patches/0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/Spigot-Server-Patches/0431-Optimise-getChunkAt-calls-for-loaded-chunks.patch
@@ -1,4 +1,4 @@
-From 758d8546460ee2e90a48a4cb5db6e318263a4944 Mon Sep 17 00:00:00 2001
+From b9140558ec5495e12e345e093900a1636d4cd5d5 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
@@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either,
 then unwrap it...
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index d06027438..12fa1013f 100644
+index d0602743..12fa1013 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -433,6 +433,12 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -65,7 +65,7 @@ index d06027438..12fa1013f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 79d8c7ba3..28b6c9a08 100644
+index 79d8c7ba..28b6c9a0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -259,6 +259,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -84,5 +84,5 @@ index 79d8c7ba3..28b6c9a08 100644
      }
  
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0433-Be-more-tolerant-of-invalid-attributes.patch b/Spigot-Server-Patches/0432-Be-more-tolerant-of-invalid-attributes.patch
similarity index 93%
rename from Spigot-Server-Patches/0433-Be-more-tolerant-of-invalid-attributes.patch
rename to Spigot-Server-Patches/0432-Be-more-tolerant-of-invalid-attributes.patch
index f209e6e878..f953f5767a 100644
--- a/Spigot-Server-Patches/0433-Be-more-tolerant-of-invalid-attributes.patch
+++ b/Spigot-Server-Patches/0432-Be-more-tolerant-of-invalid-attributes.patch
@@ -1,4 +1,4 @@
-From d6b478fe125e2072087f272e7defcb99aebb9ac5 Mon Sep 17 00:00:00 2001
+From 76ace9408e72934e0ae49e971ef1158721951a22 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
@@ -11,7 +11,7 @@ In a more perfect world the API would expose some way to interact with these att
 particularly flexible in this area. Perhaps this is an area for future expansion at a later time.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java
-index 77e584b129..007d28b16c 100644
+index 77e584b1..007d28b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java
 +++ b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java
 @@ -47,6 +47,12 @@ public class CraftAttributeMap implements Attributable {
@@ -28,5 +28,5 @@ index 77e584b129..007d28b16c 100644
          String descriptor = CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, split[1]); // movementSpeed -> MOVEMENT_SPEED
          String fin = generic + "_" + descriptor;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0434-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0433-Allow-overriding-the-java-version-check.patch
similarity index 88%
rename from Spigot-Server-Patches/0434-Allow-overriding-the-java-version-check.patch
rename to Spigot-Server-Patches/0433-Allow-overriding-the-java-version-check.patch
index 8487de2ab0..2152a39d2d 100644
--- a/Spigot-Server-Patches/0434-Allow-overriding-the-java-version-check.patch
+++ b/Spigot-Server-Patches/0433-Allow-overriding-the-java-version-check.patch
@@ -1,4 +1,4 @@
-From 64f6d0314b31df7ffda6e8b0e3ff8b76c7fdf7b2 Mon Sep 17 00:00:00 2001
+From 67717b1bdfa1cbbb39537fd7ff15ae9e9863cf75 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 444a6a60..cb60310e 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0435-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0434-Add-ThrownEggHatchEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0435-Add-ThrownEggHatchEvent.patch
rename to Spigot-Server-Patches/0434-Add-ThrownEggHatchEvent.patch
index b03ae43a9b..fc68e5b814 100644
--- a/Spigot-Server-Patches/0435-Add-ThrownEggHatchEvent.patch
+++ b/Spigot-Server-Patches/0434-Add-ThrownEggHatchEvent.patch
@@ -1,4 +1,4 @@
-From c80e29b93a947435c6c116a8b60761dfb581034f Mon Sep 17 00:00:00 2001
+From 9d7585cda7f97d6d1864c7676e44017fdf673849 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
@@ -7,7 +7,7 @@ Adds a new event similar to PlayerEggThrowEvent, but without the Player requirem
 (dispensers can throw eggs to hatch them, too).
 
 diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java
-index 970f9109d9..bdd82d052a 100644
+index 970f9109..bdd82d05 100644
 --- a/src/main/java/net/minecraft/server/EntityEgg.java
 +++ b/src/main/java/net/minecraft/server/EntityEgg.java
 @@ -52,6 +52,16 @@ public class EntityEgg extends EntityProjectileThrowable {
@@ -28,5 +28,5 @@ index 970f9109d9..bdd82d052a 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0436-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0435-Optimise-random-block-ticking.patch
similarity index 98%
rename from Spigot-Server-Patches/0436-Optimise-random-block-ticking.patch
rename to Spigot-Server-Patches/0435-Optimise-random-block-ticking.patch
index 0238117bf6..c89f65e28b 100644
--- a/Spigot-Server-Patches/0436-Optimise-random-block-ticking.patch
+++ b/Spigot-Server-Patches/0435-Optimise-random-block-ticking.patch
@@ -1,4 +1,4 @@
-From df3fcdaadbc825a7fcdec22805900feb109e25d6 Mon Sep 17 00:00:00 2001
+From 9cd5be8ad18822109b1121921ab8ac3b08cb475d 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
@@ -20,7 +20,7 @@ remains the same.
 
 diff --git a/src/main/java/com/destroystokyo/paper/util/math/ThreadUnsafeRandom.java b/src/main/java/com/destroystokyo/paper/util/math/ThreadUnsafeRandom.java
 new file mode 100644
-index 000000000..3edc8e52e
+index 00000000..3edc8e52
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/math/ThreadUnsafeRandom.java
 @@ -0,0 +1,46 @@
@@ -71,7 +71,7 @@ index 000000000..3edc8e52e
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index e29ec958b..e40375b67 100644
+index e29ec958..e40375b6 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -109,8 +109,8 @@ public class Block implements IMaterial {
@@ -86,7 +86,7 @@ index e29ec958b..e40375b67 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
-index 6d351f097..a44f65f40 100644
+index 6d351f09..a44f65f4 100644
 --- a/src/main/java/net/minecraft/server/BlockFluids.java
 +++ b/src/main/java/net/minecraft/server/BlockFluids.java
 @@ -27,7 +27,7 @@ public class BlockFluids extends Block implements IFluidSource {
@@ -99,7 +99,7 @@ index 6d351f097..a44f65f40 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index e76528f19..e650a2e48 100644
+index e76528f1..e650a2e4 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -450,6 +450,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -111,7 +111,7 @@ index e76528f19..e650a2e48 100644
              return this.d(baseblockposition.getX(), baseblockposition.getY(), baseblockposition.getZ());
          }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 03c25eae7..92bb009b8 100644
+index 03c25eae..92bb009b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -52,6 +52,8 @@ public class Chunk implements IChunkAccess {
@@ -154,7 +154,7 @@ index 03c25eae7..92bb009b8 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 4526527ac..8b28fb5ee 100644
+index 4526527a..8b28fb5e 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -5,12 +5,15 @@ import javax.annotation.Nullable;
@@ -259,7 +259,7 @@ index 4526527ac..8b28fb5ee 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
-index f9680b683..a61cffa3f 100644
+index f9680b68..a61cffa3 100644
 --- a/src/main/java/net/minecraft/server/DataBits.java
 +++ b/src/main/java/net/minecraft/server/DataBits.java
 @@ -127,4 +127,46 @@ public class DataBits {
@@ -310,7 +310,7 @@ index f9680b683..a61cffa3f 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 44aed6727..fa664897f 100644
+index 44aed672..fa664897 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -287,6 +287,14 @@ public class DataPaletteBlock<T> implements DataPaletteExpandable<T> {
@@ -329,7 +329,7 @@ index 44aed6727..fa664897f 100644
      public interface a<T> {
  
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index dd02cb348..b24a5100b 100644
+index dd02cb34..b24a5100 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -29,7 +29,7 @@ public class EntityTurtle extends EntityAnimal {
@@ -342,7 +342,7 @@ index dd02cb348..b24a5100b 100644
  
      public final BlockPosition getHome() { return this.es(); } // Paper - OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index de4388165..e821c236b 100644
+index de438816..e821c236 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -22,11 +22,15 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
@@ -395,7 +395,7 @@ index de4388165..e821c236b 100644
  
      public final SoundEffectType getStepSound() { return this.r(); } // Paper - OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 28b6c9a08..d554d4cf0 100644
+index 28b6c9a0..d554d4cf 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1557,10 +1557,19 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -420,7 +420,7 @@ index 28b6c9a08..d554d4cf0 100644
  
      public boolean isSavingDisabled() {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index dd4802095..b95dd3a92 100644
+index 71f5e3ce..ed41c814 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -531,6 +531,11 @@ public class WorldServer extends World {
@@ -568,5 +568,5 @@ index dd4802095..b95dd3a92 100644
  
      protected BlockPosition a(BlockPosition blockposition) {
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0437-Entity-Jump-API.patch b/Spigot-Server-Patches/0436-Entity-Jump-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0437-Entity-Jump-API.patch
rename to Spigot-Server-Patches/0436-Entity-Jump-API.patch
index 76eed20ac1..3d7f8b5f1a 100644
--- a/Spigot-Server-Patches/0437-Entity-Jump-API.patch
+++ b/Spigot-Server-Patches/0436-Entity-Jump-API.patch
@@ -1,11 +1,11 @@
-From 18d72de455e23b867f32d474c79b89b10b13e760 Mon Sep 17 00:00:00 2001
+From e46d8baca6bb86dc49303f2d5b92d794ba84b47d 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 1b9551ae..ad474500 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 cd41c80f..f50ed190 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 6de01e4f..8ffa3cb0 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0437-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 97%
rename from Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to Spigot-Server-Patches/0437-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 831077a393..6f137c8af5 100644
--- a/Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/Spigot-Server-Patches/0437-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -1,4 +1,4 @@
-From 3c1c94135f8e18ad82c0a84c32a59b0f0fb41199 Mon Sep 17 00:00:00 2001
+From aa70337f4df45eb5d3d89286423c5e5ee73ba431 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
@@ -62,5 +62,5 @@ index a3306c6b..16f2e32d 100644
                  String spawnReasonName = nbttagcompound.getString("Paper.SpawnReason");
                  try {
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0439-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0438-Make-the-GUI-graph-fancier.patch
similarity index 97%
rename from Spigot-Server-Patches/0439-Make-the-GUI-graph-fancier.patch
rename to Spigot-Server-Patches/0438-Make-the-GUI-graph-fancier.patch
index f2c70074bb..243c8e9b34 100644
--- a/Spigot-Server-Patches/0439-Make-the-GUI-graph-fancier.patch
+++ b/Spigot-Server-Patches/0438-Make-the-GUI-graph-fancier.patch
@@ -1,4 +1,4 @@
-From 6bd58858cded988e0053545cdabdf162025d64ed Mon Sep 17 00:00:00 2001
+From ee80ba57aa40c97851ea1e40c05b6890da64b8ca 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Make the GUI graph fancier
 
 diff --git a/src/main/java/com/destroystokyo/paper/gui/GraphColor.java b/src/main/java/com/destroystokyo/paper/gui/GraphColor.java
 new file mode 100644
-index 0000000000..a4e641fdcc
+index 00000000..a4e641fd
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/gui/GraphColor.java
 @@ -0,0 +1,44 @@
@@ -56,7 +56,7 @@ index 0000000000..a4e641fdcc
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/gui/GraphData.java b/src/main/java/com/destroystokyo/paper/gui/GraphData.java
 new file mode 100644
-index 0000000000..186fc72296
+index 00000000..186fc722
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/gui/GraphData.java
 @@ -0,0 +1,47 @@
@@ -109,7 +109,7 @@ index 0000000000..186fc72296
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java b/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java
 new file mode 100644
-index 0000000000..0f29ad583e
+index 00000000..0f29ad58
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java
 @@ -0,0 +1,41 @@
@@ -156,7 +156,7 @@ index 0000000000..0f29ad583e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
 new file mode 100644
-index 0000000000..e463a86a6a
+index 00000000..e463a86a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
 @@ -0,0 +1,74 @@
@@ -236,7 +236,7 @@ index 0000000000..e463a86a6a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java b/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java
 new file mode 100644
-index 0000000000..c3e54da4ab
+index 00000000..c3e54da4
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java
 @@ -0,0 +1,144 @@
@@ -385,7 +385,7 @@ index 0000000000..c3e54da4ab
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/GuiStatsComponent.java b/src/main/java/net/minecraft/server/GuiStatsComponent.java
-index c21db8e6b7..7b6e935257 100644
+index c21db8e6..7b6e9352 100644
 --- a/src/main/java/net/minecraft/server/GuiStatsComponent.java
 +++ b/src/main/java/net/minecraft/server/GuiStatsComponent.java
 @@ -12,7 +12,7 @@ import javax.swing.Timer;
@@ -398,7 +398,7 @@ index c21db8e6b7..7b6e935257 100644
      });
      private final int[] b = new int[256];
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 346664cee0..c9deaffc4a 100644
+index 177d1445..ec9ff06c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -105,7 +105,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -411,7 +411,7 @@ index 346664cee0..c9deaffc4a 100644
      private KeyPair I;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/ServerGUI.java b/src/main/java/net/minecraft/server/ServerGUI.java
-index 95561d9db4..470009fe4c 100644
+index 95561d9d..470009fe 100644
 --- a/src/main/java/net/minecraft/server/ServerGUI.java
 +++ b/src/main/java/net/minecraft/server/ServerGUI.java
 @@ -90,7 +90,7 @@ public class ServerGUI extends JComponent {
@@ -424,5 +424,5 @@ index 95561d9db4..470009fe4c 100644
          this.e.add(guistatscomponent::a);
          jpanel.add(guistatscomponent, "North");
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0440-Backport-fix-for-MC-167561.patch b/Spigot-Server-Patches/0439-Backport-fix-for-MC-167561.patch
similarity index 94%
rename from Spigot-Server-Patches/0440-Backport-fix-for-MC-167561.patch
rename to Spigot-Server-Patches/0439-Backport-fix-for-MC-167561.patch
index 183d08ed61..5ae14a9a51 100644
--- a/Spigot-Server-Patches/0440-Backport-fix-for-MC-167561.patch
+++ b/Spigot-Server-Patches/0439-Backport-fix-for-MC-167561.patch
@@ -1,11 +1,11 @@
-From 902c9f78865921d9e06e464a984700dbf8639471 Mon Sep 17 00:00:00 2001
+From aad173107b10c464df6c61e7476c2c8e72baed50 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 db15d5e0..eec1e26b 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.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0440-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 91%
rename from Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch
rename to Spigot-Server-Patches/0440-add-hand-to-BlockMultiPlaceEvent.patch
index c7b14177a9..ab807ef92c 100644
--- a/Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/Spigot-Server-Patches/0440-add-hand-to-BlockMultiPlaceEvent.patch
@@ -1,11 +1,11 @@
-From 7159e91b7362da3846bd0897d777355a27f9c4fc Mon Sep 17 00:00:00 2001
+From dedd1909c8d203d6442f0f3f08fe8b33a1ae4786 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 39ce40bd58..1f5d15bb49 100644
+index 39ce40bd..1f5d15bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -296,13 +296,18 @@ public class CraftEventFactory {
@@ -29,5 +29,5 @@ index 39ce40bd58..1f5d15bb49 100644
  
          return event;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0442-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0441-Prevent-teleporting-dead-entities.patch
similarity index 88%
rename from Spigot-Server-Patches/0442-Prevent-teleporting-dead-entities.patch
rename to Spigot-Server-Patches/0441-Prevent-teleporting-dead-entities.patch
index fdc40ea4e6..621fbc232a 100644
--- a/Spigot-Server-Patches/0442-Prevent-teleporting-dead-entities.patch
+++ b/Spigot-Server-Patches/0441-Prevent-teleporting-dead-entities.patch
@@ -1,11 +1,11 @@
-From 2cd566c1bfc56f87f20708d45bac4b5210473d75 Mon Sep 17 00:00:00 2001
+From a9b16689599113662a9e5bf20f6d89c053983170 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 108377d76e..7929fcc800 100644
+index 108377d7..7929fcc8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1209,6 +1209,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -20,5 +20,5 @@ index 108377d76e..7929fcc800 100644
          if (Float.isNaN(f)) {
              f = 0;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0443-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0442-Validate-tripwire-hook-placement-before-update.patch
similarity index 88%
rename from Spigot-Server-Patches/0443-Validate-tripwire-hook-placement-before-update.patch
rename to Spigot-Server-Patches/0442-Validate-tripwire-hook-placement-before-update.patch
index 87181519e5..4ebae9945d 100644
--- a/Spigot-Server-Patches/0443-Validate-tripwire-hook-placement-before-update.patch
+++ b/Spigot-Server-Patches/0442-Validate-tripwire-hook-placement-before-update.patch
@@ -1,11 +1,11 @@
-From be6a46dbf9ececbcf25d7b384ca2377e47ad70c5 Mon Sep 17 00:00:00 2001
+From d85ad68e211d87fbbc9aecb17ceb55341d3bad82 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
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockTripwireHook.java b/src/main/java/net/minecraft/server/BlockTripwireHook.java
-index 1b9d889af6..a5e6e94fe0 100644
+index 1b9d889a..a5e6e94f 100644
 --- a/src/main/java/net/minecraft/server/BlockTripwireHook.java
 +++ b/src/main/java/net/minecraft/server/BlockTripwireHook.java
 @@ -149,6 +149,7 @@ public class BlockTripwireHook extends Block {
@@ -17,5 +17,5 @@ index 1b9d889af6..a5e6e94fe0 100644
              if (flag1) {
                  this.a(world, blockposition, enumdirection);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0443-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 92%
rename from Spigot-Server-Patches/0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to Spigot-Server-Patches/0443-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index 8c8b377ce7..182bd539c5 100644
--- a/Spigot-Server-Patches/0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/Spigot-Server-Patches/0443-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
@@ -1,11 +1,11 @@
-From 25917aa455833a1607267e1448ad705c00a35370 Mon Sep 17 00:00:00 2001
+From ffba493d6c7cd9235d9749abf214037096fda6f6 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7d408542e7..c7cde1d0a0 100644
+index 7d408542..c7cde1d0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -415,6 +415,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 7d408542e7..c7cde1d0a0 100644
      private void bedSearchRadius() {
          bedSearchRadius = getInt("bed-search-radius", 1);
 diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
-index 2f764776b2..7f6a567760 100644
+index 2f764776..7f6a5677 100644
 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java
 +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
 @@ -221,7 +221,7 @@ public class EntityIronGolem extends EntityGolem {
@@ -34,5 +34,5 @@ index 2f764776b2..7f6a567760 100644
          } else {
              for (int i = 1; i < 3; ++i) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0445-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0444-Configurable-chance-of-villager-zombie-infection.patch
similarity index 94%
rename from Spigot-Server-Patches/0445-Configurable-chance-of-villager-zombie-infection.patch
rename to Spigot-Server-Patches/0444-Configurable-chance-of-villager-zombie-infection.patch
index 5778f4423c..8e80a4f9ff 100644
--- a/Spigot-Server-Patches/0445-Configurable-chance-of-villager-zombie-infection.patch
+++ b/Spigot-Server-Patches/0444-Configurable-chance-of-villager-zombie-infection.patch
@@ -1,4 +1,4 @@
-From 9f450f16e1e3907c45fd8b045979049fe1f083ae Mon Sep 17 00:00:00 2001
+From cb5c1174aa81400a622241a1238181de58c263f9 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
@@ -8,7 +8,7 @@ This allows you to solve an issue in vanilla behavior where:
 * On normal difficulty they will have a 50% of getting infected or dying.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c7cde1d0a0..7ca67a4aa5 100644
+index c7cde1d0..7ca67a4a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -663,4 +663,9 @@ public class PaperWorldConfig {
@@ -22,7 +22,7 @@ index c7cde1d0a0..7ca67a4aa5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 8635d4f40c..07ebc1d816 100644
+index 8635d4f4..07ebc1d8 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -455,10 +455,14 @@ public class EntityZombie extends EntityMonster {
@@ -44,5 +44,5 @@ index 8635d4f40c..07ebc1d816 100644
              EntityVillager entityvillager = (EntityVillager) entityliving;
              EntityZombieVillager entityzombievillager = (EntityZombieVillager) EntityTypes.ZOMBIE_VILLAGER.a(this.world);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0446-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0445-Optimise-Chunk-getFluid.patch
similarity index 94%
rename from Spigot-Server-Patches/0446-Optimise-Chunk-getFluid.patch
rename to Spigot-Server-Patches/0445-Optimise-Chunk-getFluid.patch
index 43d89ae8a7..1cb705b7f9 100644
--- a/Spigot-Server-Patches/0446-Optimise-Chunk-getFluid.patch
+++ b/Spigot-Server-Patches/0445-Optimise-Chunk-getFluid.patch
@@ -1,4 +1,4 @@
-From 5cb95cd02fdc6574ec956ce2277aa7d13a00c279 Mon Sep 17 00:00:00 2001
+From 5fd4592210f6d4fc991f1f24f09450472eff01fe Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 14 Jan 2020 14:59:08 -0800
 Subject: [PATCH] Optimise Chunk#getFluid
@@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it
 easier to inline due to code size
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 92bb009b8..719c6f3e7 100644
+index 92bb009b..719c6f3e 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -379,17 +379,20 @@ public class Chunk implements IChunkAccess {
@@ -48,7 +48,7 @@ index 92bb009b8..719c6f3e7 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 8b28fb5ee..426221f7c 100644
+index 8b28fb5e..426221f7 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -46,7 +46,7 @@ public class ChunkSection {
@@ -61,5 +61,5 @@ index 8b28fb5ee..426221f7c 100644
  
      public void a() {
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0447-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0446-Optimise-TickListServer-by-rewriting-it.patch
similarity index 99%
rename from Spigot-Server-Patches/0447-Optimise-TickListServer-by-rewriting-it.patch
rename to Spigot-Server-Patches/0446-Optimise-TickListServer-by-rewriting-it.patch
index 849c6d2d0b..1a43169a4a 100644
--- a/Spigot-Server-Patches/0447-Optimise-TickListServer-by-rewriting-it.patch
+++ b/Spigot-Server-Patches/0446-Optimise-TickListServer-by-rewriting-it.patch
@@ -1,4 +1,4 @@
-From 22ff60999f9a027a3174672784ff94e158629627 Mon Sep 17 00:00:00 2001
+From 7ff0fd47e2b6d042dc9f180410ac9dc1406e92d4 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 14 Feb 2020 01:24:39 -0800
 Subject: [PATCH] Optimise TickListServer by rewriting it
@@ -43,7 +43,7 @@ sets the excessive tick delay to the specified ticks (defaults to
 
 diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java
 new file mode 100644
-index 000000000..ce653f6b4
+index 00000000..ce653f6b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java
 @@ -0,0 +1,622 @@
@@ -671,7 +671,7 @@ index 000000000..ce653f6b4
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/TickListServerInterval.java b/src/main/java/com/destroystokyo/paper/server/ticklist/TickListServerInterval.java
 new file mode 100644
-index 000000000..13cf1a55a
+index 00000000..13cf1a55
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/server/ticklist/TickListServerInterval.java
 @@ -0,0 +1,41 @@
@@ -718,7 +718,7 @@ index 000000000..13cf1a55a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/set/LinkedSortedSet.java b/src/main/java/com/destroystokyo/paper/util/set/LinkedSortedSet.java
 new file mode 100644
-index 000000000..118988c39
+index 00000000..118988c3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/set/LinkedSortedSet.java
 @@ -0,0 +1,142 @@
@@ -865,7 +865,7 @@ index 000000000..118988c39
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index e650a2e48..2d07d350d 100644
+index e650a2e4..2d07d350 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -125,6 +125,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -877,7 +877,7 @@ index e650a2e48..2d07d350d 100644
          return this.b(baseblockposition.getX(), baseblockposition.getY(), baseblockposition.getZ());
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 12fa1013f..5c45756c7 100644
+index 12fa1013..5c45756c 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -198,6 +198,13 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -895,7 +895,7 @@ index 12fa1013f..5c45756c7 100644
      public ChunkProviderServer(WorldServer worldserver, File file, DataFixer datafixer, DefinedStructureManager definedstructuremanager, Executor executor, ChunkGenerator<?> chunkgenerator, int i, WorldLoadListener worldloadlistener, Supplier<WorldPersistentData> supplier) {
          this.world = worldserver;
 diff --git a/src/main/java/net/minecraft/server/NextTickListEntry.java b/src/main/java/net/minecraft/server/NextTickListEntry.java
-index 33cfeabde..2287e47d1 100644
+index 33cfeabd..2287e47d 100644
 --- a/src/main/java/net/minecraft/server/NextTickListEntry.java
 +++ b/src/main/java/net/minecraft/server/NextTickListEntry.java
 @@ -5,11 +5,13 @@ import java.util.Comparator;
@@ -966,7 +966,7 @@ index 33cfeabde..2287e47d1 100644
      public String toString() {
          return this.e + ": " + this.a + ", " + this.b + ", " + this.c + ", " + this.f;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 74e6b8b97..04b97cec2 100644
+index 74e6b8b9..04b97cec 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -477,7 +477,9 @@ public class PlayerChunk {
@@ -981,7 +981,7 @@ index 74e6b8b97..04b97cec2 100644
                  }
              });
 diff --git a/src/main/java/net/minecraft/server/StructureBoundingBox.java b/src/main/java/net/minecraft/server/StructureBoundingBox.java
-index dbb565e74..185658e23 100644
+index dbb565e7..185658e2 100644
 --- a/src/main/java/net/minecraft/server/StructureBoundingBox.java
 +++ b/src/main/java/net/minecraft/server/StructureBoundingBox.java
 @@ -4,12 +4,12 @@ import com.google.common.base.MoreObjects;
@@ -1020,7 +1020,7 @@ index dbb565e74..185658e23 100644
          return baseblockposition.getX() >= this.a && baseblockposition.getX() <= this.d && baseblockposition.getZ() >= this.c && baseblockposition.getZ() <= this.f && baseblockposition.getY() >= this.b && baseblockposition.getY() <= this.e;
      }
 diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
-index f533860bb..3f1aa5ced 100644
+index f533860b..3f1aa5ce 100644
 --- a/src/main/java/net/minecraft/server/TickListServer.java
 +++ b/src/main/java/net/minecraft/server/TickListServer.java
 @@ -42,6 +42,11 @@ public class TickListServer<T> implements TickList<T> {
@@ -1143,7 +1143,7 @@ index f533860bb..3f1aa5ced 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ed41c814a..9d35d650f 100644
+index ed41c814..9d35d650 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -170,6 +170,13 @@ public class WorldServer extends World {
@@ -1174,5 +1174,5 @@ index ed41c814a..9d35d650f 100644
          }, IRegistry.FLUID::getKey, IRegistry.FLUID::get, this::a, "Fluids"); // Paper - Timings
          this.navigators = Sets.newHashSet();
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0448-Reduce-entity-tracker-updates-on-move.patch b/Spigot-Server-Patches/0447-Reduce-entity-tracker-updates-on-move.patch
similarity index 98%
rename from Spigot-Server-Patches/0448-Reduce-entity-tracker-updates-on-move.patch
rename to Spigot-Server-Patches/0447-Reduce-entity-tracker-updates-on-move.patch
index 7e6e2fef71..7e7fb5c4d8 100644
--- a/Spigot-Server-Patches/0448-Reduce-entity-tracker-updates-on-move.patch
+++ b/Spigot-Server-Patches/0447-Reduce-entity-tracker-updates-on-move.patch
@@ -1,4 +1,4 @@
-From 0fc9d917fe39a561141036c82cca603f2640c7d0 Mon Sep 17 00:00:00 2001
+From 5372ac364bf598a98dc866d750ddba5123f3033a Mon Sep 17 00:00:00 2001
 From: froobynooby <froobynooby@froobworld.com>
 Date: Thu, 20 Feb 2020 15:50:49 +0930
 Subject: [PATCH] Reduce entity tracker updates on move
@@ -40,7 +40,7 @@ packets often show up as a major contributor to TPS loss in
 servers with large player counts
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7ca67a4aa5..e93176d8f2 100644
+index 7ca67a4a..e93176d8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -668,4 +668,9 @@ public class PaperWorldConfig {
@@ -54,7 +54,7 @@ index 7ca67a4aa5..e93176d8f2 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e7bfbc3307..43774bc9a5 100644
+index 24545b33..828ba458 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -86,6 +86,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -69,7 +69,7 @@ index e7bfbc3307..43774bc9a5 100644
      // CraftBukkit start
      public String displayName;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index f564502f81..0186ab9e40 100644
+index f564502f..0186ab9e 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -133,6 +133,39 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -209,5 +209,5 @@ index f564502f81..0186ab9e40 100644
  
              }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0449-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 97%
rename from Spigot-Server-Patches/0449-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 210fae14fb..b1de3ed6a4 100644
--- a/Spigot-Server-Patches/0449-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -1,4 +1,4 @@
-From dabf61ab5256d8b3950ee2b2cb1e37c856119e8d Mon Sep 17 00:00:00 2001
+From 7b93ea1e7e36304032f63191c067f6476d1a96d8 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sat, 1 Feb 2020 16:50:39 +0100
 Subject: [PATCH] Pillager patrol spawn settings and per player options
@@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per
 world and the world age for the start day.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e93176d8f2..659a011e97 100644
+index e93176d8..659a011e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -641,10 +641,21 @@ public class PaperWorldConfig {
@@ -36,7 +36,7 @@ index e93176d8f2..659a011e97 100644
      private void entitiesTargetWithFollowRange() {
          entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange);
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 43774bc9a5..e353d93365 100644
+index 828ba458..7e269d61 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -77,6 +77,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -48,7 +48,7 @@ index 43774bc9a5..e353d93365 100644
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
-index a0f5828076..edca6d3abd 100644
+index a0f58280..edca6d3a 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
 @@ -4,12 +4,14 @@ import java.util.Random;
@@ -128,7 +128,7 @@ index a0f5828076..edca6d3abd 100644
                              if (entityhuman.isSpectator()) {
                                  return 0;
 diff --git a/src/main/java/net/minecraft/server/StatisticWrapper.java b/src/main/java/net/minecraft/server/StatisticWrapper.java
-index 3b6034038a..9c95c0ccfc 100644
+index 3b603403..9c95c0cc 100644
 --- a/src/main/java/net/minecraft/server/StatisticWrapper.java
 +++ b/src/main/java/net/minecraft/server/StatisticWrapper.java
 @@ -27,6 +27,7 @@ public class StatisticWrapper<T> implements Iterable<Statistic<T>> {
@@ -140,5 +140,5 @@ index 3b6034038a..9c95c0ccfc 100644
          return this.a(t0, Counter.DEFAULT);
      }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0450-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch
similarity index 96%
rename from Spigot-Server-Patches/0450-Ensure-Entity-is-never-double-registered.patch
rename to Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch
index fc6e20483b..32c068fb69 100644
--- a/Spigot-Server-Patches/0450-Ensure-Entity-is-never-double-registered.patch
+++ b/Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch
@@ -1,4 +1,4 @@
-From 175f1aa581f5c3bd0f35201fcf5a5429da491b8a Mon Sep 17 00:00:00 2001
+From 3d8c3f58220937447eb6d9710b628c636c98d17a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Mar 2020 18:26:14 -0400
 Subject: [PATCH] Ensure Entity is never double registered
@@ -11,7 +11,7 @@ Vs behavior of non ticking of just overwriting state.
 We will now simply log a warning when this happens instead of crashing the server.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 16f2e32d2..9cb4e5a1e 100644
+index 16f2e32d..9cb4e5a1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -59,6 +59,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -23,7 +23,7 @@ index 16f2e32d2..9cb4e5a1e 100644
          private boolean locked = false;
          @Override
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 779da0650..a4f34293f 100644
+index 9d35d650..d239afea 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -520,6 +520,7 @@ public class WorldServer extends World {
@@ -78,5 +78,5 @@ index 779da0650..a4f34293f 100644
              if (entity instanceof EntityEnderDragon) {
                  EntityComplexPart[] aentitycomplexpart = ((EntityEnderDragon) entity).eo();
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0451-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch
similarity index 92%
rename from Spigot-Server-Patches/0451-Fix-unregistering-entities-from-unloading-chunks.patch
rename to Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch
index 6cd6d49e84..5791ddf56b 100644
--- a/Spigot-Server-Patches/0451-Fix-unregistering-entities-from-unloading-chunks.patch
+++ b/Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch
@@ -1,4 +1,4 @@
-From 98db760202074db2a46203553e963cc97f3a4d1e Mon Sep 17 00:00:00 2001
+From f285d3fdf296a363f5a1aad7871a095a98ca9943 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 Mar 2020 03:01:45 -0400
 Subject: [PATCH] Fix unregistering entities from unloading chunks
@@ -15,7 +15,7 @@ Combine that with a buggy detail of the previous implementation of
 the Dupe UUID patch, then this was the likely source of the "Ghost entities"
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a4f34293f..22e8eca96 100644
+index d239afea..a9cb5245 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1498,9 +1498,9 @@ public class WorldServer extends World {
@@ -31,5 +31,5 @@ index a4f34293f..22e8eca96 100644
          }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0452-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 90%
rename from Spigot-Server-Patches/0452-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index 885b540617..c5a5c26a9b 100644
--- a/Spigot-Server-Patches/0452-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch
@@ -1,4 +1,4 @@
-From 40d7404c77c19e8716c0f775cec4e0a62def396a Mon Sep 17 00:00:00 2001
+From 96ff6b7f532c38d3472ef02ad178351fa76195d7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 Mar 2020 03:50:42 -0400
 Subject: [PATCH] Remote Connections shouldn't hold up shutdown
@@ -6,7 +6,7 @@ Subject: [PATCH] Remote Connections shouldn't hold up shutdown
 Bugs in the connection logic appears to leave stale connections even, preventing shutdown
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 349a0ea213..1ef7890da5 100644
+index 349a0ea2..1ef7890d 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -415,11 +415,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -24,5 +24,5 @@ index 349a0ea213..1ef7890da5 100644
  
          System.exit(0); // CraftBukkit
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0453-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 95%
rename from Spigot-Server-Patches/0453-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index aafa752d4e..0df39c2fae 100644
--- a/Spigot-Server-Patches/0453-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch
@@ -1,11 +1,11 @@
-From 310aae79b405e0a6edf082650ab962e78ea49419 Mon Sep 17 00:00:00 2001
+From 170e421a60923a30f605ff7e963da9a2e6a018dd Mon Sep 17 00:00:00 2001
 From: chickeneer <Paperchickeneer@gmail.com>
 Date: Tue, 17 Mar 2020 14:18:50 -0500
 Subject: [PATCH] Do not allow bees to load chunks for beehives
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
-index c7d79efdf6..dd1d246aeb 100644
+index c7d79efd..dd1d246a 100644
 --- a/src/main/java/net/minecraft/server/EntityBee.java
 +++ b/src/main/java/net/minecraft/server/EntityBee.java
 @@ -315,6 +315,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
@@ -41,5 +41,5 @@ index c7d79efdf6..dd1d246aeb 100644
  
              if (tileentity instanceof TileEntityBeehive) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0454-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 94%
rename from Spigot-Server-Patches/0454-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 0f24ccb891..af1313a9bb 100644
--- a/Spigot-Server-Patches/0454-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -1,4 +1,4 @@
-From 2a83e08228511b66dd7351982268256bdc40ef46 Mon Sep 17 00:00:00 2001
+From a3fc9acd793ff194a4a64945d08799f360af077d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 01:42:39 -0400
 Subject: [PATCH] Prevent Double PlayerChunkMap adds crashing server
@@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding
 Stack will identify any causer of this and warn instead of crashing.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 0186ab9e4..e1e4ea793 100644
+index 0186ab9e..e1e4ea79 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1484,6 +1484,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -26,7 +26,7 @@ index 0186ab9e4..e1e4ea793 100644
              if (!(entity instanceof EntityLightning)) {
                  EntityTypes<?> entitytypes = entity.getEntityType();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 22e8eca96..1f97e3f23 100644
+index a9cb5245..969c6aad 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1464,7 +1464,7 @@ public class WorldServer extends World {
@@ -47,5 +47,5 @@ index 22e8eca96..1f97e3f23 100644
              if (entity.origin == null) {
                  entity.origin = entity.getBukkitEntity().getLocation();
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0455-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch b/Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
similarity index 94%
rename from Spigot-Server-Patches/0455-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
rename to Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
index 03553e083d..f2ba7aa55b 100644
--- a/Spigot-Server-Patches/0455-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
+++ b/Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
@@ -1,4 +1,4 @@
-From 9cbd4431e864f4aec5b27d1a38170ac38cb58f49 Mon Sep 17 00:00:00 2001
+From a56120c2a391adb9f33f16ba182c59660359e064 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 02:37:57 -0400
 Subject: [PATCH] Optimize Collision Chunk lookup and avoid loading far chunks
@@ -10,7 +10,7 @@ The collision code takes an AABB and generates a cuboid of checks rather
 than a cylinder, so at high velocity this can generate a lot of chunk checks.
 
 diff --git a/src/main/java/net/minecraft/server/ICollisionAccess.java b/src/main/java/net/minecraft/server/ICollisionAccess.java
-index f851ed11df..d154487294 100644
+index f851ed11..d1544872 100644
 --- a/src/main/java/net/minecraft/server/ICollisionAccess.java
 +++ b/src/main/java/net/minecraft/server/ICollisionAccess.java
 @@ -83,15 +83,19 @@ public interface ICollisionAccess extends IBlockAccess {
@@ -38,5 +38,5 @@ index f851ed11df..d154487294 100644
                          if (iblockaccess != null) {
                              blockposition_mutableblockposition.d(k1, l1, i2);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0456-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch
similarity index 89%
rename from Spigot-Server-Patches/0456-Don-t-tick-dead-players.patch
rename to Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch
index 7d3a00d9ce..31092ef520 100644
--- a/Spigot-Server-Patches/0456-Don-t-tick-dead-players.patch
+++ b/Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch
@@ -1,4 +1,4 @@
-From a67f9741d7c7d35f3408b12b30eebfe2383a2173 Mon Sep 17 00:00:00 2001
+From 7533a289cfe70bfcc97a6c596cedd91e5a0889df Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 17:16:48 -0400
 Subject: [PATCH] Don't tick dead players
@@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e353d93365..f44825090f 100644
+index 7e269d61..94b096f2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -433,7 +433,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -20,5 +20,5 @@ index e353d93365..f44825090f 100644
              }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0457-Dead-Player-s-shouldn-t-be-able-to-move.patch b/Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 88%
rename from Spigot-Server-Patches/0457-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch
index c5706e55b0..6d4f97cda6 100644
--- a/Spigot-Server-Patches/0457-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch
@@ -1,4 +1,4 @@
-From 9c3bb8f984d90d1cd524373bd6da84595fc401d9 Mon Sep 17 00:00:00 2001
+From 2fc6a06f92ce8fc68f5ac9ad35c7e9b30f9ec8a4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 19:31:16 -0400
 Subject: [PATCH] Dead Player's shouldn't be able to move
@@ -7,7 +7,7 @@ This fixes a lot of game state issues where packets were delayed for processing
 due to 1.15's new queue but processed while dead.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 584166f225..7afcde608e 100644
+index 584166f2..7afcde60 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -978,7 +978,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -20,5 +20,5 @@ index 584166f225..7afcde608e 100644
  
      @Override
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0458-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 98%
rename from Spigot-Server-Patches/0458-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
index 94fe53df70..38103ac387 100644
--- a/Spigot-Server-Patches/0458-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
+++ b/Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
@@ -1,4 +1,4 @@
-From 19185f409ba9b22100845c12555e2dd046280aec Mon Sep 17 00:00:00 2001
+From 360f5da781c580a4cf0dcc1b7638318df8fba3b8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 8 Apr 2020 03:06:30 -0400
 Subject: [PATCH] Optimize PlayerChunkMap memory use for visibleChunks
@@ -13,7 +13,7 @@ This should result in siginificant memory use reduction and improved GC behavior
 
 diff --git a/src/main/java/com/destroystokyo/paper/util/map/Long2ObjectLinkedOpenHashMapFastCopy.java b/src/main/java/com/destroystokyo/paper/util/map/Long2ObjectLinkedOpenHashMapFastCopy.java
 new file mode 100644
-index 000000000..e0ad725b2
+index 00000000..e0ad725b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/map/Long2ObjectLinkedOpenHashMapFastCopy.java
 @@ -0,0 +1,32 @@
@@ -50,7 +50,7 @@ index 000000000..e0ad725b2
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 5c45756c7..1c0a7f402 100644
+index 5c45756c..1c0a7f40 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -748,7 +748,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -63,7 +63,7 @@ index 5c45756c7..1c0a7f402 100644
  
                  if (optional.isPresent()) {
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index d9941b38c..71ab65e00 100644
+index d9941b38..71ab65e0 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -529,7 +529,7 @@ public final class MCUtil {
@@ -76,7 +76,7 @@ index d9941b38c..71ab65e00 100644
              List<PlayerChunk> allChunks = new ArrayList<>(visibleChunks.values());
              List<EntityPlayer> players = world.players;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index e1e4ea793..e61ddeb1f 100644
+index e1e4ea79..e61ddeb1 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -55,8 +55,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -213,7 +213,7 @@ index e1e4ea793..e61ddeb1f 100644
          while (objectbidirectionaliterator.hasNext()) {
              Entry<PlayerChunk> entry = (Entry) objectbidirectionaliterator.next();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 051506fce..630d6470a 100644
+index 051506fc..630d6470 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -74,6 +74,7 @@ import net.minecraft.server.GameRules;
@@ -271,5 +271,5 @@ index 051506fce..630d6470a 100644
          return chunks.values().stream().map(PlayerChunk::getFullChunk).filter(Objects::nonNull).map(net.minecraft.server.Chunk::getBukkitChunk).toArray(Chunk[]::new);
      }
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0459-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch b/Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
similarity index 93%
rename from Spigot-Server-Patches/0459-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
rename to Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
index 34c9e4a9c3..44dd1a4449 100644
--- a/Spigot-Server-Patches/0459-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
+++ b/Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
@@ -1,4 +1,4 @@
-From b4cee43a0e0e462c614612c41e7154d2ec56703a Mon Sep 17 00:00:00 2001
+From d920ecb1880d7a257ef02320820c67c10ce19722 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 8 Apr 2020 21:07:08 -0400
 Subject: [PATCH] Don't load chunks when attempting to unload a chunk
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't load chunks when attempting to unload a chunk
 Big Brain Logic
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 630d6470a4..1fbb1344fc 100644
+index 630d6470..1fbb1344 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -471,7 +471,7 @@ public class CraftWorld implements World {
@@ -28,5 +28,5 @@ index 630d6470a4..1fbb1344fc 100644
              return true;
          }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0460-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch
similarity index 92%
rename from Spigot-Server-Patches/0460-Increase-Light-Queue-Size.patch
rename to Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch
index b2e2fbf0dc..ac8efe3f66 100644
--- a/Spigot-Server-Patches/0460-Increase-Light-Queue-Size.patch
+++ b/Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch
@@ -1,4 +1,4 @@
-From 0c8abbef973ff237353efdbb1d21a8c66eac9fd3 Mon Sep 17 00:00:00 2001
+From 7fc3596271b060da1b9ea1c95c376b121cd52aa6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 8 Apr 2020 21:24:05 -0400
 Subject: [PATCH] Increase Light Queue Size
@@ -14,7 +14,7 @@ light engine on shutdown...
 The queue size only puts a cap on max loss, doesn't solve that problem.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 659a011e97..88a45e517c 100644
+index 659a011e..88a45e51 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -684,4 +684,9 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index 659a011e97..88a45e517c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ec9ff06cf5..e35bacac71 100644
+index ec9ff06c..e35bacac 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -637,7 +637,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -41,5 +41,5 @@ index ec9ff06cf5..e35bacac71 100644
          // CraftBukkit start
          this.forceTicks = false;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0461-Speed-up-processing-of-chunk-loads-and-generation.patch b/Spigot-Server-Patches/0460-Speed-up-processing-of-chunk-loads-and-generation.patch
similarity index 97%
rename from Spigot-Server-Patches/0461-Speed-up-processing-of-chunk-loads-and-generation.patch
rename to Spigot-Server-Patches/0460-Speed-up-processing-of-chunk-loads-and-generation.patch
index e6e54eaa32..ec2e600be7 100644
--- a/Spigot-Server-Patches/0461-Speed-up-processing-of-chunk-loads-and-generation.patch
+++ b/Spigot-Server-Patches/0460-Speed-up-processing-of-chunk-loads-and-generation.patch
@@ -1,4 +1,4 @@
-From 402cb862f7c90839d16facd19e65005f1c9452df Mon Sep 17 00:00:00 2001
+From 7014d349d3e52fe0aa58f9d2b6b72d2675396332 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 9 Apr 2020 00:09:26 -0400
 Subject: [PATCH] Speed up processing of chunk loads and generation
@@ -33,7 +33,7 @@ In a view distance of 15, chunk loading performance was visually faster on the c
 Flying at high speed in spectator mode was able to keep up with chunk loading (as long as they are already generated)
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
-index 69e26a826..434833d50 100644
+index 69e26a82..434833d5 100644
 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -13,6 +13,7 @@ import java.util.Map;
@@ -45,7 +45,7 @@ index 69e26a826..434833d50 100644
      public static final Timing commandFunctionsTimer = Timings.ofSafe("Command Functions");
      public static final Timing connectionTimer = Timings.ofSafe("Connection Handler");
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 1c0a7f402..4af75a954 100644
+index 1c0a7f40..4af75a95 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -681,6 +681,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -121,7 +121,7 @@ index 1c0a7f402..4af75a954 100644
          protected boolean executeNext() {
          // CraftBukkit start - process pending Chunk loadCallback() and unloadCallback() after each run task
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e35bacac7..2f424e6e8 100644
+index e35bacac..2f424e6e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -907,6 +907,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -163,7 +163,7 @@ index e35bacac7..2f424e6e8 100644
      protected TickTask postToMainThread(Runnable runnable) {
          return new TickTask(this.ticks, runnable);
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index e61ddeb1f..92c9ab43d 100644
+index e61ddeb1..92c9ab43 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -793,7 +793,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -176,7 +176,7 @@ index e61ddeb1f..92c9ab43d 100644
              });
          };
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 969c6aadf..4b9b79a99 100644
+index 969c6aad..4b9b79a9 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -420,6 +420,7 @@ public class WorldServer extends World {
@@ -214,5 +214,5 @@ index 969c6aadf..4b9b79a99 100644
  
          gameprofilerfiller.exit();
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0462-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0461-Don-t-move-existing-players-to-world-spawn.patch
similarity index 95%
rename from Spigot-Server-Patches/0462-Don-t-move-existing-players-to-world-spawn.patch
rename to Spigot-Server-Patches/0461-Don-t-move-existing-players-to-world-spawn.patch
index 1ec2f9b197..304d86888b 100644
--- a/Spigot-Server-Patches/0462-Don-t-move-existing-players-to-world-spawn.patch
+++ b/Spigot-Server-Patches/0461-Don-t-move-existing-players-to-world-spawn.patch
@@ -1,4 +1,4 @@
-From cd3141f70b485987b353d976c2e10a2d662b4d42 Mon Sep 17 00:00:00 2001
+From e1ca654b67622a81e9d330da55f197bc194832a4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 9 Apr 2020 21:20:33 -0400
 Subject: [PATCH] Don't move existing players to world spawn
@@ -10,7 +10,7 @@ larger than the keep loaded range.
 By skipping this, we avoid potential for a large spike on server start.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f44825090..4625d11a1 100644
+index 94b096f2..d16f3880 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -118,7 +118,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -40,7 +40,7 @@ index f44825090..4625d11a1 100644
          this.dimension = ((WorldServer) this.world).getWorldProvider().getDimensionManager();
          this.playerInteractManager.a((WorldServer) world);
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 01345a62b..dfe625157 100644
+index 01345a62..dfe62515 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -108,6 +108,7 @@ public abstract class PlayerList {
@@ -52,5 +52,5 @@ index 01345a62b..dfe625157 100644
  
          entityplayer.spawnIn(worldserver);
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0463-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch
similarity index 96%
rename from Spigot-Server-Patches/0463-Add-tick-times-API-and-mspt-command.patch
rename to Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch
index 88d07fcbe6..d3a8e12b2e 100644
--- a/Spigot-Server-Patches/0463-Add-tick-times-API-and-mspt-command.patch
+++ b/Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch
@@ -1,4 +1,4 @@
-From 615bae83b2f06de53422fa37aec5ffcbb0cf6557 Mon Sep 17 00:00:00 2001
+From 048cb4331912704eb3734c0389859539b5dcba26 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 5 Apr 2020 22:23:14 -0500
 Subject: [PATCH] Add tick times API and /mspt command
@@ -6,7 +6,7 @@ Subject: [PATCH] Add tick times API and /mspt command
 
 diff --git a/src/main/java/com/destroystokyo/paper/MSPTCommand.java b/src/main/java/com/destroystokyo/paper/MSPTCommand.java
 new file mode 100644
-index 0000000000..d0211d4f39
+index 00000000..d0211d4f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MSPTCommand.java
 @@ -0,0 +1,64 @@
@@ -75,7 +75,7 @@ index 0000000000..d0211d4f39
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6916ed30c4..1c4cd36351 100644
+index 6916ed30..1c4cd363 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -70,6 +70,7 @@ public class PaperConfig {
@@ -87,7 +87,7 @@ index 6916ed30c4..1c4cd36351 100644
          version = getInt("config-version", 20);
          set("config-version", 20);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2f424e6e8b..7bfadb35d2 100644
+index 2f424e6e..7bfadb35 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -106,6 +106,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -147,7 +147,7 @@ index 2f424e6e8b..7bfadb35d2 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b9a398bc57..53b71b7915 100644
+index b9a398bc..53b71b79 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2052,6 +2052,16 @@ public final class CraftServer implements Server {
@@ -168,5 +168,5 @@ index b9a398bc57..53b71b7915 100644
  
      private final Spigot spigot = new Spigot()
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0464-Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/0463-Expose-MinecraftServer-isRunning.patch
similarity index 88%
rename from Spigot-Server-Patches/0464-Expose-MinecraftServer-isRunning.patch
rename to Spigot-Server-Patches/0463-Expose-MinecraftServer-isRunning.patch
index 545f20e887..096b58c39f 100644
--- a/Spigot-Server-Patches/0464-Expose-MinecraftServer-isRunning.patch
+++ b/Spigot-Server-Patches/0463-Expose-MinecraftServer-isRunning.patch
@@ -1,4 +1,4 @@
-From 74bded28475f71d83b3c303911693a17b678b4c8 Mon Sep 17 00:00:00 2001
+From f8911e9e778ab7c9639dde796cdb7e18bbc48034 Mon Sep 17 00:00:00 2001
 From: JRoy <joshroy126@gmail.com>
 Date: Fri, 10 Apr 2020 21:24:12 -0400
 Subject: [PATCH] Expose MinecraftServer#isRunning
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 53b71b7915..8cc0f66ce5 100644
+index 53b71b79..8cc0f66c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2217,5 +2217,10 @@ public final class CraftServer implements Server {
@@ -21,5 +21,5 @@ index 53b71b7915..8cc0f66ce5 100644
      // Paper end
  }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0465-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch b/Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
similarity index 98%
rename from Spigot-Server-Patches/0465-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
rename to Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
index 894d87298d..7cb695b757 100644
--- a/Spigot-Server-Patches/0465-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
+++ b/Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
@@ -1,4 +1,4 @@
-From 55e3f456cb8b3797ffcf5eceb57ffb64f4193407 Mon Sep 17 00:00:00 2001
+From d3f69fdacc40bcebc991188160a9d2508277bd5e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 11 Apr 2020 03:56:07 -0400
 Subject: [PATCH] Implement Chunk Priority / Urgency System for World Gen
@@ -16,7 +16,7 @@ lots of chunks already.
 This massively reduces the lag spikes from sync chunk gens.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 4af75a954..8d4b227ef 100644
+index 4af75a95..8d4b227e 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -306,6 +306,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -59,7 +59,7 @@ index 4af75a954..8d4b227ef 100644
                  return ichunkaccess1;
              }, (playerchunk_failure) -> {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 04b97cec2..568fbbd5f 100644
+index 04b97cec..568fbbd5 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -43,6 +43,111 @@ public class PlayerChunk {
@@ -197,7 +197,7 @@ index 04b97cec2..568fbbd5f 100644
  
      private void d(int i) {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 92c9ab43d..c38d31faf 100644
+index 92c9ab43..c38d31fa 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -324,6 +324,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -280,5 +280,5 @@ index 92c9ab43d..c38d31faf 100644
              return either.flatMap((list) -> {
                  Chunk chunk = (Chunk) list.get(list.size() / 2);
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0466-Remove-streams-from-Mob-AI-System.patch b/Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch
similarity index 98%
rename from Spigot-Server-Patches/0466-Remove-streams-from-Mob-AI-System.patch
rename to Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch
index 56f695fefc..b4a4f435b5 100644
--- a/Spigot-Server-Patches/0466-Remove-streams-from-Mob-AI-System.patch
+++ b/Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch
@@ -1,4 +1,4 @@
-From a8fd3e2cf63e7e90ff0a8b6ee253b067fcf606f2 Mon Sep 17 00:00:00 2001
+From 1591a88c30094f7de7f93f17b9d14e96daa63ca3 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Mon, 6 Apr 2020 17:53:29 -0700
 Subject: [PATCH] Remove streams from Mob AI System
@@ -10,7 +10,7 @@ Also optimise the stream.anyMatch statement to move to a bitset
 where we can replace the call with a single bitwise operation.
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index bdb90a3466..134f7d0013 100644
+index bdb90a34..134f7d00 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -1,10 +1,11 @@
@@ -52,7 +52,7 @@ index bdb90a3466..134f7d0013 100644
  
      public static enum Type {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-index 935136771e..90319909e5 100644
+index 93513677..90319909 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 @@ -1,8 +1,10 @@
@@ -230,7 +230,7 @@ index 935136771e..90319909e5 100644
  
      public void a(PathfinderGoal.Type pathfindergoal_type, boolean flag) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
-index 29657fed75..1b800c558f 100644
+index 29657fed..1b800c55 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 @@ -59,9 +59,10 @@ public class PathfinderGoalWrapped extends PathfinderGoal {
@@ -248,5 +248,5 @@ index 29657fed75..1b800c558f 100644
  
      public boolean isRunning() { return this.g(); } // Paper - OBFHELPER
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0467-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch b/Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
similarity index 94%
rename from Spigot-Server-Patches/0467-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
rename to Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
index a70f685ea3..f63b05e419 100644
--- a/Spigot-Server-Patches/0467-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
+++ b/Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
@@ -1,4 +1,4 @@
-From 659e3b03a4d6f5e691a516535bbff7b8bf52aba4 Mon Sep 17 00:00:00 2001
+From 958960ca7b7f0a32d86b5ace9f13002da7eede33 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 11 Apr 2020 21:23:42 -0400
 Subject: [PATCH] Delay unsafe actions until after entity ticking is done
@@ -6,7 +6,7 @@ Subject: [PATCH] Delay unsafe actions until after entity ticking is done
 This will help prevent many cases of unregistering entities during entity ticking
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index cd8266f675..84a3367b87 100644
+index 4b9b79a9..9e9a1b2a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -60,6 +60,16 @@ public class WorldServer extends World {
@@ -44,7 +44,7 @@ index cd8266f675..84a3367b87 100644
  
              try (co.aikar.timings.Timing ignored = this.timings.newEntities.startTiming()) { // Paper - timings
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1fbb1344fc..f56131e3a5 100644
+index 1fbb1344..f56131e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2469,7 +2469,7 @@ public class CraftWorld implements World {
@@ -57,5 +57,5 @@ index 1fbb1344fc..f56131e3a5 100644
  
          return ret;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0468-Async-command-map-building.patch b/Spigot-Server-Patches/0467-Async-command-map-building.patch
similarity index 94%
rename from Spigot-Server-Patches/0468-Async-command-map-building.patch
rename to Spigot-Server-Patches/0467-Async-command-map-building.patch
index 4698acfb47..e5f0e846cf 100644
--- a/Spigot-Server-Patches/0468-Async-command-map-building.patch
+++ b/Spigot-Server-Patches/0467-Async-command-map-building.patch
@@ -1,11 +1,11 @@
-From cfe71cd50f913752bbd30d929ebdbe357d56e662 Mon Sep 17 00:00:00 2001
+From 78ca70e7313f5418ad4888809d113310b853b4d6 Mon Sep 17 00:00:00 2001
 From: Callahan <mr.callahhh@gmail.com>
 Date: Wed, 8 Apr 2020 02:42:14 -0500
 Subject: [PATCH] Async command map building
 
 
 diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
-index 37b1a7947..2414b0a55 100644
+index 37b1a794..2414b0a5 100644
 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
 @@ -241,6 +241,14 @@ public class CommandDispatcher {
@@ -39,5 +39,5 @@ index 37b1a7947..2414b0a55 100644
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0469-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch b/Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch
similarity index 97%
rename from Spigot-Server-Patches/0469-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch
rename to Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch
index 7bd4c3630c..2994e3da8d 100644
--- a/Spigot-Server-Patches/0469-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch
+++ b/Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch
@@ -1,4 +1,4 @@
-From 95eac2f1475ec091399003f01f8c522de056ae7e Mon Sep 17 00:00:00 2001
+From f654ac6449eed39bcdfddca723938f7073e24d6d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 12 Apr 2020 15:50:48 -0400
 Subject: [PATCH] Forced Watchdog Crash support and Improve Async Shutdown
@@ -36,7 +36,7 @@ We have to ensure Thread Death propagates correctly though to stop main complete
 This is to ensure that if main isn't truely stuck, it's not manipulating state we are trying to save.
 
 diff --git a/src/main/java/net/minecraft/server/CrashReport.java b/src/main/java/net/minecraft/server/CrashReport.java
-index 3de19c998b..c7dc8787cc 100644
+index 3de19c99..c7dc8787 100644
 --- a/src/main/java/net/minecraft/server/CrashReport.java
 +++ b/src/main/java/net/minecraft/server/CrashReport.java
 @@ -257,6 +257,7 @@ public class CrashReport {
@@ -48,7 +48,7 @@ index 3de19c998b..c7dc8787cc 100644
              throwable = throwable.getCause();
          }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 1ef7890da5..e62ca0543f 100644
+index 1ef7890d..e62ca054 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -750,7 +750,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -61,7 +61,7 @@ index 1ef7890da5..e62ca0543f 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7bfadb35d2..99bc8da370 100644
+index 7bfadb35..99bc8da3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -144,6 +144,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -167,7 +167,7 @@ index 7bfadb35d2..99bc8da370 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index dfe6251576..160476fa29 100644
+index dfe62515..160476fa 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -398,7 +398,7 @@ public abstract class PlayerList {
@@ -180,7 +180,7 @@ index dfe6251576..160476fa29 100644
  
          // Paper start - Remove from collideRule team if needed
 diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
-index dc6d030621..bc8b904660 100644
+index dc6d0306..bc8b9046 100644
 --- a/src/main/java/net/minecraft/server/SystemUtils.java
 +++ b/src/main/java/net/minecraft/server/SystemUtils.java
 @@ -109,6 +109,7 @@ public class SystemUtils {
@@ -192,7 +192,7 @@ index dc6d030621..bc8b904660 100644
          SystemUtils.c.shutdown();
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d554d4cf0f..46e19d916c 100644
+index d554d4cf..46e19d91 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -786,6 +786,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -212,7 +212,7 @@ index d554d4cf0f..46e19d916c 100644
              String msg = "Entity threw exception at " + entity.world.getWorld().getName() + ":" + entity.locX() + "," + entity.locY() + "," + entity.locZ();
              System.err.println(msg);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8cc0f66ce5..dcc44be613 100644
+index 8cc0f66c..dcc44be6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1705,7 +1705,7 @@ public final class CraftServer implements Server {
@@ -225,7 +225,7 @@ index 8cc0f66ce5..dcc44be613 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 449e99d1b6..899a525209 100644
+index 449e99d1..899a5252 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -12,12 +12,25 @@ public class ServerShutdownThread extends Thread {
@@ -256,7 +256,7 @@ index 449e99d1b6..899a525209 100644
              }
          }
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index aefea3a9a8..123de5ac90 100644
+index aefea3a9..123de5ac 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -139,7 +139,7 @@ public class RestartCommand extends Command
@@ -269,7 +269,7 @@ index aefea3a9a8..123de5ac90 100644
          String[] split = restartScript.split( " " );
          if ( split.length > 0 && new File( split[0] ).isFile() )
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 5bdcdcf9e8..acc880c7c7 100644
+index 5bdcdcf9..acc880c7 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -67,12 +67,13 @@ public class WatchdogThread extends Thread
@@ -326,5 +326,5 @@ index 5bdcdcf9e8..acc880c7c7 100644
                  break;
                  } // Paper end
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0470-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0469-Optimize-Pathfinding.patch
similarity index 94%
rename from Spigot-Server-Patches/0470-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0469-Optimize-Pathfinding.patch
index fe458977f5..e775fb96e6 100644
--- a/Spigot-Server-Patches/0470-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0469-Optimize-Pathfinding.patch
@@ -1,4 +1,4 @@
-From 04f3b8b466c40eae1a435e09bfdcd6f11994aa7e Mon Sep 17 00:00:00 2001
+From c991ef4d5a27707d1c2046838c774b3b4bdbe3e6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding
@@ -7,7 +7,7 @@ Prevents pathfinding from spamming failures for things such as
 arrow attacks.
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index f06764973..dc32107ec 100644
+index f0676497..dc32107e 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -11,7 +11,7 @@ public abstract class NavigationAbstract {
@@ -52,5 +52,5 @@ index f06764973..dc32107ec 100644
  
      public boolean setDestination(@Nullable PathEntity pathentity, double speed) { return a(pathentity, speed); } // Paper - OBFHELPER
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0471-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch b/Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
similarity index 98%
rename from Spigot-Server-Patches/0471-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
rename to Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
index 73b07e48b9..053592348d 100644
--- a/Spigot-Server-Patches/0471-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
+++ b/Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
@@ -1,11 +1,11 @@
-From 167e72427fbd9d69884047a7fd62c3f0ca69fdf1 Mon Sep 17 00:00:00 2001
+From ca75ee6547a42395d8303bf5aa56520d0956676e Mon Sep 17 00:00:00 2001
 From: Callahan <mr.callahhh@gmail.com>
 Date: Wed, 8 Apr 2020 18:00:17 -0500
 Subject: [PATCH] Port 20w15a Villager AI optimizations - DROP 1.16
 
 
 diff --git a/src/main/java/net/minecraft/server/BehaviorController.java b/src/main/java/net/minecraft/server/BehaviorController.java
-index a1883eba6..c75581dd5 100644
+index a1883eba..c75581dd 100644
 --- a/src/main/java/net/minecraft/server/BehaviorController.java
 +++ b/src/main/java/net/minecraft/server/BehaviorController.java
 @@ -38,30 +38,22 @@ public class BehaviorController<E extends EntityLiving> implements MinecraftSeri
@@ -194,5 +194,5 @@ index a1883eba6..c75581dd5 100644
  
      private boolean a(Object object) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0472-Reduce-Either-Optional-allocation.patch b/Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch
similarity index 94%
rename from Spigot-Server-Patches/0472-Reduce-Either-Optional-allocation.patch
rename to Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch
index 78fe328c7c..a912f45bc2 100644
--- a/Spigot-Server-Patches/0472-Reduce-Either-Optional-allocation.patch
+++ b/Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch
@@ -1,4 +1,4 @@
-From 4e4969fe0412b6f2a2989a35215096c24266180a Mon Sep 17 00:00:00 2001
+From 9db1d92fce05f586d5a8a0d1960754fc4419548e Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Mon, 6 Apr 2020 18:35:09 -0700
 Subject: [PATCH] Reduce Either Optional allocation
@@ -7,7 +7,7 @@ In order to get chunk values, we shouldn't need to create
 an optional each time.
 
 diff --git a/src/main/java/com/mojang/datafixers/util/Either.java b/src/main/java/com/mojang/datafixers/util/Either.java
-index a90adac7b..3f65fe710 100644
+index a90adac7..3f65fe71 100644
 --- a/src/main/java/com/mojang/datafixers/util/Either.java
 +++ b/src/main/java/com/mojang/datafixers/util/Either.java
 @@ -22,7 +22,7 @@ public abstract class Either<L, R> implements App<Either.Mu<R>, L> {
@@ -47,5 +47,5 @@ index a90adac7b..3f65fe710 100644
  
          @Override
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0473-Remove-streams-from-PairedQueue.patch b/Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch
similarity index 96%
rename from Spigot-Server-Patches/0473-Remove-streams-from-PairedQueue.patch
rename to Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch
index 888cbd212f..da51c84808 100644
--- a/Spigot-Server-Patches/0473-Remove-streams-from-PairedQueue.patch
+++ b/Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch
@@ -1,4 +1,4 @@
-From 7d32a5500fd79455112616c6a1646fb71b1dac43 Mon Sep 17 00:00:00 2001
+From fad22dfe20f3e647838d93f9b0e41ef61986eb60 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Mon, 6 Apr 2020 18:10:43 -0700
 Subject: [PATCH] Remove streams from PairedQueue
@@ -7,7 +7,7 @@ We shouldn't be doing stream calls just to see if the queue is
 empty. This creates loads of garbage thanks to how often it's called.
 
 diff --git a/src/main/java/net/minecraft/server/PairedQueue.java b/src/main/java/net/minecraft/server/PairedQueue.java
-index 85bb22e4b..2369afb4f 100644
+index 85bb22e4..2369afb4 100644
 --- a/src/main/java/net/minecraft/server/PairedQueue.java
 +++ b/src/main/java/net/minecraft/server/PairedQueue.java
 @@ -20,32 +20,30 @@ public interface PairedQueue<T, F> {
@@ -78,5 +78,5 @@ index 85bb22e4b..2369afb4f 100644
      }
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0474-Remove-streams-from-MinecraftKey.patch b/Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch
similarity index 94%
rename from Spigot-Server-Patches/0474-Remove-streams-from-MinecraftKey.patch
rename to Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch
index 234e44e315..5336fabfbd 100644
--- a/Spigot-Server-Patches/0474-Remove-streams-from-MinecraftKey.patch
+++ b/Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch
@@ -1,4 +1,4 @@
-From 87074d6a3aa62c6ef3c61aff82bb869568066b5c Mon Sep 17 00:00:00 2001
+From 744f80a2c7cee1fd31f773eecbb4d34b3987c370 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Mon, 6 Apr 2020 18:06:24 -0700
 Subject: [PATCH] Remove streams from MinecraftKey
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove streams from MinecraftKey
 They produce a lot of garbage.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftKey.java b/src/main/java/net/minecraft/server/MinecraftKey.java
-index 2b271d3e5..b1beebf0e 100644
+index 2b271d3e..b1beebf0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftKey.java
 +++ b/src/main/java/net/minecraft/server/MinecraftKey.java
 @@ -125,15 +125,29 @@ public class MinecraftKey implements Comparable<MinecraftKey> {
@@ -46,5 +46,5 @@ index 2b271d3e5..b1beebf0e 100644
  
      public static class a implements JsonDeserializer<MinecraftKey>, JsonSerializer<MinecraftKey> {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0475-Reduce-memory-footprint-of-NBTTagCompound.patch b/Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 95%
rename from Spigot-Server-Patches/0475-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch
index c9a4d84385..eb9dce0b64 100644
--- a/Spigot-Server-Patches/0475-Reduce-memory-footprint-of-NBTTagCompound.patch
+++ b/Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch
@@ -1,4 +1,4 @@
-From 1702763635d87ea03b05354b5e541cda6e348da0 Mon Sep 17 00:00:00 2001
+From 4b49e049f054821c79c7577cf375cbb86df78b4d Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Mon, 6 Apr 2020 17:39:25 -0700
 Subject: [PATCH] Reduce memory footprint of NBTTagCompound
@@ -8,7 +8,7 @@ is important because we clone chunk data after reading it for safety.
 So, reduce the impact of the clone on GC.
 
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 98deaba12..02a2ed1ba 100644
+index 98deaba1..02a2ed1b 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -31,7 +31,7 @@ public class NBTTagCompound implements NBTBase {
@@ -50,5 +50,5 @@ index 98deaba12..02a2ed1ba 100644
  
      public boolean equals(Object object) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0476-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch
similarity index 87%
rename from Spigot-Server-Patches/0476-Prevent-opening-inventories-when-frozen.patch
rename to Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch
index 7d6c3e027b..a1dddac459 100644
--- a/Spigot-Server-Patches/0476-Prevent-opening-inventories-when-frozen.patch
+++ b/Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch
@@ -1,14 +1,14 @@
-From a21d662887b49264ae30102a1bffdd2a9295b68d Mon Sep 17 00:00:00 2001
+From c002f483dd0b1e1ff710060d73d333c41a9fd844 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 13 Apr 2020 07:31:44 +0100
 Subject: [PATCH] Prevent opening inventories when frozen
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index fb3897583..cd8df622f 100644
+index d16f3880..c59416e1 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1917,7 +1917,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1910,7 +1910,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      }
  
      @Override
@@ -18,7 +18,7 @@ index fb3897583..cd8df622f 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 1c88eacea..5a79c7f13 100644
+index 1c88eace..5a79c7f1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -305,6 +305,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -30,5 +30,5 @@ index 1c88eacea..5a79c7f13 100644
  
          ITileInventory iinventory = null;
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0477-Optimise-ArraySetSorted-removeIf.patch b/Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch
similarity index 95%
rename from Spigot-Server-Patches/0477-Optimise-ArraySetSorted-removeIf.patch
rename to Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch
index 20a78c77df..9156be8ae6 100644
--- a/Spigot-Server-Patches/0477-Optimise-ArraySetSorted-removeIf.patch
+++ b/Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch
@@ -1,4 +1,4 @@
-From f9c59df3e2db59fafe5e156b5c2e1929cc185218 Mon Sep 17 00:00:00 2001
+From 5df019d5fe3c8b5b2056d687ba428ad2ed1beb16 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Wed, 15 Apr 2020 18:23:28 -0700
 Subject: [PATCH] Optimise ArraySetSorted#removeIf
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise ArraySetSorted#removeIf
 Remove iterator allocation and ensure the call is always O(n)
 
 diff --git a/src/main/java/net/minecraft/server/ArraySetSorted.java b/src/main/java/net/minecraft/server/ArraySetSorted.java
-index 85f799a71..7db6b5850 100644
+index 85f799a7..7db6b585 100644
 --- a/src/main/java/net/minecraft/server/ArraySetSorted.java
 +++ b/src/main/java/net/minecraft/server/ArraySetSorted.java
 @@ -10,8 +10,8 @@ import java.util.NoSuchElementException;
@@ -64,5 +64,5 @@ index 85f799a71..7db6b5850 100644
          return new ArraySetSorted<>(i, (Comparator)Comparator.naturalOrder()); // Paper - decompile fix
      }
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0478-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 92%
rename from Spigot-Server-Patches/0478-Don-t-run-entity-collision-code-if-not-needed.patch
rename to Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch
index a691a13160..9d65331911 100644
--- a/Spigot-Server-Patches/0478-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -1,4 +1,4 @@
-From be8abb1580a4643fcce69623df15c78f6cbd0e12 Mon Sep 17 00:00:00 2001
+From e525208c1cb34b0460e93997d6aed0af5897cf70 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Wed, 15 Apr 2020 17:56:07 -0700
 Subject: [PATCH] Don't run entity collision code if not needed
@@ -7,7 +7,7 @@ Will not run if max entity craming is disabled and
 the max collisions per entity is less than or equal to 0
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ad474500e..dfb9421a1 100644
+index ad474500..dfb9421a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2663,10 +2663,16 @@ public abstract class EntityLiving extends Entity {
@@ -29,5 +29,5 @@ index ad474500e..dfb9421a1 100644
  
              if (i > 0 && list.size() > i - 1 && this.random.nextInt(4) == 0) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0479-Optimise-entity-hard-collision-checking.patch b/Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch
similarity index 97%
rename from Spigot-Server-Patches/0479-Optimise-entity-hard-collision-checking.patch
rename to Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch
index 16ec246d51..5f023492c5 100644
--- a/Spigot-Server-Patches/0479-Optimise-entity-hard-collision-checking.patch
+++ b/Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch
@@ -1,4 +1,4 @@
-From b5b07ca3fba55030c3fad46887a64b39da500b32 Mon Sep 17 00:00:00 2001
+From 10e05a26c3962896fd2bba8a9cc939c59c668093 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Wed, 15 Apr 2020 18:08:53 -0700
 Subject: [PATCH] Optimise entity hard collision checking
@@ -11,7 +11,7 @@ Less crammed entities are likely to show significantly less benefit.
 Effectively, this patch optimises crammed entity situations.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 719c6f3e7..d745eae42 100644
+index 719c6f3e..d745eae4 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -92,6 +92,54 @@ public class Chunk implements IChunkAccess {
@@ -88,7 +88,7 @@ index 719c6f3e7..d745eae42 100644
          }
          if (entity instanceof EntityItem) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9cb4e5a1e..96a47dd1c 100644
+index 9cb4e5a1..96a47dd1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -210,6 +210,40 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -133,7 +133,7 @@ index 9cb4e5a1e..96a47dd1c 100644
          this.id = Entity.entityCount.incrementAndGet();
          this.passengers = Lists.newArrayList();
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index af10fc36e..2887cb14e 100644
+index af10fc36..2887cb14 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -847,6 +847,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -145,7 +145,7 @@ index af10fc36e..2887cb14e 100644
          return this.children;
      }
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 4157e50e4..5135308fb 100644
+index 4157e50e..5135308f 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -42,17 +42,26 @@ public interface IEntityAccess {
@@ -178,7 +178,7 @@ index 4157e50e4..5135308fb 100644
  
              return stream.filter(axisalignedbb1::c).map(VoxelShapes::a);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 46e19d916..09b03afff 100644
+index 46e19d91..09b03aff 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1172,6 +1172,32 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -215,5 +215,5 @@ index 46e19d916..09b03afff 100644
      public List<Entity> getEntities(@Nullable Entity entity, AxisAlignedBB axisalignedbb, @Nullable Predicate<? super Entity> predicate) {
          this.getMethodProfiler().c("getEntities");
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0480-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
similarity index 96%
rename from Spigot-Server-Patches/0480-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
rename to Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
index 8275b0e9d2..56451a9435 100644
--- a/Spigot-Server-Patches/0480-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
+++ b/Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
@@ -1,4 +1,4 @@
-From ad087d201ddcc82d97a6c37d55e1a7eaa32ceb3e Mon Sep 17 00:00:00 2001
+From f1385354f2a9e9aad317152a00d10f8d7773c19e Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Thu, 16 Apr 2020 16:13:59 -0700
 Subject: [PATCH] Optimize ChunkProviderServer's chunk level checking helper
@@ -9,7 +9,7 @@ so inline where possible, and avoid the abstraction of the
 Either class.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 8d4b227ef..59568224f 100644
+index 8d4b227e..59568224 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -613,27 +613,37 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -61,5 +61,5 @@ index 8d4b227ef..59568224f 100644
  
      private boolean a(long i, Function<PlayerChunk, CompletableFuture<Either<Chunk, PlayerChunk.Failure>>> function) {
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0481-Restrict-vanilla-teleport-command-to-valid-locations.patch b/Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 92%
rename from Spigot-Server-Patches/0481-Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch
index 4ac5f17775..2b490fd248 100644
--- a/Spigot-Server-Patches/0481-Restrict-vanilla-teleport-command-to-valid-locations.patch
+++ b/Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch
@@ -1,4 +1,4 @@
-From 27b2efd5641e604496c7a58d084e8a0d17fb39c8 Mon Sep 17 00:00:00 2001
+From 0a04e4326f4985bd0839edf8239ac01bce81b445 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Thu, 16 Apr 2020 20:07:29 -0500
 Subject: [PATCH] Restrict vanilla teleport command to valid locations
@@ -6,7 +6,7 @@ Subject: [PATCH] Restrict vanilla teleport command to valid locations
 Fixes GH-3165
 
 diff --git a/src/main/java/net/minecraft/server/CommandTeleport.java b/src/main/java/net/minecraft/server/CommandTeleport.java
-index 3060b4f68..79016b587 100644
+index 3060b4f6..79016b58 100644
 --- a/src/main/java/net/minecraft/server/CommandTeleport.java
 +++ b/src/main/java/net/minecraft/server/CommandTeleport.java
 @@ -116,6 +116,12 @@ public class CommandTeleport {
@@ -23,5 +23,5 @@ index 3060b4f68..79016b587 100644
              ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(new BlockPosition(d0, d1, d2));
  
 -- 
-2.26.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0482-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0482-Implement-Player-Client-Options-API.patch
rename to Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch
index 843f0e963d..d91f3f2dcb 100644
--- a/Spigot-Server-Patches/0482-Implement-Player-Client-Options-API.patch
+++ b/Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch
@@ -1,4 +1,4 @@
-From d02d742fe8651d8fb147a0c2c70ec307bc0f3ba9 Mon Sep 17 00:00:00 2001
+From ace4b62d156c205e0f893b38bfe92d4c16011c10 Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Mon, 20 Jan 2020 21:38:15 +0100
 Subject: [PATCH] Implement Player Client Options API
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement Player Client Options API
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperSkinParts.java b/src/main/java/com/destroystokyo/paper/PaperSkinParts.java
 new file mode 100644
-index 000000000..b6f4400df
+index 00000000..b6f4400d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperSkinParts.java
 @@ -0,0 +1,74 @@
@@ -85,7 +85,7 @@ index 000000000..b6f4400df
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 7afcde608..8a3f2b5e4 100644
+index 7afcde60..8a3f2b5e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -35,7 +35,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -98,7 +98,7 @@ index 7afcde608..8a3f2b5e4 100644
      protected static final DataWatcherObject<NBTTagCompound> bs = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p);
      protected static final DataWatcherObject<NBTTagCompound> bt = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p);
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index cd8df622f..202068314 100644
+index c59416e1..f3928b8f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -118,7 +118,7 @@ index cd8df622f..202068314 100644
      private long cj = SystemUtils.getMonotonicMillis();
      private Entity spectatedEntity; private void setSpectatorTargetField(Entity e) { this.spectatedEntity = e; } // Paper - OBFHELPER
      public boolean worldChangeInvuln;
-@@ -1582,6 +1583,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1575,6 +1576,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      }
  
      public void a(PacketPlayInSettings packetplayinsettings) {
@@ -127,7 +127,7 @@ index cd8df622f..202068314 100644
          if (getMainHand() != packetplayinsettings.getMainHand()) {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInSettings.java b/src/main/java/net/minecraft/server/PacketPlayInSettings.java
-index 8faebf9ef..4da637138 100644
+index 8faebf9e..4da63713 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInSettings.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInSettings.java
 @@ -37,18 +37,22 @@ public class PacketPlayInSettings implements Packet<PacketListenerPlayIn> {
@@ -154,7 +154,7 @@ index 8faebf9ef..4da637138 100644
          return this.e;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 33cac5fcb..b76379a17 100644
+index 33cac5fc..b76379a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,8 @@
@@ -200,5 +200,5 @@ index 33cac5fcb..b76379a17 100644
  
      // Spigot start
 -- 
-2.26.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0483-Fix-Chunk-Post-Processing-deadlock-risk.patch b/Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 97%
rename from Spigot-Server-Patches/0483-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch
index aa7006a4c4..2aabe74a67 100644
--- a/Spigot-Server-Patches/0483-Fix-Chunk-Post-Processing-deadlock-risk.patch
+++ b/Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch
@@ -1,4 +1,4 @@
-From 44c619f1495272cbc450dc6ca1e805dcd2a7a527 Mon Sep 17 00:00:00 2001
+From 7efd9e913ddf547057c364e553e4a79c69c4c397 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Apr 2020 04:36:11 -0400
 Subject: [PATCH] Fix Chunk Post Processing deadlock risk
@@ -25,7 +25,7 @@ This successfully fixed a reoccurring and highly reproduceable crash
 for heightmaps.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 59568224f..fd84807a5 100644
+index 59568224..fd84807a 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -1017,6 +1017,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -50,7 +50,7 @@ index 59568224f..fd84807a5 100644
          } finally {
              playerChunkMap.callbackExecutor.run();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index c38d31faf..e19342eb8 100644
+index c38d31fa..e19342eb 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -92,6 +92,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -80,5 +80,5 @@ index c38d31faf..e19342eb8 100644
  
          completablefuture1.thenAcceptAsync((either) -> {
 -- 
-2.26.0
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0484-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 89%
rename from Spigot-Server-Patches/0484-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 3cb90005b3..bf7c2b0161 100644
--- a/Spigot-Server-Patches/0484-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
@@ -1,4 +1,4 @@
-From 86e26e7c235ffbd1dc52242b42c40ff55bef6b4c Mon Sep 17 00:00:00 2001
+From 0502654628ce7f4128d9f3cd5b68e54918007250 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Apr 2020 15:59:41 -0400
 Subject: [PATCH] Don't crash if player is attempted to be removed from
@@ -7,7 +7,7 @@ Subject: [PATCH] Don't crash if player is attempted to be removed from
 I suspect it deals with teleporting as it uses players current x/y/z
 
 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index 0244768f7..279c7a85f 100644
+index 0244768f..279c7a85 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -226,6 +226,7 @@ public abstract class ChunkMapDistance {
@@ -19,5 +19,5 @@ index 0244768f7..279c7a85f 100644
          objectset.remove(entityplayer);
          if (objectset.isEmpty()) {
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0485-Broadcast-join-message-to-console.patch b/Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch
similarity index 90%
rename from Spigot-Server-Patches/0485-Broadcast-join-message-to-console.patch
rename to Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch
index cc69754752..5e96a02fd7 100644
--- a/Spigot-Server-Patches/0485-Broadcast-join-message-to-console.patch
+++ b/Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch
@@ -1,11 +1,11 @@
-From a1774c817091f8447b3f5e9f7f88f2244c4fe52d Mon Sep 17 00:00:00 2001
+From c1cf9dd2c6c5cee90fd8b460d721352f9d56a4b9 Mon Sep 17 00:00:00 2001
 From: AvrooVulcan <avrovulcan.programming@gmail.com>
 Date: Fri, 17 Apr 2020 00:15:23 +0100
 Subject: [PATCH] Broadcast join message to console
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 160476fa2..7403be0b2 100644
+index 160476fa..7403be0b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -186,9 +186,9 @@ public abstract class PlayerList {
@@ -22,5 +22,5 @@ index 160476fa2..7403be0b2 100644
          // CraftBukkit end
  
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0486-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0486-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index accbd81292..c6f1a51065 100644
--- a/Spigot-Server-Patches/0486-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -1,4 +1,4 @@
-From 841d912dd05dbb6d52500b04b48207ffeb33d77f Mon Sep 17 00:00:00 2001
+From ecc9b88983b43be7ef71207cfc8dbfbe37af3933 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 19 Apr 2020 00:05:46 -0400
 Subject: [PATCH] Fix Longstanding Broken behavior of PlayerJoinEvent
@@ -28,7 +28,7 @@ receives a deterministic result, and should no longer require 1 tick
 delays anymore.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 42ddc991cc..75543ee6dc 100644
+index f3928b8f..686fd4cb 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -104,6 +104,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -40,7 +40,7 @@ index 42ddc991cc..75543ee6dc 100644
      // CraftBukkit end
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index e19342eb89..8b2eed1051 100644
+index e19342eb..8b2eed10 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1565,6 +1565,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -52,7 +52,7 @@ index e19342eb89..8b2eed1051 100644
          if (!(entity instanceof EntityComplexPart)) {
              if (!(entity instanceof EntityLightning)) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7403be0b25..ec45c30dd3 100644
+index 7403be0b..ec45c30d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -175,6 +175,12 @@ public abstract class PlayerList {
@@ -101,5 +101,5 @@ index 7403be0b25..ec45c30dd3 100644
          // Paper start - Add to collideRule team if needed
          final Scoreboard scoreboard = this.getServer().getWorldServer(DimensionManager.OVERWORLD).getScoreboard();
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0487-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch
similarity index 98%
rename from Spigot-Server-Patches/0487-Load-Chunks-for-Login-Asynchronously.patch
rename to Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch
index 92712c6d50..ce41a677b4 100644
--- a/Spigot-Server-Patches/0487-Load-Chunks-for-Login-Asynchronously.patch
+++ b/Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch
@@ -1,4 +1,4 @@
-From 10bdc874204a77a667627b26415a054606f5f841 Mon Sep 17 00:00:00 2001
+From bb23022f8a18e30fb96036e8c6c7517af3ae42d6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 19 Apr 2020 04:28:29 -0400
 Subject: [PATCH] Load Chunks for Login Asynchronously
diff --git a/Spigot-Server-Patches/0488-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 92%
rename from Spigot-Server-Patches/0488-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 97fb411073..a727b664f7 100644
--- a/Spigot-Server-Patches/0488-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -1,4 +1,4 @@
-From 3d7bdaea0c45ee77416c305159643fc4b397dfee Mon Sep 17 00:00:00 2001
+From 1accce90bb7471c5d7aeb41ae2f19943e291f6cf Mon Sep 17 00:00:00 2001
 From: 2277 <38501234+2277@users.noreply.github.com>
 Date: Tue, 31 Mar 2020 10:33:55 +0100
 Subject: [PATCH] Move player to spawn point if spawn in unloaded world
@@ -7,7 +7,7 @@ The code following this has better support for null worlds to move
 them back to the world spawn.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 96a47dd1c2..46e631d466 100644
+index 96a47dd1..46e631d4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1790,9 +1790,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -26,5 +26,5 @@ index 96a47dd1c2..46e631d466 100644
                  spawnIn(bworld == null ? null : ((CraftWorld) bworld).getHandle());
              }
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0489-Allow-sleeping-players-to-float.patch b/Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch
similarity index 95%
rename from Spigot-Server-Patches/0489-Allow-sleeping-players-to-float.patch
rename to Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch
index 7912c1bd66..ad359e58ef 100644
--- a/Spigot-Server-Patches/0489-Allow-sleeping-players-to-float.patch
+++ b/Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch
@@ -1,4 +1,4 @@
-From 6605201ac028dec660b246c5fa87d370d08f069f Mon Sep 17 00:00:00 2001
+From faa398e6e6084254ca85e533575edf79f605223c Mon Sep 17 00:00:00 2001
 From: Mariell Hoversholm <proximyst@proximyst.com>
 Date: Sun, 19 Apr 2020 12:25:20 +0200
 Subject: [PATCH] Allow sleeping players to float
diff --git a/Spigot-Server-Patches/0490-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 90%
rename from Spigot-Server-Patches/0490-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch
index 93ec6a2373..55620b1c85 100644
--- a/Spigot-Server-Patches/0490-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -1,11 +1,11 @@
-From 21dfa9a7108ea72db2e34c0ad40cff723f7f792c Mon Sep 17 00:00:00 2001
+From b0175164c105ef071144d0facc5381c77974ac9d Mon Sep 17 00:00:00 2001
 From: nossr50 <nossr50@gmail.com>
 Date: Thu, 26 Mar 2020 19:44:50 -0700
 Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 8a3f2b5e40..2e186134ea 100644
+index 8a3f2b5e..2e186134 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1057,7 +1057,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -22,5 +22,5 @@ index 8a3f2b5e40..2e186134ea 100644
                      boolean flag = f2 > 0.9F;
                      boolean flag1 = false;
 -- 
-2.25.1
+2.25.1.windows.1
 
diff --git a/Spigot-Server-Patches/0491-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 94%
rename from Spigot-Server-Patches/0491-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
index 1c0679aae1..53c140d281 100644
--- a/Spigot-Server-Patches/0491-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
+++ b/Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
@@ -1,4 +1,4 @@
-From 429c6c3f9e55451e7f2e0065879884f3e0e13217 Mon Sep 17 00:00:00 2001
+From 0f4ba3f787e0860be4e312a4eaaa2a9556624bf8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 21 Apr 2020 03:51:53 -0400
 Subject: [PATCH] Allow multiple callbacks to schedule for Callback Executor
@@ -12,7 +12,7 @@ needed within a single tick of ChunkMapDistance
 Use an ArrayDeque to store this Queue
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 8b2eed1051..ee0cabadc8 100644
+index 8b2eed10..ee0cabad 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -87,25 +87,22 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -48,5 +48,5 @@ index 8b2eed1051..ee0cabadc8 100644
      // CraftBukkit end
  
 -- 
-2.25.1
+2.25.1.windows.1