fix annotations, convert to record

needs organisating, commentry, and actually exposing in the API

.github/workflows/build.yml

@@ -1,86 +1,33 @@
 # Here lie dragons!
 #
-# This action either builds the server or
-# builds a paperclip jar to be updated in the body
-# of the PR relating to this action.
+# Note that there is no artifact step in this script. We do not want Paperclip
+# jars to be built for every push & PR; our CI handles pushes to branches, while
+# PRs can themselves link to Paperclip jars if it is necessary. Official such
+# PRs will take use of testing builds.
 
 name: Build Paper
-on:
-  push:
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - labeled
+on: [push, pull_request]
 
 jobs:
-  build:
-    # Run on all label events (won't be duplicated) or all push events or on PR syncs not from the same repo
-    if: (github.event_name == 'pull_request' && github.event.action == 'labeled') || github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [17]
-      fail-fast: true
-    steps:
-      - uses: actions/checkout@v3
-      - name: JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3.6.0
-        with:
-          java-version: ${{ matrix.java }}
-          distribution: 'temurin'
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-
-      - name: Configure Build
-        uses: actions/github-script@v6
-        id: determine
-        with:
-          script: |
-            const {owner, repo} = context.repo;
-            const event_name = "${{ github.event_name }}";
-            const event = ${{ toJSON(github.event) }};
-            const ref_type = "${{ github.ref_type }}";
-            const ref_name = "${{ github.ref_name }}";
-            const result = {
-              action: "build"
-            };
-
-            if (event_name === "push" && ref_type === "branch") {
-              const {data: pulls} = await github.rest.pulls.list({ owner, repo, head: `${owner}:${ref_name}`, state: "open" });
-              const pull = pulls.find((pr) => !!pr.labels.find((l) => l.name === "build-pr-jar"));
-              if (pull) {
-                result["pr"] = pull.number;
-                result["action"] = "paperclip";
-                core.notice(`This is a push action but to a branch with an open PR with the build paperclip label (${JSON.stringify(result)})`);
-                return result;
-              }
-            } else if (event_name === "pull_request" && event.pull_request.labels.find((l) => l.name === "build-pr-jar")) {
-              result["pr"] = event.pull_request.number;
-              result["action"] = "paperclip";
-              core.notice(`This is a pull request action with a build paperclip label (${JSON.stringify(result)})`);
-              return result;
-            }
-            core.notice("This will not build a paperclip jar");
-            return result;
-
-      - name: Apply Patches
-        run: |
-          git config --global user.email "no-reply@github.com"
-          git config --global user.name "Github Actions"
-          ./gradlew applyPatches --stacktrace
-
-      - name: Build
-        run: ./gradlew build --stacktrace
-
-      - name: Create Paperclip Jar
-        if: fromJSON(steps.determine.outputs.result).action == 'paperclip'
-        run: ./gradlew createReobfPaperclipJar --stacktrace
-
-      - name: Upload Paperclip Jar
-        if: fromJSON(steps.determine.outputs.result).action == 'paperclip'
-        uses: actions/upload-artifact@v3
-        with:
-          name: paper-${{ fromJSON(steps.determine.outputs.result).pr }}
-          path: build/libs/paper-paperclip-*-reobf.jar
+    build:
+        # Only run on PRs if the source branch is on someone else's repo
+        if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                java: [17]
+            fail-fast: true
+        steps:
+            - uses: actions/checkout@v2.4.0
+            - name: JDK ${{ matrix.java }}
+              uses: actions/setup-java@v3.1.0
+              with:
+                  java-version: ${{ matrix.java }}
+                  cache: 'gradle'
+                  distribution: 'temurin'
+            - name: Patch and build
+              run: |
+                  git config --global user.email "no-reply@github.com"
+                  git config --global user.name "Github Actions"
+                  ./gradlew applyPatches --stacktrace
+                  ./gradlew build --stacktrace

.github/workflows/close_invalid_prs.yml

@@ -1,14 +0,0 @@
-name: Close invalid PRs
-
-on:
-  pull_request_target:
-    types: [ opened ]
-
-jobs:
-  run:
-    if: ${{ github.repository != github.event.pull_request.head.repo.full_name && github.head_ref == 'master' }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: superbrothers/close-pull-request@v3
-        with:
-          comment: "Please do not open pull requests from the `master` branch, create a new branch instead."

.github/workflows/pr_comment.yml

@@ -1,76 +0,0 @@
-# This workflow run on the completion of the
-# build workflow but only does anything if the
-# triggering workflow uploaded an artifact.
-#
-# Do note that it is then the trigger workflow that
-# determines if this will update the PR text body. All
-# this workflow does is check if an uploaded artifact
-# exists and there is a PR tied to the previous workflow.
-
-name: Comment on pull request
-on:
-  workflow_run:
-    workflows: ['Build Paper']
-    types: [completed]
-jobs:
-  pr_comment:
-    if: github.event.workflow_run.conclusion == 'success'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v6
-        with:
-          # This snippet is public-domain, taken from
-          # https://github.com/oprypin/nightly.link/blob/master/.github/workflows/pr-comment.yml
-          # Modified extensively by Machine_Maker
-          script: |
-            async function updatePR(owner, repo, issue_number, purpose, body) {
-              const { data } = await github.rest.issues.get({ owner, repo, issue_number });
-              core.debug(JSON.stringify(data, null, 2));
-
-              const marker = `<!-- bot: ${purpose} -->`;
-
-              let new_body = data.body ? data.body.trim().split(marker)[0].trim() : "";
-              new_body += `\n${marker}\n---\n${body}`;
-
-              core.info(`Updating the text body of PR #${issue_number} in ${owner}/${repo}`);
-              await github.rest.issues.update({ owner, repo, issue_number, body: new_body });
-            }
-
-            const { owner, repo } = context.repo;
-            const run_id = ${{ github.event.workflow_run.id }};
-            const repo_id = ${{ github.event.repository.id }};
-
-            let pulls = [];
-            const event_type = "${{ github.event.workflow_run.event}}";
-            if (event_type === "push") { // if push, it's from the same repo which means `pull_requests` is populated
-              pulls = ${{ toJSON(github.event.workflow_run.pull_requests) }};
-            } else {
-              const pr_branch = "${{ github.event.workflow_run.head_branch }}";
-              const pr_sha = "${{ github.event.workflow_run.head_sha }}";
-              const pr_owner = "${{ github.event.workflow_run.head_repository.owner.login }}";
-              const { data } = await github.rest.pulls.list({ owner, repo, head: `${pr_owner}:${pr_branch}`, state: "open" });
-              core.debug(JSON.stringify(data, null, 2));
-              pulls = data.filter((pr) => pr.head.sha === pr_sha && pr.labels.find((l) => l.name === "build-pr-jar"));
-            }
-
-            if (!pulls.length) {
-              return core.notice("This workflow doesn't have any pull requests!");
-            } else if (pulls.length > 1) {
-              core.info(JSON.stringify(pulls, null, 2));
-              return core.error("Found multiple matching PRs");
-            }
-            const pull_request = pulls[0];
-
-            const artifacts = await github.paginate(github.rest.actions.listWorkflowRunArtifacts, { owner, repo, run_id });
-            if (!artifacts.length) {
-              return core.info("Skipping comment due to no artifact found");
-            }
-            const artifact = artifacts.find((art) => art.name === `paper-${pull_request.number}`);
-            if (!artifact) {
-              return core.info("Skipping comment to no matching artifact found");
-            }
-
-            const link = `https://nightly.link/${owner}/${repo}/actions/artifacts/${artifact.id}.zip`;
-            const body = `Download the paperclip jar for this pull request: [${artifact.name}.zip](${link})`;
-            core.info(`Adding a link to ${link}`);
-            await updatePR(owner, repo, pull_request.number, "paperclip-pr-build", body);

.gitignore

@@ -53,9 +53,6 @@ work/ForgeFlower
 .idea/
 out/
 
-# JetBrains Fleet
-.fleet/
-
 # Linux temp files
 *~
 

CONTRIBUTING.md

@@ -4,11 +4,11 @@ PaperMC is happy you're willing to contribute to our projects. We are usually
 very lenient with all submitted PRs, but there are still some guidelines you
 can follow to make the approval process go more smoothly.
 
-## Use a Personal Fork and not an Organization
+## Use a Personal Fork and not Organization
 
 Paper will routinely modify your PR, whether it's a quick rebase or to take care
 of any minor nitpicks we might have. Often, it's better for us to solve these
-problems for you than make you go back and forth trying to fix them yourself.
+problems for you than make you go back and forth trying to fix it yourself.
 
 Unfortunately, if you use an organization for your PR, it prevents Paper from
 modifying it. This requires us to manually merge your PR, resulting in us
@@ -29,9 +29,9 @@ you will most likely use this for WSL), `homebrew` (macOS / Linux), and more:
 - `git` (package `git` everywhere);
 - A Java 17 or later JDK (packages vary, use Google/DuckDuckGo/etc.).
   - [Adoptium](https://adoptium.net/) has builds for most operating systems.
-  - Paper requires JDK 17 to build, however, makes use of Gradle's
+  - Paper requires JDK 17 to build, however makes use of Gradle's
     [Toolchains](https://docs.gradle.org/current/userguide/toolchains.html)
-    feature to allow building with only JRE 11 or later installed. (Gradle will
+    feature to allow building with only JRE 8 or later installed. (Gradle will
     automatically provision JDK 17 for compilation if it cannot find an existing
     install).
 
@@ -184,7 +184,7 @@ These steps assume the `origin` remote is your fork of this repository and `upst
 1. Checkout feature/fix branch and rebase on master: `git checkout patch-branch && git rebase master`.
 1. Apply updated patches: `./gradlew applyPatches`.
 1. If there are conflicts, fix them.
-1. If your PR creates new patches instead of modifying existing ones, in both the `Paper-Server` and `Paper-API` directories, ensure your newly-created patch is the last commit by either:
+1. If your PR creates new patches instead of modifying exist ones, in both the `Paper-Server` and `Paper-API` directories, ensure your newly-created patch is the last commit by either:
     * Renaming the patch file with a large 4-digit number in front (e.g. 9999-Patch-to-add-some-new-stuff.patch), and re-applying patches.
     * Running `git rebase --interactive base` and moving the commits to the end.
 1. Rebuild patches: `./gradlew rebuildPatches`.
@@ -229,44 +229,13 @@ entity.getWorld().explode(new BlockPosition(spawnLocation.getX(), spawnLocation.
 // Paper end
 ```
 
-We generally follow the usual Java style (aka. Oracle style), or what is programmed
+We generally follow usual Java style (aka. Oracle style), or what is programmed
 into most IDEs and formatters by default. There are a few notes, however:
 - It is fine to go over 80 lines as long as it doesn't hurt readability.  
 There are exceptions, especially in Spigot-related files
 - When in doubt or the code around your change is in a clearly different style,
 use the same style as the surrounding code.
 
-## Access Transformers
-Sometimes, vanilla or CraftBukkit code already contains a field, method, or type you want to access
-but the visibility is too low (e.g. a private field in an entity class). Paper can use access transformers
-to change the visibility or remove the final modifier from fields, methods, and classes. Inside the `build-data/paper.at`
-file, you can add ATs that are applied when you `./gradlew applyPatches`. You can read about the format of ATs 
-[here](https://mcforge.readthedocs.io/en/latest/advanced/accesstransformers/#access-modifiers).
-
-### Important
-ATs should be included in the patch file which requires them within the commit message. Do not commit any changes to the
-`build-data/paper.at` file, just use it to initially change the visibility of members until you have finalized what you 
-need. Then, in the commit message for the patch which requires the ATs, add a header at the bottom of the commit message
-before any co-authors. It should look like the following after you `./gradlew rebuildPatches`.
-```
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 8 Jun 2022 22:20:16 -0700
-Subject: [PATCH] Paper config files
-
-This patch adds Paper configuration files.
-Access transformers for this patch are below, but before the co-authors.
-
-== AT ==
-public org.spigotmc.SpigotWorldConfig getBoolean(Ljava/lang/String;Z)Z
-public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES
-
-Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-...
-```
-
 ## Patch Notes
 
 When submitting patches to Paper, we may ask you to add notes to the patch

LICENSE.md

@@ -50,9 +50,4 @@ LemonCaramel <admin@caramel.moe>
 Noah van der Aa <ndvdaa@gmail.com>
 Doc <nachito94@msn.com>
 Nick Hensel <nickhensel25@icloud.com>
-vytskalt <vytskalt@protonmail.com>
-TheFruxz <cedricspitzer@outlook.de>
-Kieran Wallbanks <kieran.wallbanks@gmail.com>
-Denery <dorofeevij@gmail.com>
-Jakubk15 <jakubk15@protonmail.com>
 ```

README.md

@@ -1,10 +1,10 @@
-Paper [![Paper Build Status](https://img.shields.io/github/actions/workflow/status/PaperMC/Paper/build.yml?branch=master)](https://github.com/PaperMC/Paper/actions)
+Paper [![Paper Build Status](https://img.shields.io/github/workflow/status/PaperMC/Paper/Build%20Paper/master)](https://github.com/PaperMC/Paper/actions)
 [![Discord](https://img.shields.io/discord/289587909051416579.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/papermc)
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/papermc?label=GitHub%20Sponsors)](https://github.com/sponsors/PaperMC)
 [![Open Collective](https://img.shields.io/opencollective/all/papermc?label=OpenCollective%20Sponsors)](https://opencollective.com/papermc)
 ===========
 
-High-performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.
+High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.
 
 
 **Support and Project Discussion:**
@@ -38,7 +38,7 @@ How To (Plugin Developers)
 <dependency>
     <groupId>io.papermc.paper</groupId>
     <artifactId>paper-api</artifactId>
-    <version>1.19.4-R0.1-SNAPSHOT</version>
+    <version>1.19.2-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
  ```
@@ -54,7 +54,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT")
 }
 
 java {

build-data/paper.at

@@ -12,3 +12,327 @@ public net.minecraft.server.MinecraftServer doRunTask(Lnet/minecraft/server/Tick
 # AT remap issue? todo 1.18
 public net.minecraft.world.level.dimension.end.EndDragonFight findExitPortal()Lnet/minecraft/world/level/block/state/pattern/BlockPattern$BlockPatternMatch;
 public net.minecraft.nbt.TagParser readArrayTag()Lnet/minecraft/nbt/Tag;
+
+# Paper config files
+public org.spigotmc.SpigotWorldConfig getBoolean(Ljava/lang/String;Z)Z
+public org.spigotmc.SpigotWorldConfig getDouble(Ljava/lang/String;)D
+public org.spigotmc.SpigotWorldConfig getDouble(Ljava/lang/String;D)D
+public org.spigotmc.SpigotWorldConfig getInt(Ljava/lang/String;)I
+public org.spigotmc.SpigotWorldConfig getInt(Ljava/lang/String;I)I
+public org.spigotmc.SpigotWorldConfig getList(Ljava/lang/String;Ljava/lang/Object;)Ljava/util/List;
+public org.spigotmc.SpigotWorldConfig getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+# MC Utils
+public net.minecraft.server.level.ServerChunkCache mainThread
+public net.minecraft.server.level.ServerLevel chunkSource
+public org.bukkit.craftbukkit.inventory.CraftItemStack handle
+
+# Add PlayerInitialSpawnEvent
+public net.minecraft.world.entity.Entity setRot(FF)V
+
+# Add PlayerUseUnknownEntityEvent
+public net.minecraft.network.protocol.game.ServerboundInteractPacket$ActionType
+
+# Configurable RCON IP address
+public net.minecraft.server.dedicated.Settings getStringRaw(Ljava/lang/String;)Ljava/lang/String;
+
+# Mob Spawner API Enhancements
+public net.minecraft.world.level.BaseSpawner isNearPlayer(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Z
+public net.minecraft.world.level.BaseSpawner delay(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V
+
+# LootTable API
+public org.bukkit.craftbukkit.block.CraftBlockEntityState getTileEntity()Lnet/minecraft/world/level/block/entity/BlockEntity;
+public org.bukkit.craftbukkit.block.CraftLootable setLootTable(Lorg/bukkit/loot/LootTable;J)V
+public org.bukkit.craftbukkit.entity.CraftMinecartContainer setLootTable(Lorg/bukkit/loot/LootTable;J)V
+
+# Firework API
+public net.minecraft.world.entity.projectile.FireworkRocketEntity attachedToEntity
+
+# Add option to make parrots stay
+public net.minecraft.world.entity.player.Player removeEntitiesOnShoulder()V
+
+# LivingEntity setkiller
+public net.minecraft.world.entity.LivingEntity lastHurtByPlayerTime
+
+# Fix client rendering skulls
+public net.minecraft.world.item.ItemStack tag
+
+# Async chunk io
+public net.minecraft.server.level.ChunkMap structureManager
+public net.minecraft.server.level.ChunkMap overworldDataStorage
+public net.minecraft.server.level.ChunkMap getUpdatingChunkIfPresent(J)Lnet/minecraft/server/level/ChunkHolder;
+public net.minecraft.server.level.ChunkMap getVisibleChunkIfPresent(J)Lnet/minecraft/server/level/ChunkHolder;
+public net.minecraft.server.level.ServerChunkCache mainThreadProcessor
+public-f net.minecraft.world.level.chunk.storage.RegionFileStorage
+public net.minecraft.world.level.chunk.storage.RegionFileStorage getFile(Lnet/minecraft/world/level/ChunkPos;Z)Lnet/minecraft/world/level/chunk/storage/RegionFile;
+public net.minecraft.world.level.chunk.storage.SectionStorage dirty
+public net.minecraft.util.thread.BlockableEventLoop runAllTasks()V
+public net.minecraft.server.level.ChunkMap getPoiManager()Lnet/minecraft/world/entity/ai/village/poi/PoiManager;
+
+# Improve death events
+public net.minecraft.world.entity.LivingEntity getDeathSound()Lnet/minecraft/sounds/SoundEvent;
+public net.minecraft.world.entity.LivingEntity getSoundVolume()F
+
+# Add sun related api
+public net.minecraft.world.entity.Mob isSunBurnTick()Z
+
+# Turtle API
+public net.minecraft.world.entity.animal.Turtle getHomePos()Lnet/minecraft/core/BlockPos;
+public net.minecraft.world.entity.animal.Turtle setHasEgg(Z)V
+public net.minecraft.world.entity.animal.Turtle isGoingHome()Z
+public net.minecraft.world.entity.animal.Turtle setGoingHome(Z)V
+public net.minecraft.world.entity.animal.Turtle isTravelling()Z
+public net.minecraft.world.entity.animal.Turtle setTravelling(Z)V
+
+# Call player spectator target event
+public net.minecraft.server.network.ServerGamePacketListenerImpl updateBookPages(Ljava/util/List;Ljava/util/function/UnaryOperator;Lnet/minecraft/world/item/ItemStack;ILnet/minecraft/world/item/ItemStack;)V
+
+# Improve Server THread Pool
+public net.minecraft.Util onThreadException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
+
+# Add more zombie API
+public net.minecraft.world.entity.monster.Zombie isSunSensitive()Z
+
+# Add PlayerConnectionCloseEvent
+public net.minecraft.server.network.ServerLoginPacketListenerImpl$State
+public net.minecraft.server.network.ServerLoginPacketListenerImpl state
+public net.minecraft.server.network.ServerLoginPacketListenerImpl gameProfile
+
+# Entity Activation Range 2.0
+public net.minecraft.world.entity.Entity isInsidePortal
+public net.minecraft.world.entity.Mob leashHolder
+public net.minecraft.world.entity.LivingEntity jumping
+
+# No-Tick view distance
+public net.minecraft.server.level.ChunkHolder broadcast(Lnet/minecraft/network/protocol/Packet;Z)V
+public net.minecraft.server.level.ChunkMap setViewDistance(I)V
+public net.minecraft.server.level.ChunkMap readChunk(Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/nbt/CompoundTag;
+public net.minecraft.server.level.ChunkMap playerLoadedChunk(Lnet/minecraft/server/level/ServerPlayer;[Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/world/level/chunk/LevelChunk;)V
+public net.minecraft.server.level.ChunkMap mainThreadMailbox # todo one of these doesn't belong here
+
+# Optimise TickListServer
+public net.minecraft.world.level.ServerTickList saveTickList(Ljava/util/function/Function;Ljava/lang/Iterable;J)Lnet/minecraft/nbt/ListTag;
+public net.minecraft.world.level.chunk.storage.EntityStorage level
+
+# Don't move existing players to world spawn
+public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V
+
+# Implement Player Client Options API
+public net.minecraft.world.entity.player.Player DATA_PLAYER_MODE_CUSTOMISATION
+
+# Fix Longstanding Broken behavior
+public net.minecraft.server.level.ChunkMap addEntity(Lnet/minecraft/world/entity/Entity;)V
+
+# Load Chunks for Login Async
+public net.minecraft.server.level.ServerChunkCache runDistanceManagerUpdates()Z
+public net.minecraft.server.level.ServerChunkCache$MainThreadExecutor # todo doesn't belong here but oh well
+
+# Implement MobGoalApi
+public net.minecraft.world.entity.ai.goal.GoalSelector availableGoals
+
+# Add villager reputation API
+public net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips
+public net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips <init>()V
+
+# Add entity liquid API
+public net.minecraft.world.entity.Entity isInRain()Z
+public net.minecraft.world.entity.Entity isInBubbleColumn()Z
+
+# Allow delegation to vanilla chunk gen
+public org.bukkit.craftbukkit.generator.CustomChunkGenerator delegate
+
+# Optimize redstone algorithm
+public net.minecraft.world.level.block.RedStoneWireBlock shouldSignal
+
+# Add more Evoker API
+public net.minecraft.world.entity.monster.Evoker setWololoTarget(Lnet/minecraft/world/entity/animal/Sheep;)V
+public net.minecraft.world.entity.monster.Evoker getWololoTarget()Lnet/minecraft/world/entity/animal/Sheep;
+
+# More lightning API
+public net.minecraft.world.entity.LightningBolt life
+public net.minecraft.world.entity.LightningBolt flashes
+
+# Configurable door breaking difficulty
+public net.minecraft.world.entity.monster.Vindicator DOOR_BREAKING_PREDICATE
+public net.minecraft.world.entity.monster.Zombie DOOR_BREAKING_PREDICATE
+
+# Optimize sending packets to nearby locations (sounds/effects)
+public net.minecraft.server.level.ServerLevel players
+
+# Item Rarity API
+public net.minecraft.world.item.Item rarity
+
+# More Enchantment API
+public net.minecraft.world.item.enchantment.Enchantment slots
+
+# Fix and optimise world force upgrading
+public net.minecraft.util.worldupdate.WorldUpgrader REGEX
+
+# More Lidded Block API
+public net.minecraft.world.level.block.entity.EnderChestBlockEntity openersCounter
+
+# Improve EntityShootBowEvent
+public net.minecraft.world.entity.projectile.AbstractArrow getPickupItem()Lnet.minecraft.world.item.ItemStack;
+
+# Implement Expanded ArmorStand API
+public net.minecraft.world.entity.decoration.ArmorStand isDisabled(Lnet/minecraft/world/entity/EquipmentSlot;)Z
+
+# Chunk debug command
+public net.minecraft.server.level.ChunkMap entitiesInLevel
+public net.minecraft.server.level.ServerLevel players
+
+# Chunk priority urgency system
+public net.minecraft.server.level.ChunkMap$ChunkDistanceManager
+
+
+# Chunk debug command
+public net.minecraft.server.level.Ticket createdTick
+public net.minecraft.server.level.ServerChunkCache CHUNK_STATUSES
+public net.minecraft.server.level.ChunkHolder pos
+
+# Incremental chunk saving
+public net.minecraft.world.level.entity.PersistentEntitySectionManager storeChunkSections(JLjava/util/function/Consumer;)Z
+
+# Mending XP API
+public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I
+public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I
+
+# Implement an API for CanPlaceOn and CanDestroy NBT values
+public net.minecraft.commands.arguments.blocks.BlockStateParser id
+
+# Villager Restock API
+public net.minecraft.world.entity.npc.Villager numberOfRestocksToday
+
+# Mob Pathfinding API
+public net.minecraft.world.entity.ai.navigation.PathNavigation pathFinder
+public net.minecraft.world.level.pathfinder.PathFinder nodeEvaluator
+public net.minecraft.world.level.pathfinder.Path nodes
+
+# Add more Witch API
+public net.minecraft.world.entity.monster.Witch usingTime
+
+# PlayerDeathEvent#getItemsToKeep
+public net.minecraft.world.entity.player.Inventory compartments
+
+# Missing Entity Behavior API
+public net.minecraft.world.entity.animal.Fox isDefending()Z
+public net.minecraft.world.entity.animal.Fox setDefending(Z)V
+public net.minecraft.world.entity.animal.Fox isFaceplanted()Z
+public net.minecraft.world.entity.animal.Fox setFaceplanted(Z)V
+public net.minecraft.world.entity.animal.Panda getEatCounter()I
+public net.minecraft.world.entity.animal.Panda setEatCounter(I)V
+public net.minecraft.world.entity.animal.Bee isRolling()Z
+public net.minecraft.world.entity.animal.Bee setRolling(Z)V
+public net.minecraft.world.entity.monster.piglin.Piglin isChargingCrossbow()Z
+public net.minecraft.world.entity.monster.Vex hasLimitedLife
+public net.minecraft.world.entity.monster.Vex limitedLifeTicks
+
+# Cook speed multipler API
+public net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity recipeType
+
+# Add methods to get translation keys
+public org.bukkit.craftbukkit.inventory.CraftMetaFirework
+public org.bukkit.craftbukkit.inventory.CraftMetaFirework getNBT(Lorg/bukkit/FireworkEffect$Type;)I
+
+# Vanilla command permission fixes
+public-f com.mojang.brigadier.tree.CommandNode requirement
+
+# Block Enderpearl Travel Exploit
+public net.minecraft.world.entity.projectile.Projectile cachedOwner
+public net.minecraft.world.entity.projectile.Projectile ownerUUID
+
+# Add missing display slots
+public org.bukkit.craftbukkit.scoreboard.CraftScoreboardTranslations
+public org.bukkit.craftbukkit.scoreboard.CraftScoreboardTranslations toBukkitSlot(I)Lorg/bukkit/scoreboard/DisplaySlot;
+public org.bukkit.craftbukkit.scoreboard.CraftScoreboardTranslations fromBukkitSlot(Lorg/bukkit/scoreboard/DisplaySlot;)I
+
+# Add methods to find targets for lightning strikes
+public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
+
+# Improve CraftBlockStates
+public net.minecraft.world.level.block.entity.BlockEntityType validBlocks
+
+# Default entity attributes
+public net.minecraft.world.entity.ai.attributes.AttributeSupplier instances
+
+# Add ItemFactory#getSpawnEgg API
+public net.minecraft.world.item.SpawnEggItem BY_ID
+
+# Zombie API - breaking doors
+public net.minecraft.world.entity.monster.Zombie supportsBreakDoorGoal()Z
+
+# Add Material#hasCollision
+public net.minecraft.world.level.block.state.BlockBehaviour hasCollision
+
+# add per world spawn limits
+public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES
+
+# Optimize isValidLocation
+public net.minecraft.world.level.chunk.LevelChunkSection states
+
+# Player Profile API
+public-f net.minecraft.world.entity.player.Player gameProfile
+public org.bukkit.craftbukkit.profile.CraftProfileProperty
+public org.bukkit.craftbukkit.profile.CraftPlayerTextures
+public org.bukkit.craftbukkit.profile.CraftPlayerTextures copyFrom(Lorg/bukkit/profile/PlayerTextures;)V
+public org.bukkit.craftbukkit.profile.CraftPlayerTextures rebuildPropertyIfDirty()V
+public org.bukkit.craftbukkit.profile.CraftPlayerProfile getProperty(Ljava/lang/String;)Lcom/mojang/authlib/properties/Property;
+public org.bukkit.craftbukkit.profile.CraftPlayerProfile setProperty(Ljava/lang/String;Lcom/mojang/authlib/properties/Property;)V
+public org.bukkit.craftbukkit.profile.CraftPlayerProfile toString(Lcom/mojang/authlib/properties/PropertyMap;)Ljava/lang/String;
+public org.bukkit.craftbukkit.profile.CraftPlayerProfile equals(Lcom/mojang/authlib/properties/PropertyMap;Lcom/mojang/authlib/properties/PropertyMap;)Z
+public org.bukkit.craftbukkit.profile.CraftPlayerProfile hashCode(Lcom/mojang/authlib/properties/PropertyMap;)I
+
+# Flat bedrock generator settings
+public net.minecraft.world.level.levelgen.SurfaceRules$Condition
+public net.minecraft.world.level.levelgen.SurfaceRules$Context
+public net.minecraft.world.level.levelgen.SurfaceRules$Context blockX
+public net.minecraft.world.level.levelgen.SurfaceRules$Context blockY
+public net.minecraft.world.level.levelgen.SurfaceRules$Context blockZ
+public net.minecraft.world.level.levelgen.SurfaceRules$Context context
+public net.minecraft.world.level.levelgen.SurfaceRules$Context randomState
+public net.minecraft.world.level.levelgen.SurfaceRules$LazyYCondition
+public net.minecraft.world.level.levelgen.SurfaceRules$LazyCondition
+public net.minecraft.world.level.levelgen.SurfaceRules$VerticalGradientConditionSource
+public net.minecraft.world.level.levelgen.SurfaceRules$SurfaceRule
+public net.minecraft.world.level.levelgen.SurfaceSystem getOrCreateRandomFactory(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/world/level/levelgen/PositionalRandomFactory;
+
+# Fix removing recipes
+public net.minecraft.world.item.crafting.RecipeManager byName
+
+# Entity powdered snow API
+public net.minecraft.world.entity.monster.Skeleton inPowderSnowTime
+
+# Add health methods for item entities
+public net.minecraft.world.entity.item.ItemEntity health
+
+# Fix riding distance statistics
+public net.minecraft.world.entity.player.Player checkRidingStatistics(DDD)V
+
+# Fix NotePlayEvent
+public org.bukkit.craftbukkit.block.data.CraftBlockData toNMS(Ljava/lang/Enum;Ljava/lang/Class;)Ljava/lang/Enum;
+
+# Stronghold seed configuration
+public-f net.minecraft.world.level.chunk.ChunkGenerator strongholdSeed
+
+# More Sculk Sensor API
+public-f net.minecraft.world.level.gameevent.vibrations.VibrationListener listenerRange
+
+# Fix custom inventory holders
+public-f net.minecraft.world.inventory.AbstractContainerMenu dataSlots
+public-f net.minecraft.world.inventory.AbstractContainerMenu remoteDataSlots
+
+# Fix falling block spawn methods
+public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
+
+# Fix cancelling ProjectileHitEvent for piercing arrows
+protected net.minecraft.world.entity.projectile.Projectile hitCancelled
+
+# Expose firework item directly + manually setting flight ticks
+public net.minecraft.world.entity.projectile.FireworkRocketEntity life
+
+# More Projectile API
+public net.minecraft.world.entity.projectile.FishingHook timeUntilLured
+
+# Teleport API
+public net.minecraft.server.network.ServerGamePacketListenerImpl internalTeleport(DDDFFLjava/util/Set;Z)V
+

build-data/reobf-mappings-patch.tiny

@@ -14,22 +14,15 @@ tiny	2	0	mojang+yarn	spigot
 
 # CraftBukkit changes type
 c	net/minecraft/server/level/ServerLevel	net/minecraft/server/level/WorldServer
-	f	Lnet/minecraft/world/level/storage/PrimaryLevelData;	serverLevelData	J
+	f	Lnet/minecraft/world/level/storage/PrimaryLevelData;	serverLevelData	N
 
 c	net/minecraft/world/level/chunk/LevelChunk	net/minecraft/world/level/chunk/Chunk
 	f	Lnet/minecraft/server/level/ServerLevel;	level	q
 
 # See mappings-patch.tiny
 c	net/minecraft/server/level/ChunkMap	net/minecraft/server/level/PlayerChunkMap
-	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	G
+	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	F
 
 # Paper changes type
 c	net/minecraft/core/MappedRegistry	net/minecraft/core/RegistryMaterials
-	f	Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap;	toId	e
-
-# upstream makes a bunch of methods public that cause accidental overrides now
-c	net/minecraft/world/entity/Display	net/minecraft/world/entity/Display
-	m	()I	getInterpolationDelay	getInterpolationDelay_
-	m	(I)V	setInterpolationDelay	setInterpolationDelay_
-	m	(I)V	setInterpolationDuration	setInterpolationDuration_
-
+	f	Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap;	toId	bT

build.gradle.kts

@@ -4,8 +4,8 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 plugins {
     java
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "8.1.0" apply false
-    id("io.papermc.paperweight.core") version "1.5.3"
+    id("com.github.johnrengelman.shadow") version "7.1.2" apply false
+    id("io.papermc.paperweight.core") version "1.3.8"
 }
 
 allprojects {
@@ -61,9 +61,9 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.19.4+build.1:mergedv2")
-    remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
-    decompiler("net.minecraftforge:forgeflower:2.0.627.2")
+    paramMappings("net.fabricmc:yarn:1.19.2+build.1:mergedv2")
+    remapper("net.fabricmc:tiny-remapper:0.8.2:fat")
+    decompiler("net.minecraftforge:forgeflower:1.5.605.7")
     spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6")
     paperclip("io.papermc:paperclip:3.0.2")
 }
@@ -131,11 +131,6 @@ allprojects {
     }
 }
 
-tasks.collectAtsFromPatches {
-    // Uncomment while updating for a new Minecraft version
-    // extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server"))
-}
-
 tasks.register("printMinecraftVersion") {
     doLast {
         println(providers.gradleProperty("mcVersion").get().trim())

gradle.properties

@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=1.19.4-R0.1-SNAPSHOT
-mcVersion=1.19.4
+version=1.19.2-R0.1-SNAPSHOT
+mcVersion=1.19.2
 
 org.gradle.caching=true
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
-networkTimeout=10000
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,11 +80,11 @@ do
     esac
 done
 
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
@@ -143,16 +143,12 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -209,12 +205,6 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

licenses/GPL.md

@@ -672,4 +672,4 @@ program into proprietary programs. If your program is a subroutine
 library, you may consider it more useful to permit linking proprietary
 applications with the library. If this is what you want to do, use the
 GNU Lesser General Public License instead of this License. But first,
-please read <https://www.gnu.org/licenses/why-not-lgpl.html>.
+please read <https://www.gnu.org/licenses/why-not-lgpl.html>.

patches/api/0001-Convert-project-to-Gradle.patch

@@ -27,10 +27,10 @@ index 11038da2e071699d6561a331565db0c8d7850d0e..317acfec5894101294a55abff6181943
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..17e8858e01d80c422947f507e9d77b7532788752
+index 0000000000000000000000000000000000000000..16776e693165758e47152eb6726969426f180f14
 --- /dev/null
 +++ b/build.gradle.kts
-@@ -0,0 +1,82 @@
+@@ -0,0 +1,81 @@
 +plugins {
 +    `java-library`
 +    `maven-publish`
@@ -43,11 +43,10 @@ index 0000000000000000000000000000000000000000..17e8858e01d80c422947f507e9d77b75
 +
 +dependencies {
 +    // api dependencies are listed transitively to API consumers
-+    api("com.google.guava:guava:31.1-jre")
-+    api("com.google.code.gson:gson:2.10")
++    api("com.google.guava:guava:31.0.1-jre")
++    api("com.google.code.gson:gson:2.8.9")
 +    api("net.md-5:bungeecord-chat:1.16-R0.4")
-+    api("org.yaml:snakeyaml:1.33")
-+    api("org.joml:joml:1.10.5")
++    api("org.yaml:snakeyaml:1.32")
 +
 +    compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 +    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
@@ -60,7 +59,7 @@ index 0000000000000000000000000000000000000000..17e8858e01d80c422947f507e9d77b75
 +    testImplementation("org.apache.commons:commons-lang3:3.12.0")
 +    testImplementation("junit:junit:4.13.2")
 +    testImplementation("org.hamcrest:hamcrest-library:1.3")
-+    testImplementation("org.ow2.asm:asm-tree:9.4")
++    testImplementation("org.ow2.asm:asm-tree:9.3")
 +}
 +
 +configure<PublishingExtension> {
@@ -97,7 +96,7 @@ index 0000000000000000000000000000000000000000..17e8858e01d80c422947f507e9d77b75
 +    options.isDocFilesSubDirs = true
 +    options.links(
 +        "https://guava.dev/releases/31.0.1-jre/api/docs/",
-+        "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/",
++        "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/",
 +        "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
 +    )
@@ -115,10 +114,10 @@ index 0000000000000000000000000000000000000000..17e8858e01d80c422947f507e9d77b75
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 829ebece9d376cbade1422c58759540054fbedbe..0000000000000000000000000000000000000000
+index 9909fc466d96023f0b574a9bd2a2330d433d4400..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
-@@ -1,261 +0,0 @@
+@@ -1,252 +0,0 @@
 -
 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -126,7 +125,7 @@ index 829ebece9d376cbade1422c58759540054fbedbe..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.19.4-R0.1-SNAPSHOT</version>
+-    <version>1.19.2-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>
@@ -156,21 +155,14 @@ index 829ebece9d376cbade1422c58759540054fbedbe..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>com.google.guava</groupId>
 -            <artifactId>guava</artifactId>
--            <version>31.1-jre</version>
+-            <version>31.0.1-jre</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- bundled with Minecraft, should be kept in sync -->
 -        <dependency>
 -            <groupId>com.google.code.gson</groupId>
 -            <artifactId>gson</artifactId>
--            <version>2.10</version>
--            <scope>compile</scope>
--        </dependency>
--        <!-- bundled with Minecraft, should be kept in sync -->
--        <dependency>
--            <groupId>org.joml</groupId>
--            <artifactId>joml</artifactId>
--            <version>1.10.5</version>
+-            <version>2.8.9</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <dependency>
@@ -183,7 +175,7 @@ index 829ebece9d376cbade1422c58759540054fbedbe..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.yaml</groupId>
 -            <artifactId>snakeyaml</artifactId>
--            <version>1.33</version>
+-            <version>1.32</version>
 -            <scope>compile</scope>
 -        </dependency>
 -        <!-- not part of the API proper -->
@@ -228,7 +220,7 @@ index 829ebece9d376cbade1422c58759540054fbedbe..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.ow2.asm</groupId>
 -            <artifactId>asm-tree</artifactId>
--            <version>9.4</version>
+-            <version>9.3</version>
 -            <scope>test</scope>
 -        </dependency>
 -    </dependencies>
@@ -282,7 +274,7 @@ index 829ebece9d376cbade1422c58759540054fbedbe..00000000000000000000000000000000
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-shade-plugin</artifactId>
--                <version>3.4.1</version>
+-                <version>3.2.4</version>
 -                <executions>
 -                    <execution>
 -                        <phase>package</phase>
@@ -302,8 +294,6 @@ index 829ebece9d376cbade1422c58759540054fbedbe..00000000000000000000000000000000
 -                    </filters>
 -                    <!-- when downloading via Maven we can pull depends individually -->
 -                    <shadedArtifactAttached>true</shadedArtifactAttached>
--                    <!-- In 3.3.0 and later, shadedArtifactAttached causes dependant projects to use dependency reduced pom (bug?) -->
--                    <createDependencyReducedPom>false</createDependencyReducedPom>
 -                </configuration>
 -            </plugin>
 -            <plugin>

patches/api/0002-Build-system-changes.patch

@@ -5,13 +5,13 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 17e8858e01d80c422947f507e9d77b7532788752..82444d3b95881702910369ec5694dd9f327ad81a 100644
+index 16776e693165758e47152eb6726969426f180f14..850afb1ae533bfd80ba4cc062a4394123ad22dba 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -15,15 +15,27 @@ dependencies {
+@@ -14,15 +14,27 @@ dependencies {
+     api("com.google.code.gson:gson:2.8.9")
      api("net.md-5:bungeecord-chat:1.16-R0.4")
-     api("org.yaml:snakeyaml:1.33")
-     api("org.joml:joml:1.10.5")
+     api("org.yaml:snakeyaml:1.32")
 +    // Paper start
 +    api("com.googlecode.json-simple:json-simple:1.1.1") {
 +        isTransitive = false // includes junit
@@ -37,16 +37,16 @@ index 17e8858e01d80c422947f507e9d77b7532788752..82444d3b95881702910369ec5694dd9f
      testImplementation("org.apache.commons:commons-lang3:3.12.0")
      testImplementation("junit:junit:4.13.2")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
-@@ -65,7 +77,7 @@ tasks.withType<Javadoc> {
+@@ -64,7 +76,7 @@ tasks.withType<Javadoc> {
      options.links(
          "https://guava.dev/releases/31.0.1-jre/api/docs/",
-         "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/",
+         "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/",
 -        "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations
          "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
      )
  
-@@ -80,3 +92,14 @@ tasks.withType<Javadoc> {
+@@ -79,3 +91,14 @@ tasks.withType<Javadoc> {
          }
      }
  }

patches/api/0003-Annotation-Test-changes.patch

@@ -0,0 +1,114 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <theboyetronic@gmail.com>
+Date: Sun, 17 Mar 2019 23:04:30 +0000
+Subject: [PATCH] Annotation Test changes
+
+- Allow use of TYPE_USE annotations
+- Ignore package-private methods for nullability annotations
+- Add excludes for classes which don't pass
+
+diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
+index 4ac3dd977e75cd8464163351d306e037ee32cb48..1a71bb8861150c1add6446aa2fad0f7035dd6873 100644
+--- a/src/test/java/org/bukkit/AnnotationTest.java
++++ b/src/test/java/org/bukkit/AnnotationTest.java
+@@ -40,7 +40,17 @@ public class AnnotationTest {
+         "org/bukkit/util/io/Wrapper",
+         "org/bukkit/plugin/java/PluginClassLoader",
+         // Generic functional interface
+-        "org/bukkit/util/Consumer"
++        "org/bukkit/util/Consumer",
++        // Paper start
++        // Timings history is broken in terms of nullability due to guavas Function defining that the param is NonNull
++        "co/aikar/timings/TimingHistory$2",
++        "co/aikar/timings/TimingHistory$2$1",
++        "co/aikar/timings/TimingHistory$2$1$1",
++        "co/aikar/timings/TimingHistory$2$1$2",
++        "co/aikar/timings/TimingHistory$3",
++        "co/aikar/timings/TimingHistory$4",
++        "co/aikar/timings/TimingHistoryEntry$1"
++        // Paper end
+     };
+ 
+     @Test
+@@ -67,14 +77,40 @@ public class AnnotationTest {
+                 }
+ 
+                 if (mustBeAnnotated(Type.getReturnType(method.desc)) && !isWellAnnotated(method.invisibleAnnotations)) {
++                    // Paper start - Allow use of TYPE_USE annotations
++                    boolean warn = true;
++                    if (isWellAnnotated(method.visibleTypeAnnotations)) {
++                        warn = false;
++                    } else if (method.invisibleTypeAnnotations != null) {
++                        dance: for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : method.invisibleTypeAnnotations) {
++                            final org.objectweb.asm.TypeReference ref = new org.objectweb.asm.TypeReference(invisibleTypeAnnotation.typeRef);
++                            if (ref.getSort() == org.objectweb.asm.TypeReference.METHOD_RETURN && java.util.Arrays.binarySearch(ACCEPTED_ANNOTATIONS, invisibleTypeAnnotation.desc) >= 0) {
++                                warn = false;
++                                break dance; // cha cha real smooth
++                            }
++                        }
++                    }
++                    if (warn)
++                    // Paper end
+                     warn(errors, clazz, method, "return value");
+                 }
+ 
+                 Type[] paramTypes = Type.getArgumentTypes(method.desc);
+                 List<ParameterNode> parameters = method.parameters;
+ 
++                dancing: // Paper
+                 for (int i = 0; i < paramTypes.length; i++) {
+                     if (mustBeAnnotated(paramTypes[i]) ^ isWellAnnotated(method.invisibleParameterAnnotations == null ? null : method.invisibleParameterAnnotations[i])) {
++                        // Paper start
++                        if (method.invisibleTypeAnnotations != null) {
++                            for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : method.invisibleTypeAnnotations) {
++                                final org.objectweb.asm.TypeReference ref = new org.objectweb.asm.TypeReference(invisibleTypeAnnotation.typeRef);
++                                if (ref.getSort() == org.objectweb.asm.TypeReference.METHOD_FORMAL_PARAMETER && ref.getTypeParameterIndex() == i && java.util.Arrays.binarySearch(ACCEPTED_ANNOTATIONS, invisibleTypeAnnotation.desc) >= 0) {
++                                    continue dancing;
++                                }
++                            }
++                        }
++                        // Paper end - Allow use of TYPE_USE annotations
+                         ParameterNode paramNode = parameters == null ? null : parameters.get(i);
+                         String paramName = paramNode == null ? null : paramNode.name;
+ 
+@@ -91,13 +127,18 @@ public class AnnotationTest {
+ 
+         Collections.sort(errors);
+ 
+-        System.out.println(errors.size() + " missing annotation(s):");
++        StringBuilder builder = new StringBuilder()
++            .append("There ")
++            .append(errors.size() != 1 ? "are " : "is ")
++            .append(errors.size())
++            .append(" missing annotation")
++            .append(errors.size() != 1 ? "s:\n" : ":\n");
++
+         for (String message : errors) {
+-            System.out.print("\t");
+-            System.out.println(message);
++            builder.append("\t").append(message).append("\n");
+         }
+ 
+-        Assert.fail("There " + errors.size() + " are missing annotation(s)");
++        Assert.fail(builder.toString());
+     }
+ 
+     private static void collectClasses(@NotNull File from, @NotNull Map<String, ClassNode> to) throws IOException {
+@@ -152,7 +193,7 @@ public class AnnotationTest {
+ 
+     private static boolean isMethodIncluded(@NotNull ClassNode clazz, @NotNull MethodNode method, @NotNull Map<String, ClassNode> allClasses) {
+         // Exclude private, synthetic and deprecated methods
+-        if ((method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_DEPRECATED)) != 0) {
++        if ((method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_DEPRECATED)) != 0 || (method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED | Opcodes.ACC_PUBLIC)) == 0) { // Paper - ignore package-private
+             return false;
+         }
+ 
+@@ -174,7 +215,7 @@ public class AnnotationTest {
+         return true;
+     }
+ 
+-    private static boolean isWellAnnotated(@Nullable List<AnnotationNode> annotations) {
++    private static boolean isWellAnnotated(@Nullable List<? extends AnnotationNode> annotations) { // Paper
+         if (annotations == null) {
+             return false;
+         }

patches/api/0003-Test-changes.patch

@@ -1,513 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 17 Mar 2019 23:04:30 +0000
-Subject: [PATCH] Test changes
-
-- convert to mockito for mocking of types
-- Allow use of TYPE_USE annotations
-- Ignore package-private methods for nullability annotations
-- Add excludes for classes which don't pass
-
-Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 82444d3b95881702910369ec5694dd9f327ad81a..c06eda648d8626c86afb2140d6a583ddf82f295c 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -35,6 +35,7 @@ dependencies {
-     compileOnlyApi(checkerQual)
-     testCompileOnly(checkerQual)
-     // Paper end
-+    testImplementation("org.mockito:mockito-core:4.9.0") // Paper - add mockito
- 
-     testImplementation("org.apache.commons:commons-lang3:3.12.0")
-     testImplementation("junit:junit:4.13.2")
-diff --git a/src/test/java/io/papermc/paper/testing/EmptyRegistry.java b/src/test/java/io/papermc/paper/testing/EmptyRegistry.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ba9ddce87a9f385e729a5c2cf7c5eec120e388a7
---- /dev/null
-+++ b/src/test/java/io/papermc/paper/testing/EmptyRegistry.java
-@@ -0,0 +1,23 @@
-+package io.papermc.paper.testing;
-+
-+import java.util.Collections;
-+import java.util.Iterator;
-+import org.bukkit.Keyed;
-+import org.bukkit.NamespacedKey;
-+import org.bukkit.Registry;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+public record EmptyRegistry() implements Registry<Keyed> {
-+
-+    @NotNull
-+    @Override
-+    public Iterator<Keyed> iterator() {
-+        return Collections.emptyIterator();
-+    }
-+
-+    @Override
-+    public @Nullable Keyed get(@NotNull final NamespacedKey key) {
-+        return null;
-+    }
-+}
-diff --git a/src/test/java/io/papermc/paper/testing/EmptyTag.java b/src/test/java/io/papermc/paper/testing/EmptyTag.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..77154095cfb8b259bdb318e8ff40cb6f559ebc18
---- /dev/null
-+++ b/src/test/java/io/papermc/paper/testing/EmptyTag.java
-@@ -0,0 +1,31 @@
-+package io.papermc.paper.testing;
-+
-+import java.util.Collections;
-+import java.util.Set;
-+import org.bukkit.Keyed;
-+import org.bukkit.NamespacedKey;
-+import org.bukkit.Tag;
-+import org.jetbrains.annotations.NotNull;
-+
-+public record EmptyTag(NamespacedKey key) implements Tag<Keyed> {
-+
-+    @SuppressWarnings("deprecation")
-+    public EmptyTag() {
-+        this(NamespacedKey.randomKey());
-+    }
-+
-+    @Override
-+    public @NotNull NamespacedKey getKey() {
-+        return this.key;
-+    }
-+
-+    @Override
-+    public boolean isTagged(@NotNull final Keyed item) {
-+        return false;
-+    }
-+
-+    @Override
-+    public @NotNull Set<Keyed> getValues() {
-+        return Collections.emptySet();
-+    }
-+}
-diff --git a/src/test/java/io/papermc/paper/testing/TestServer.java b/src/test/java/io/papermc/paper/testing/TestServer.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..756acf231b1b076b08046d86992ba7ce7f62a94f
---- /dev/null
-+++ b/src/test/java/io/papermc/paper/testing/TestServer.java
-@@ -0,0 +1,48 @@
-+package io.papermc.paper.testing;
-+
-+import java.util.logging.Logger;
-+import org.bukkit.Bukkit;
-+import org.bukkit.NamespacedKey;
-+import org.bukkit.Server;
-+import org.bukkit.command.SimpleCommandMap;
-+import org.bukkit.plugin.PluginManager;
-+import org.bukkit.plugin.SimplePluginManager;
-+
-+import static org.mockito.ArgumentMatchers.anyString;
-+import static org.mockito.Mockito.any;
-+import static org.mockito.Mockito.mock;
-+import static org.mockito.Mockito.when;
-+
-+public final class TestServer {
-+
-+    @SuppressWarnings("removal")
-+    public static void setup() {
-+        //noinspection ConstantValue
-+        if (Bukkit.getServer() != null) {
-+            return;
-+        }
-+
-+        final Server dummyServer = mock(Server.class);
-+
-+        final Logger logger = Logger.getLogger(TestServer.class.getCanonicalName());
-+        when(dummyServer.getLogger()).thenReturn(logger);
-+        when(dummyServer.getName()).thenReturn(TestServer.class.getSimpleName());
-+        when(dummyServer.getVersion()).thenReturn("Version_" + TestServer.class.getPackage().getImplementationVersion());
-+        when(dummyServer.getBukkitVersion()).thenReturn("BukkitVersion_" + TestServer.class.getPackage().getImplementationVersion());
-+
-+
-+        final Thread currentThread = Thread.currentThread();
-+        when(dummyServer.isPrimaryThread()).thenAnswer(ignored -> Thread.currentThread().equals(currentThread));
-+
-+        when(dummyServer.getTag(anyString(), any(NamespacedKey.class), any())).thenAnswer(ignored -> new EmptyTag());
-+
-+        final PluginManager pluginManager = new SimplePluginManager(dummyServer, new SimpleCommandMap(dummyServer));
-+        when(dummyServer.getPluginManager()).thenReturn(pluginManager);
-+
-+        when(dummyServer.getRegistry(any())).thenAnswer(ignored -> new EmptyRegistry());
-+        when(dummyServer.getScoreboardCriteria(anyString())).thenReturn(null);
-+
-+        Bukkit.setServer(dummyServer);
-+    }
-+
-+}
-diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 4ac3dd977e75cd8464163351d306e037ee32cb48..8f35cda0d67ec66646c6096a5bf1c84891b8b0fd 100644
---- a/src/test/java/org/bukkit/AnnotationTest.java
-+++ b/src/test/java/org/bukkit/AnnotationTest.java
-@@ -40,7 +40,17 @@ public class AnnotationTest {
-         "org/bukkit/util/io/Wrapper",
-         "org/bukkit/plugin/java/PluginClassLoader",
-         // Generic functional interface
--        "org/bukkit/util/Consumer"
-+        "org/bukkit/util/Consumer",
-+        // Paper start
-+        // Timings history is broken in terms of nullability due to guavas Function defining that the param is NonNull
-+        "co/aikar/timings/TimingHistory$2",
-+        "co/aikar/timings/TimingHistory$2$1",
-+        "co/aikar/timings/TimingHistory$2$1$1",
-+        "co/aikar/timings/TimingHistory$2$1$2",
-+        "co/aikar/timings/TimingHistory$3",
-+        "co/aikar/timings/TimingHistory$4",
-+        "co/aikar/timings/TimingHistoryEntry$1"
-+        // Paper end
-     };
- 
-     @Test
-@@ -67,14 +77,40 @@ public class AnnotationTest {
-                 }
- 
-                 if (mustBeAnnotated(Type.getReturnType(method.desc)) && !isWellAnnotated(method.invisibleAnnotations)) {
-+                    // Paper start - Allow use of TYPE_USE annotations
-+                    boolean warn = true;
-+                    if (isWellAnnotated(method.visibleTypeAnnotations)) {
-+                        warn = false;
-+                    } else if (method.invisibleTypeAnnotations != null) {
-+                        dance: for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : method.invisibleTypeAnnotations) {
-+                            final org.objectweb.asm.TypeReference ref = new org.objectweb.asm.TypeReference(invisibleTypeAnnotation.typeRef);
-+                            if (ref.getSort() == org.objectweb.asm.TypeReference.METHOD_RETURN && java.util.Arrays.binarySearch(ACCEPTED_ANNOTATIONS, invisibleTypeAnnotation.desc) >= 0) {
-+                                warn = false;
-+                                break dance; // cha cha real smooth
-+                            }
-+                        }
-+                    }
-+                    if (warn)
-+                    // Paper end
-                     warn(errors, clazz, method, "return value");
-                 }
- 
-                 Type[] paramTypes = Type.getArgumentTypes(method.desc);
-                 List<ParameterNode> parameters = method.parameters;
- 
-+                dancing: // Paper
-                 for (int i = 0; i < paramTypes.length; i++) {
-                     if (mustBeAnnotated(paramTypes[i]) ^ isWellAnnotated(method.invisibleParameterAnnotations == null ? null : method.invisibleParameterAnnotations[i])) {
-+                        // Paper start
-+                        if (method.invisibleTypeAnnotations != null) {
-+                            for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : method.invisibleTypeAnnotations) {
-+                                final org.objectweb.asm.TypeReference ref = new org.objectweb.asm.TypeReference(invisibleTypeAnnotation.typeRef);
-+                                if (ref.getSort() == org.objectweb.asm.TypeReference.METHOD_FORMAL_PARAMETER && ref.getTypeParameterIndex() == i && java.util.Arrays.binarySearch(ACCEPTED_ANNOTATIONS, invisibleTypeAnnotation.desc) >= 0) {
-+                                    continue dancing;
-+                                }
-+                            }
-+                        }
-+                        // Paper end - Allow use of TYPE_USE annotations
-                         ParameterNode paramNode = parameters == null ? null : parameters.get(i);
-                         String paramName = paramNode == null ? null : paramNode.name;
- 
-@@ -91,13 +127,18 @@ public class AnnotationTest {
- 
-         Collections.sort(errors);
- 
--        System.out.println(errors.size() + " missing annotation(s):");
-+        StringBuilder builder = new StringBuilder()
-+            .append("There ")
-+            .append(errors.size() != 1 ? "are " : "is ")
-+            .append(errors.size())
-+            .append(" missing annotation")
-+            .append(errors.size() != 1 ? "s:\n" : ":\n");
-+
-         for (String message : errors) {
--            System.out.print("\t");
--            System.out.println(message);
-+            builder.append("\t").append(message).append("\n");
-         }
- 
--        Assert.fail("There " + errors.size() + " are missing annotation(s)");
-+        Assert.fail(builder.toString());
-     }
- 
-     private static void collectClasses(@NotNull File from, @NotNull Map<String, ClassNode> to) throws IOException {
-@@ -140,6 +181,11 @@ public class AnnotationTest {
-             // Exceptions are excluded
-             return false;
-         }
-+        // Paper start
-+        if (isInternal(clazz.invisibleAnnotations)) {
-+            return false;
-+        }
-+        // Paper end
- 
-         for (String excludedClass : EXCLUDED_CLASSES) {
-             if (excludedClass.equals(clazz.name)) {
-@@ -152,7 +198,7 @@ public class AnnotationTest {
- 
-     private static boolean isMethodIncluded(@NotNull ClassNode clazz, @NotNull MethodNode method, @NotNull Map<String, ClassNode> allClasses) {
-         // Exclude private, synthetic and deprecated methods
--        if ((method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_DEPRECATED)) != 0) {
-+        if ((method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_DEPRECATED)) != 0 || (method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED | Opcodes.ACC_PUBLIC)) == 0) { // Paper - ignore package-private
-             return false;
-         }
- 
-@@ -170,11 +216,30 @@ public class AnnotationTest {
-         if ("<init>".equals(method.name) && isAnonymous(clazz)) {
-             return false;
-         }
-+        // Paper start
-+        if (isInternal(method.invisibleAnnotations)) {
-+            return false;
-+        }
-+        // Paper end
- 
-         return true;
-     }
-+    // Paper start
-+    private static boolean isInternal(List<? extends AnnotationNode> annotations) {
-+        if (annotations == null) {
-+            return false;
-+        }
-+        for (AnnotationNode node : annotations) {
-+            if (node.desc.equals("Lorg/jetbrains/annotations/ApiStatus$Internal;")) {
-+                return true;
-+            }
-+        }
-+
-+        return false;
-+    }
-+    // Paper end
- 
--    private static boolean isWellAnnotated(@Nullable List<AnnotationNode> annotations) {
-+    private static boolean isWellAnnotated(@Nullable List<? extends AnnotationNode> annotations) { // Paper
-         if (annotations == null) {
-             return false;
-         }
-diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java
-deleted file mode 100644
-index 701a17c10f31cd345238a3c568264178ce372faa..0000000000000000000000000000000000000000
---- a/src/test/java/org/bukkit/TestServer.java
-+++ /dev/null
-@@ -1,139 +0,0 @@
--package org.bukkit;
--
--import com.google.common.collect.ImmutableMap;
--import java.lang.reflect.InvocationHandler;
--import java.lang.reflect.Method;
--import java.lang.reflect.Proxy;
--import java.util.Iterator;
--import java.util.Map;
--import java.util.logging.Logger;
--import org.bukkit.command.SimpleCommandMap;
--import org.bukkit.plugin.PluginManager;
--import org.bukkit.plugin.SimplePluginManager;
--import org.jetbrains.annotations.NotNull;
--import org.jetbrains.annotations.Nullable;
--
--public final class TestServer implements InvocationHandler {
--    private static interface MethodHandler {
--        Object handle(TestServer server, Object[] args);
--    }
--
--    private static final Map<Method, MethodHandler> methods;
--
--    static {
--        try {
--            ImmutableMap.Builder<Method, MethodHandler> methodMap = ImmutableMap.builder();
--            methodMap.put(
--                    Server.class.getMethod("isPrimaryThread"),
--                    new MethodHandler() {
--                        @Override
--                        public Object handle(TestServer server, Object[] args) {
--                            return Thread.currentThread().equals(server.creatingThread);
--                        }
--                    }
--                );
--            methodMap.put(
--                    Server.class.getMethod("getPluginManager"),
--                    new MethodHandler() {
--                        @Override
--                        public Object handle(TestServer server, Object[] args) {
--                            return server.pluginManager;
--                        }
--                    }
--                );
--            methodMap.put(
--                    Server.class.getMethod("getLogger"),
--                    new MethodHandler() {
--                        final Logger logger = Logger.getLogger(TestServer.class.getCanonicalName());
--                        @Override
--                        public Object handle(TestServer server, Object[] args) {
--                            return logger;
--                        }
--                    }
--                );
--            methodMap.put(
--                    Server.class.getMethod("getName"),
--                    new MethodHandler() {
--                        @Override
--                        public Object handle(TestServer server, Object[] args) {
--                            return TestServer.class.getSimpleName();
--                        }
--                    }
--                );
--            methodMap.put(
--                    Server.class.getMethod("getVersion"),
--                    new MethodHandler() {
--                        @Override
--                        public Object handle(TestServer server, Object[] args) {
--                            return "Version_" + TestServer.class.getPackage().getImplementationVersion();
--                        }
--                    }
--                );
--            methodMap.put(
--                    Server.class.getMethod("getBukkitVersion"),
--                    new MethodHandler() {
--                        @Override
--                        public Object handle(TestServer server, Object[] args) {
--                            return "BukkitVersion_" + TestServer.class.getPackage().getImplementationVersion();
--                        }
--                    }
--                );
--            methodMap.put(
--                    Server.class.getMethod("getRegistry", Class.class),
--                    new MethodHandler() {
--                        @Override
--                        public Object handle(TestServer server, Object[] args) {
--                            return new Registry() {
--                                @NotNull
--                                @Override
--                                public Iterator iterator() {
--                                    return null;
--                                }
--
--                                @Nullable
--                                @Override
--                                public Keyed get(@NotNull NamespacedKey key) {
--                                    return null;
--                                }
--                            };
--                        }
--                    }
--                );
--            methodMap.put(
--                    Server.class.getMethod("getScoreboardCriteria", String.class),
--                    new MethodHandler() {
--                        @Override
--                        public Object handle(TestServer server, Object[] args) {
--                            // Does not need to return anything. Exists solely to test CriteriaTest which has static init fields
--                            return null;
--                        }
--                    }
--                );
--            methods = methodMap.build();
--
--            TestServer server = new TestServer();
--            Server instance = Proxy.getProxyClass(Server.class.getClassLoader(), Server.class).asSubclass(Server.class).getConstructor(InvocationHandler.class).newInstance(server);
--            Bukkit.setServer(instance);
--            server.pluginManager = new SimplePluginManager(instance, new SimpleCommandMap(instance));
--        } catch (Throwable t) {
--            throw new Error(t);
--        }
--    }
--
--    private Thread creatingThread = Thread.currentThread();
--    private PluginManager pluginManager;
--    private TestServer() {};
--
--    public static Server getInstance() {
--        return Bukkit.getServer();
--    }
--
--    @Override
--    public Object invoke(Object proxy, Method method, Object[] args) {
--        MethodHandler handler = methods.get(method);
--        if (handler != null) {
--            return handler.handle(this, args);
--        }
--        throw new UnsupportedOperationException(String.valueOf(method));
--    }
--}
-diff --git a/src/test/java/org/bukkit/TestWorld.java b/src/test/java/org/bukkit/TestWorld.java
-index ab34f1199921d415fa2ca6e281a8125c9e6d7173..f64d024f5bbf9482aaddb56597b23b04c66f21bf 100644
---- a/src/test/java/org/bukkit/TestWorld.java
-+++ b/src/test/java/org/bukkit/TestWorld.java
-@@ -18,7 +18,7 @@ public final class TestWorld implements InvocationHandler {
- 
-     static {
-         try {
--            TestServer.getInstance();
-+            io.papermc.paper.testing.TestServer.setup(); // Paper
- 
-             ImmutableMap.Builder<Method, MethodHandler> methodMap = ImmutableMap.builder();
-             methodMap.put(
-diff --git a/src/test/java/org/bukkit/event/SyntheticEventTest.java b/src/test/java/org/bukkit/event/SyntheticEventTest.java
-index d402cb59f508205ebe9ee450594826b04cecb90b..09886568ae6167141b463b6262565fa212af3385 100644
---- a/src/test/java/org/bukkit/event/SyntheticEventTest.java
-+++ b/src/test/java/org/bukkit/event/SyntheticEventTest.java
-@@ -1,6 +1,5 @@
- package org.bukkit.event;
- 
--import org.bukkit.TestServer;
- import org.bukkit.plugin.PluginLoader;
- import org.bukkit.plugin.SimplePluginManager;
- import org.bukkit.plugin.TestPlugin;
-@@ -12,14 +11,15 @@ public class SyntheticEventTest {
-     @SuppressWarnings("deprecation")
-     @Test
-     public void test() {
--        final JavaPluginLoader loader = new JavaPluginLoader(TestServer.getInstance());
-+        io.papermc.paper.testing.TestServer.setup(); // Paper
-+        final JavaPluginLoader loader = new JavaPluginLoader(org.bukkit.Bukkit.getServer()); // Paper
-         TestPlugin plugin = new TestPlugin(getClass().getName()) {
-             @Override
-             public PluginLoader getPluginLoader() {
-                 return loader;
-             }
-         };
--        SimplePluginManager pluginManager = new SimplePluginManager(TestServer.getInstance(), null);
-+        SimplePluginManager pluginManager = new SimplePluginManager(org.bukkit.Bukkit.getServer(), null); // Paper
- 
-         TestEvent event = new TestEvent(false);
-         Impl impl = new Impl();
-diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
-index f188cd4f3b07027c30d41f1162db77a506b7b6bb..c46ed2acb82db814d660459b705dd49e6d44240f 100644
---- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java
-+++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
-@@ -2,7 +2,6 @@ package org.bukkit.plugin;
- 
- import static org.hamcrest.Matchers.*;
- import static org.junit.Assert.*;
--import org.bukkit.TestServer;
- import org.bukkit.event.Event;
- import org.bukkit.event.TestEvent;
- import org.bukkit.permissions.Permission;
-@@ -14,7 +13,7 @@ public class PluginManagerTest {
-         volatile Object value = null;
-     }
- 
--    private static final PluginManager pm = TestServer.getInstance().getPluginManager();
-+    private static final PluginManager pm = org.bukkit.Bukkit.getServer().getPluginManager(); // Paper
- 
-     private final MutableObject store = new MutableObject();
- 
-diff --git a/src/test/java/org/bukkit/scoreboard/CriteriaTest.java b/src/test/java/org/bukkit/scoreboard/CriteriaTest.java
-index eb94b6f4d58cd9f66b07791c57af7e359992e28c..a93f28e2f987a36e2c7e4f7d31506b750bdb222b 100644
---- a/src/test/java/org/bukkit/scoreboard/CriteriaTest.java
-+++ b/src/test/java/org/bukkit/scoreboard/CriteriaTest.java
-@@ -2,7 +2,6 @@ package org.bukkit.scoreboard;
- 
- import org.bukkit.Material;
- import org.bukkit.Statistic;
--import org.bukkit.TestServer;
- import org.bukkit.entity.EntityType;
- import org.junit.Assert;
- import org.junit.Test;
-@@ -11,7 +10,7 @@ public class CriteriaTest {
- 
-     @Test
-     public void testStatistic() {
--        TestServer.getInstance();
-+        io.papermc.paper.testing.TestServer.setup(); // Paper
- 
-         Assert.assertThrows(IllegalArgumentException.class, () -> Criteria.statistic(Statistic.AVIATE_ONE_CM, Material.STONE)); // Generic statistic with block
-         Assert.assertThrows(IllegalArgumentException.class, () -> Criteria.statistic(Statistic.AVIATE_ONE_CM, EntityType.CREEPER)); // Generic statistic with entity type

patches/api/0004-Add-FastUtil-to-Bukkit.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c06eda648d8626c86afb2140d6a583ddf82f295c..464a209dbf52ebdfa287a553778a37c382a5405c 100644
+index 044b7c49b569e1170108c912e9307f7fec278762..f0423df165bf7d0f3fad21d26b64f31ba3e6aeee 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -19,6 +19,7 @@ dependencies {
+@@ -18,6 +18,7 @@ dependencies {
      api("com.googlecode.json-simple:json-simple:1.1.1") {
          isTransitive = false // includes junit
      }

patches/api/0007-Use-ASM-for-event-executors.patch

@@ -1,370 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Techcable <Techcable@outlook.com>
-Date: Thu, 3 Mar 2016 13:20:33 -0700
-Subject: [PATCH] Use ASM for event executors.
-
-Uses method handles for private or static methods.
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 23b1e7600d2507be60cb8543773b91f4851afb4f..d95b3d504ddc9ed76fc86cd45fa922d68e597827 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -40,6 +40,9 @@ dependencies {
-     apiAndDocs("net.kyori:adventure-text-serializer-legacy")
-     apiAndDocs("net.kyori:adventure-text-serializer-plain")
-     apiAndDocs("net.kyori:adventure-text-logger-slf4j")
-+
-+    implementation("org.ow2.asm:asm:9.4")
-+    implementation("org.ow2.asm:asm-commons:9.4")
-     // Paper end
- 
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
-diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..5b28e9b1daba7834af67dbc193dd656bedd9a994
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
-@@ -0,0 +1,42 @@
-+package com.destroystokyo.paper.event.executor;
-+
-+import java.lang.invoke.MethodHandle;
-+import java.lang.invoke.MethodHandles;
-+import java.lang.reflect.Method;
-+
-+import com.destroystokyo.paper.util.SneakyThrow;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.EventException;
-+import org.bukkit.event.Listener;
-+import org.bukkit.plugin.EventExecutor;
-+import org.jetbrains.annotations.NotNull;
-+
-+public class MethodHandleEventExecutor implements EventExecutor {
-+    private final Class<? extends Event> eventClass;
-+    private final MethodHandle handle;
-+
-+    public MethodHandleEventExecutor(@NotNull Class<? extends Event> eventClass, @NotNull MethodHandle handle) {
-+        this.eventClass = eventClass;
-+        this.handle = handle;
-+    }
-+
-+    public MethodHandleEventExecutor(@NotNull Class<? extends Event> eventClass, @NotNull Method m) {
-+        this.eventClass = eventClass;
-+        try {
-+            m.setAccessible(true);
-+            this.handle = MethodHandles.lookup().unreflect(m);
-+        } catch (IllegalAccessException e) {
-+            throw new AssertionError("Unable to set accessible", e);
-+        }
-+    }
-+
-+    @Override
-+    public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException {
-+        if (!eventClass.isInstance(event)) return;
-+        try {
-+            handle.invoke(listener, event);
-+        } catch (Throwable t) {
-+            SneakyThrow.sneaky(t);
-+        }
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..c83672427324bd068ed52916f700b68446a226f6
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
-@@ -0,0 +1,43 @@
-+package com.destroystokyo.paper.event.executor;
-+
-+import java.lang.invoke.MethodHandle;
-+import java.lang.invoke.MethodHandles;
-+import java.lang.reflect.Method;
-+import java.lang.reflect.Modifier;
-+
-+import com.destroystokyo.paper.util.SneakyThrow;
-+import com.google.common.base.Preconditions;
-+
-+import org.bukkit.Bukkit;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.EventException;
-+import org.bukkit.event.Listener;
-+import org.bukkit.plugin.EventExecutor;
-+import org.jetbrains.annotations.NotNull;
-+
-+public class StaticMethodHandleEventExecutor implements EventExecutor {
-+    private final Class<? extends Event> eventClass;
-+    private final MethodHandle handle;
-+
-+    public StaticMethodHandleEventExecutor(@NotNull Class<? extends Event> eventClass, @NotNull Method m) {
-+        Preconditions.checkArgument(Modifier.isStatic(m.getModifiers()), "Not a static method: %s", m);
-+        Preconditions.checkArgument(eventClass != null, "eventClass is null");
-+        this.eventClass = eventClass;
-+        try {
-+            m.setAccessible(true);
-+            this.handle = MethodHandles.lookup().unreflect(m);
-+        } catch (IllegalAccessException e) {
-+            throw new AssertionError("Unable to set accessible", e);
-+        }
-+    }
-+
-+    @Override
-+    public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException {
-+        if (!eventClass.isInstance(event)) return;
-+        try {
-+            handle.invoke(event);
-+        } catch (Throwable throwable) {
-+            SneakyThrow.sneaky(throwable);
-+        }
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..084c31af1a7ba32bb4c3dc8f16f67fd09ce0b6a4
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
-@@ -0,0 +1,54 @@
-+package com.destroystokyo.paper.event.executor.asm;
-+
-+import java.lang.reflect.Method;
-+import java.util.concurrent.atomic.AtomicInteger;
-+
-+import org.bukkit.plugin.EventExecutor;
-+import org.jetbrains.annotations.NotNull;
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.Type;
-+import org.objectweb.asm.commons.GeneratorAdapter;
-+
-+import static org.objectweb.asm.Opcodes.*;
-+
-+public class ASMEventExecutorGenerator {
-+
-+    private static final String EXECUTE_DESCRIPTOR = "(Lorg/bukkit/event/Listener;Lorg/bukkit/event/Event;)V";
-+
-+    @NotNull
-+    public static byte[] generateEventExecutor(@NotNull Method m, @NotNull String name) {
-+        ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
-+        writer.visit(V1_8, ACC_PUBLIC, name.replace('.', '/'), null, Type.getInternalName(Object.class), new String[] {Type.getInternalName(EventExecutor.class)});
-+        // Generate constructor
-+        GeneratorAdapter methodGenerator = new GeneratorAdapter(writer.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null), ACC_PUBLIC, "<init>", "()V");
-+        methodGenerator.loadThis();
-+        methodGenerator.visitMethodInsn(INVOKESPECIAL, Type.getInternalName(Object.class), "<init>", "()V", false); // Invoke the super class (Object) constructor
-+        methodGenerator.returnValue();
-+        methodGenerator.endMethod();
-+        // Generate the execute method
-+        methodGenerator = new GeneratorAdapter(writer.visitMethod(ACC_PUBLIC, "execute", EXECUTE_DESCRIPTOR, null, null), ACC_PUBLIC, "execute", EXECUTE_DESCRIPTOR);
-+        methodGenerator.loadArg(0);
-+        methodGenerator.checkCast(Type.getType(m.getDeclaringClass()));
-+        methodGenerator.loadArg(1);
-+        methodGenerator.checkCast(Type.getType(m.getParameterTypes()[0]));
-+        methodGenerator.visitMethodInsn(m.getDeclaringClass().isInterface() ? INVOKEINTERFACE : INVOKEVIRTUAL, Type.getInternalName(m.getDeclaringClass()), m.getName(), Type.getMethodDescriptor(m), m.getDeclaringClass().isInterface());
-+        // The only purpose of this switch statement is to generate the correct pop instruction, should the event handler method return something other than void.
-+        // Non-void event handlers will be unsupported in a future release.
-+        switch (Type.getType(m.getReturnType()).getSize()) {
-+            // case 0 is omitted because the only type that has size 0 is void - no pop instruction needed.
-+            case 1 -> methodGenerator.pop(); // handles reference types and most primitives
-+            case 2 -> methodGenerator.pop2(); // handles long and double
-+        }
-+        methodGenerator.returnValue();
-+        methodGenerator.endMethod();
-+        writer.visitEnd();
-+        return writer.toByteArray();
-+    }
-+
-+    public static AtomicInteger NEXT_ID = new AtomicInteger(1);
-+    @NotNull
-+    public static String generateName() {
-+        int id = NEXT_ID.getAndIncrement();
-+        return "com.destroystokyo.paper.event.executor.asm.generated.GeneratedEventExecutor" + id;
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..f79685b48bb581277a6891927988b6f7a4389dc4
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
-@@ -0,0 +1,34 @@
-+package com.destroystokyo.paper.event.executor.asm;
-+
-+import org.jetbrains.annotations.NotNull;
-+
-+public interface ClassDefiner {
-+
-+    /**
-+     * Returns if the defined classes can bypass access checks
-+     *
-+     * @return if classes bypass access checks
-+     */
-+    public default boolean isBypassAccessChecks() {
-+        return false;
-+    }
-+
-+    /**
-+     * Define a class
-+     *
-+     * @param parentLoader the parent classloader
-+     * @param name         the name of the class
-+     * @param data         the class data to load
-+     * @return the defined class
-+     * @throws ClassFormatError     if the class data is invalid
-+     * @throws NullPointerException if any of the arguments are null
-+     */
-+    @NotNull
-+    public Class<?> defineClass(@NotNull ClassLoader parentLoader, @NotNull String name, @NotNull byte[] data);
-+
-+    @NotNull
-+    public static ClassDefiner getInstance() {
-+        return SafeClassDefiner.INSTANCE;
-+    }
-+
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ac99477e9f2c08041aeff31abc1d1edee58d0a67
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
-@@ -0,0 +1,66 @@
-+package com.destroystokyo.paper.event.executor.asm;
-+
-+import java.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentMap;
-+
-+import com.google.common.base.Preconditions;
-+
-+import com.google.common.collect.MapMaker;
-+import org.jetbrains.annotations.NotNull;
-+import org.objectweb.asm.Type;
-+
-+public class SafeClassDefiner implements ClassDefiner {
-+    /* default */ static final SafeClassDefiner INSTANCE = new SafeClassDefiner();
-+
-+    private SafeClassDefiner() {}
-+
-+    private final ConcurrentMap<ClassLoader, GeneratedClassLoader> loaders = new MapMaker().weakKeys().makeMap();
-+
-+    @NotNull
-+    @Override
-+    public Class<?> defineClass(@NotNull ClassLoader parentLoader, @NotNull String name, @NotNull byte[] data) {
-+        GeneratedClassLoader loader = loaders.computeIfAbsent(parentLoader, GeneratedClassLoader::new);
-+        synchronized (loader.getClassLoadingLock(name)) {
-+            Preconditions.checkState(!loader.hasClass(name), "%s already defined", name);
-+            Class<?> c = loader.define(name, data);
-+            assert c.getName().equals(name);
-+            return c;
-+        }
-+    }
-+
-+    private static class GeneratedClassLoader extends ClassLoader {
-+        static {
-+            ClassLoader.registerAsParallelCapable();
-+        }
-+
-+        protected GeneratedClassLoader(@NotNull ClassLoader parent) {
-+            super(parent);
-+        }
-+
-+        private Class<?> define(@NotNull String name, byte[] data) {
-+            synchronized (getClassLoadingLock(name)) {
-+                assert !hasClass(name);
-+                Class<?> c = defineClass(name, data, 0, data.length);
-+                resolveClass(c);
-+                return c;
-+            }
-+        }
-+
-+        @Override
-+        @NotNull
-+        public Object getClassLoadingLock(@NotNull String name) {
-+            return super.getClassLoadingLock(name);
-+        }
-+
-+        public boolean hasClass(@NotNull String name) {
-+            synchronized (getClassLoadingLock(name)) {
-+                try {
-+                    Class.forName(name);
-+                    return true;
-+                } catch (ClassNotFoundException e) {
-+                    return false;
-+                }
-+            }
-+        }
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
-index a850f0780de05463fc0d3f9e15ff7f19d88b2aed..9026e108ccd3a88aee1267ee275137befa646455 100644
---- a/src/main/java/org/bukkit/plugin/EventExecutor.java
-+++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
-@@ -5,9 +5,75 @@ import org.bukkit.event.EventException;
- import org.bukkit.event.Listener;
- import org.jetbrains.annotations.NotNull;
- 
-+// Paper start
-+import java.lang.reflect.Method;
-+import java.lang.reflect.Modifier;
-+import java.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentMap;
-+import java.util.function.Function;
-+
-+import com.destroystokyo.paper.event.executor.MethodHandleEventExecutor;
-+import com.destroystokyo.paper.event.executor.StaticMethodHandleEventExecutor;
-+import com.destroystokyo.paper.event.executor.asm.ASMEventExecutorGenerator;
-+import com.destroystokyo.paper.event.executor.asm.ClassDefiner;
-+import com.google.common.base.Preconditions;
-+// Paper end
-+
- /**
-  * Interface which defines the class for event call backs to plugins
-  */
- public interface EventExecutor {
-     public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException;
-+
-+    // Paper start
-+    ConcurrentMap<Method, Class<? extends EventExecutor>> eventExecutorMap = new ConcurrentHashMap<Method, Class<? extends EventExecutor>>() {
-+        @NotNull
-+        @Override
-+        public Class<? extends EventExecutor> computeIfAbsent(@NotNull Method key, @NotNull Function<? super Method, ? extends Class<? extends EventExecutor>> mappingFunction) {
-+            Class<? extends EventExecutor> executorClass = get(key);
-+            if (executorClass != null)
-+                return executorClass;
-+
-+            //noinspection SynchronizationOnLocalVariableOrMethodParameter
-+            synchronized (key) {
-+                executorClass = get(key);
-+                if (executorClass != null)
-+                    return executorClass;
-+
-+                return super.computeIfAbsent(key, mappingFunction);
-+            }
-+        }
-+    };
-+
-+    @NotNull
-+    public static EventExecutor create(@NotNull Method m, @NotNull Class<? extends Event> eventClass) {
-+        Preconditions.checkNotNull(m, "Null method");
-+        Preconditions.checkArgument(m.getParameterCount() != 0, "Incorrect number of arguments %s", m.getParameterCount());
-+        Preconditions.checkArgument(m.getParameterTypes()[0] == eventClass, "First parameter %s doesn't match event class %s", m.getParameterTypes()[0], eventClass);
-+        ClassDefiner definer = ClassDefiner.getInstance();
-+        if (Modifier.isStatic(m.getModifiers())) {
-+            return new StaticMethodHandleEventExecutor(eventClass, m);
-+        } else if (definer.isBypassAccessChecks() || Modifier.isPublic(m.getDeclaringClass().getModifiers()) && Modifier.isPublic(m.getModifiers())) {
-+            // get the existing generated EventExecutor class for the Method or generate one
-+            Class<? extends EventExecutor> executorClass = eventExecutorMap.computeIfAbsent(m, (__) -> {
-+                String name = ASMEventExecutorGenerator.generateName();
-+                byte[] classData = ASMEventExecutorGenerator.generateEventExecutor(m, name);
-+                return definer.defineClass(m.getDeclaringClass().getClassLoader(), name, classData).asSubclass(EventExecutor.class);
-+            });
-+
-+            try {
-+                EventExecutor asmExecutor = executorClass.newInstance();
-+                // Define a wrapper to conform to bukkit stupidity (passing in events that don't match and wrapper exception)
-+                return (listener, event) -> {
-+                    if (!eventClass.isInstance(event)) return;
-+                    asmExecutor.execute(listener, event);
-+                };
-+            } catch (InstantiationException | IllegalAccessException e) {
-+                throw new AssertionError("Unable to initialize generated event executor", e);
-+            }
-+        } else {
-+            return new MethodHandleEventExecutor(eventClass, m);
-+        }
-+    }
-+    // Paper end
- }

patches/api/0008-Add-command-line-option-to-load-extra-plugin-jars-no.patch

@@ -0,0 +1,181 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
+Date: Tue, 18 May 2021 14:42:26 -0700
+Subject: [PATCH] Add command line option to load extra plugin jars not in the
+ plugins folder
+
+ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
+
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index 557cf1ff29e16fa942545ceca14696c2a50b2d4d..a5c02f744664248f46aa35452318b6a728cd4afd 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -76,6 +76,20 @@ public final class Bukkit {
+         return server;
+     }
+ 
++    /**
++     * Returns the de facto plugins directory, generally used for storing plugin jars to be loaded,
++     * as well as their {@link org.bukkit.plugin.Plugin#getDataFolder() data folders}.
++     *
++     * <p>Plugins should use {@link org.bukkit.plugin.Plugin#getDataFolder()} rather than traversing this
++     * directory manually when determining the location in which to store their data and configuration files.</p>
++     *
++     * @return plugins directory
++     */
++    @NotNull
++    public static File getPluginsFolder() {
++        return server.getPluginsFolder();
++    }
++
+     /**
+      * Attempts to set the {@link Server} singleton.
+      * <p>
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index a2ae6b84fe20e43292f1442401a472dcce1600ec..da13ae75ca1892c21a35aff02f92b91783a868bf 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -61,6 +61,18 @@ import org.jetbrains.annotations.Nullable;
+  */
+ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audience.ForwardingAudience { // Paper
+ 
++    /**
++     * Returns the de facto plugins directory, generally used for storing plugin jars to be loaded,
++     * as well as their {@link org.bukkit.plugin.Plugin#getDataFolder() data folders}.
++     *
++     * <p>Plugins should use {@link org.bukkit.plugin.Plugin#getDataFolder()} rather than traversing this
++     * directory manually when determining the location in which to store their data and configuration files.</p>
++     *
++     * @return plugins directory
++     */
++    @NotNull
++    File getPluginsFolder();
++
+     /**
+      * Used for all administrative messages, such as an operator using a
+      * command.
+diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+index 763b3e9ea24b14c54abf94048931f29228c76df5..1bfa9fcb1b803eecfe33156f81ee88d2922ca88a 100644
+--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
++++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+@@ -111,6 +111,12 @@ public final class SimplePluginManager implements PluginManager {
+     @Override
+     @NotNull
+     public Plugin[] loadPlugins(@NotNull File directory) {
++        // Paper start - extra jars
++        return this.loadPlugins(directory, java.util.Collections.emptyList());
++    }
++    @NotNull
++    public Plugin[] loadPlugins(final @NotNull File directory, final @NotNull List<File> extraPluginJars) {
++        // Paper end
+         Preconditions.checkArgument(directory != null, "Directory cannot be null");
+         Preconditions.checkArgument(directory.isDirectory(), "Directory must be a directory");
+ 
+@@ -128,7 +134,11 @@ public final class SimplePluginManager implements PluginManager {
+         Map<String, Collection<String>> softDependencies = new HashMap<String, Collection<String>>();
+ 
+         // This is where it figures out all possible plugins
+-        for (File file : directory.listFiles()) {
++        // Paper start - extra jars
++        final List<File> pluginJars = new ArrayList<>(java.util.Arrays.asList(directory.listFiles()));
++        pluginJars.addAll(extraPluginJars);
++        for (File file : pluginJars) {
++            // Paper end
+             PluginLoader loader = null;
+             for (Pattern filter : filters) {
+                 Matcher match = filter.matcher(file.getName());
+@@ -144,14 +154,14 @@ public final class SimplePluginManager implements PluginManager {
+                 description = loader.getPluginDescription(file);
+                 String name = description.getName();
+                 if (name.equalsIgnoreCase("bukkit") || name.equalsIgnoreCase("minecraft") || name.equalsIgnoreCase("mojang")) {
+-                    server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + directory.getPath() + "': Restricted Name");
++                    server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + file.getParentFile().getPath() + "': Restricted Name"); // Paper
+                     continue;
+                 } else if (description.rawName.indexOf(' ') != -1) {
+-                    server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + directory.getPath() + "': uses the space-character (0x20) in its name");
++                    server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + file.getParentFile().getPath() + "': uses the space-character (0x20) in its name"); // Paper
+                     continue;
+                 }
+             } catch (InvalidDescriptionException ex) {
+-                server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + directory.getPath() + "'", ex);
++                server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + file.getParentFile().getPath() + "'", ex); // Paper
+                 continue;
+             }
+ 
+@@ -162,7 +172,7 @@ public final class SimplePluginManager implements PluginManager {
+                     description.getName(),
+                     file.getPath(),
+                     replacedFile.getPath(),
+-                    directory.getPath()
++                    file.getParentFile().getPath() // Paper
+                 ));
+             }
+ 
+@@ -183,7 +193,7 @@ public final class SimplePluginManager implements PluginManager {
+                             file.getPath(),
+                             provided,
+                             pluginFile.getPath(),
+-                            directory.getPath()
++                            file.getParentFile().getPath() // Paper
+                     ));
+                 } else {
+                     String replacedPlugin = pluginsProvided.put(provided, description.getName());
+@@ -265,7 +275,7 @@ public final class SimplePluginManager implements PluginManager {
+ 
+                             server.getLogger().log(
+                                 Level.SEVERE,
+-                                "Could not load '" + entry.getValue().getPath() + "' in folder '" + directory.getPath() + "'",
++                                "Could not load '" + entry.getValue().getPath() + "' in folder '" + entry.getValue().getParentFile().getPath() + "'", // Paper
+                                 new UnknownDependencyException("Unknown dependency " + dependency + ". Please download and install " + dependency + " to run this plugin."));
+                             break;
+                         }
+@@ -304,11 +314,11 @@ public final class SimplePluginManager implements PluginManager {
+                             loadedPlugins.add(loadedPlugin.getName());
+                             loadedPlugins.addAll(loadedPlugin.getDescription().getProvides());
+                         } else {
+-                            server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + directory.getPath() + "'");
++                            server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + file.getParentFile().getPath() + "'"); // Paper
+                         }
+                         continue;
+                     } catch (InvalidPluginException ex) {
+-                        server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + directory.getPath() + "'", ex);
++                        server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + file.getParentFile().getPath() + "'", ex); // Paper
+                     }
+                 }
+             }
+@@ -335,11 +345,11 @@ public final class SimplePluginManager implements PluginManager {
+                                 loadedPlugins.add(loadedPlugin.getName());
+                                 loadedPlugins.addAll(loadedPlugin.getDescription().getProvides());
+                             } else {
+-                                server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + directory.getPath() + "'");
++                                server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + file.getParentFile().getPath() + "'"); // Paper
+                             }
+                             break;
+                         } catch (InvalidPluginException ex) {
+-                            server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + directory.getPath() + "'", ex);
++                            server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + file.getParentFile().getPath() + "'", ex); // Paper
+                         }
+                     }
+                 }
+@@ -352,7 +362,7 @@ public final class SimplePluginManager implements PluginManager {
+                     while (failedPluginIterator.hasNext()) {
+                         File file = failedPluginIterator.next();
+                         failedPluginIterator.remove();
+-                        server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + directory.getPath() + "': circular dependency detected");
++                        server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + file.getParentFile().getPath() + "': circular dependency detected"); // Paper
+                     }
+                 }
+             }
+diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+index 5c1b8b05d8a5408bb4830942c74ebfe400ab5a32..333c47a1f7e9d7ddf91aad5ec15163427f7b8039 100644
+--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
++++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+@@ -91,7 +91,7 @@ public final class JavaPluginLoader implements PluginLoader {
+             throw new InvalidPluginException(ex);
+         }
+ 
+-        final File parentFile = file.getParentFile();
++        final File parentFile = this.server.getPluginsFolder(); // Paper
+         final File dataFolder = new File(parentFile, description.getName());
+         @SuppressWarnings("deprecation")
+         final File oldDataFolder = new File(parentFile, description.getRawName());

patches/api/0009-Add-Position.patch

@@ -1,422 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 20 Mar 2022 10:42:28 -0700
-Subject: [PATCH] Add Position
-
-
-diff --git a/src/main/java/io/papermc/paper/math/BlockPosition.java b/src/main/java/io/papermc/paper/math/BlockPosition.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..f164d32cfbd5bfd84f3067a149d34bb1185a7e00
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/math/BlockPosition.java
-@@ -0,0 +1,98 @@
-+package io.papermc.paper.math;
-+
-+import org.bukkit.Axis;
-+import org.bukkit.block.BlockFace;
-+import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.Contract;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * A position represented with integers.
-+ * <p>
-+ * <b>May see breaking changes until Experimental annotation is removed.</b>
-+ * @see FinePosition
-+ */
-+@ApiStatus.Experimental
-+public interface BlockPosition extends Position {
-+
-+    @Override
-+    default double x() {
-+        return this.blockX();
-+    }
-+
-+    @Override
-+    default double y() {
-+        return this.blockY();
-+    }
-+
-+    @Override
-+    default double z() {
-+        return this.blockZ();
-+    }
-+
-+    @Override
-+    default boolean isBlock() {
-+        return true;
-+    }
-+
-+    @Override
-+    default boolean isFine() {
-+        return false;
-+    }
-+
-+    @Override
-+    default @NotNull BlockPosition toBlock() {
-+        return this;
-+    }
-+
-+    @Override
-+    default @NotNull BlockPosition offset(int x, int y, int z) {
-+        return x == 0 && y == 0 && z == 0 ? this : new BlockPositionImpl(this.blockX() + x, this.blockY() + y, this.blockZ() + z);
-+    }
-+
-+    @Override
-+    default @NotNull FinePosition offset(double x, double y, double z) {
-+        return new FinePositionImpl(this.blockX() + z, this.blockY() + y, this.blockZ() + z);
-+    }
-+
-+    /**
-+     * Returns a block position offset by 1 in the direction specified.
-+     *
-+     * @param blockFace the block face to offset towards
-+     * @return the offset block position
-+     */
-+    @Contract(value = "_ -> new", pure = true)
-+    default @NotNull BlockPosition offset(@NotNull BlockFace blockFace) {
-+        return this.offset(blockFace, 1);
-+    }
-+
-+    /**
-+     * Returns a block position offset in the direction specified
-+     * multiplied by the amount.
-+     *
-+     * @param blockFace the block face to offset towards
-+     * @param amount the number of times to move in that direction
-+     * @return the offset block position
-+     */
-+    @Contract(pure = true)
-+    default @NotNull BlockPosition offset(@NotNull BlockFace blockFace, int amount) {
-+        return amount == 0 ? this : new BlockPositionImpl(this.blockX() + (blockFace.getModX() * amount), this.blockY() + (blockFace.getModY() * amount), this.blockZ() + (blockFace.getModZ() * amount));
-+    }
-+
-+    /**
-+     * Returns a block position offset by the amount along
-+     * the specified axis.
-+     *
-+     * @param axis the axis to offset along
-+     * @param amount the amount to offset along that axis
-+     * @return the offset block position
-+     */
-+    @Contract(pure = true)
-+    default @NotNull BlockPosition offset(@NotNull Axis axis, int amount) {
-+        return amount == 0 ? this : switch (axis) {
-+            case X -> new BlockPositionImpl(this.blockX() + amount, this.blockY(), this.blockZ());
-+            case Y -> new BlockPositionImpl(this.blockX(), this.blockY() + amount, this.blockZ());
-+            case Z -> new BlockPositionImpl(this.blockX(), this.blockY(), this.blockZ() + amount);
-+        };
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/math/BlockPositionImpl.java b/src/main/java/io/papermc/paper/math/BlockPositionImpl.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..eb5a3f26c7ba56c6715827f52c0013a860ec7d9a
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/math/BlockPositionImpl.java
-@@ -0,0 +1,4 @@
-+package io.papermc.paper.math;
-+
-+record BlockPositionImpl(int blockX, int blockY, int blockZ) implements BlockPosition {
-+}
-diff --git a/src/main/java/io/papermc/paper/math/FinePosition.java b/src/main/java/io/papermc/paper/math/FinePosition.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..d8df70d731573cf2446044925f218876d62fd7cf
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/math/FinePosition.java
-@@ -0,0 +1,56 @@
-+package io.papermc.paper.math;
-+
-+import org.bukkit.util.NumberConversions;
-+import org.bukkit.util.Vector;
-+import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * A position represented with doubles.
-+ * <p>
-+ * <b>May see breaking changes until Experimental annotation is removed.</b>
-+ * @see BlockPosition
-+ */
-+@ApiStatus.Experimental
-+public interface FinePosition extends Position {
-+
-+    @Override
-+    default int blockX() {
-+        return NumberConversions.floor(this.x());
-+    }
-+
-+    @Override
-+    default int blockY() {
-+        return NumberConversions.floor(this.y());
-+    }
-+
-+    @Override
-+    default int blockZ() {
-+        return NumberConversions.floor(this.z());
-+    }
-+
-+    @Override
-+    default boolean isBlock() {
-+        return false;
-+    }
-+
-+    @Override
-+    default boolean isFine() {
-+        return true;
-+    }
-+
-+    @Override
-+    default @NotNull BlockPosition toBlock() {
-+        return new BlockPositionImpl(this.blockX(), this.blockY(), this.blockZ());
-+    }
-+
-+    @Override
-+    default @NotNull FinePosition offset(int x, int y, int z) {
-+        return this.offset((double) x, y, z);
-+    }
-+
-+    @Override
-+    default @NotNull FinePosition offset(double x, double y, double z) {
-+        return x == 0.0 && y == 0.0 && z == 0.0 ? this : new FinePositionImpl(this.x() + x, this.y() + y, this.z() + z);
-+    }
-+}
-diff --git a/src/main/java/io/papermc/paper/math/FinePositionImpl.java b/src/main/java/io/papermc/paper/math/FinePositionImpl.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..93476aaf8d21efb5a30b6d2cc2eeda8100fb72d0
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/math/FinePositionImpl.java
-@@ -0,0 +1,4 @@
-+package io.papermc.paper.math;
-+
-+record FinePositionImpl(double x, double y, double z) implements FinePosition {
-+}
-diff --git a/src/main/java/io/papermc/paper/math/Position.java b/src/main/java/io/papermc/paper/math/Position.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..300da713dcc303b340efad70efe57facf5422964
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/math/Position.java
-@@ -0,0 +1,184 @@
-+package io.papermc.paper.math;
-+
-+import org.bukkit.Location;
-+import org.bukkit.World;
-+import org.bukkit.util.Vector;
-+import org.jetbrains.annotations.ApiStatus;
-+import org.jetbrains.annotations.Contract;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Common interface for {@link FinePosition} and {@link BlockPosition}.
-+ * <p>
-+ * <b>May see breaking changes until Experimental annotation is removed.</b>
-+ */
-+@ApiStatus.Experimental
-+public interface Position {
-+
-+    FinePosition FINE_ZERO = new FinePositionImpl(0, 0, 0);
-+    BlockPosition BLOCK_ZERO = new BlockPositionImpl(0, 0, 0);
-+
-+    /**
-+     * Gets the block x value for this position
-+     *
-+     * @return the block x value
-+     */
-+    int blockX();
-+
-+    /**
-+     * Gets the block x value for this position
-+     *
-+     * @return the block x value
-+     */
-+    int blockY();
-+
-+    /**
-+     * Gets the block x value for this position
-+     *
-+     * @return the block x value
-+     */
-+    int blockZ();
-+
-+    /**
-+     * Gets the x value for this position
-+     *
-+     * @return the x value
-+     */
-+    double x();
-+
-+    /**
-+     * Gets the y value for this position
-+     *
-+     * @return the y value
-+     */
-+    double y();
-+
-+    /**
-+     * Gets the z value for this position
-+     *
-+     * @return the z value
-+     */
-+    double z();
-+
-+    /**
-+     * Checks of this position represents a {@link BlockPosition}
-+     *
-+     * @return true if block
-+     */
-+    boolean isBlock();
-+
-+    /**
-+     * Checks if this position represents a {@link FinePosition}
-+     *
-+     * @return true if fine
-+     */
-+    boolean isFine();
-+
-+    /**
-+     * Returns a position offset by the specified amounts.
-+     *
-+     * @param x x value to offset
-+     * @param y y value to offset
-+     * @param z z value to offset
-+     * @return the offset position
-+     */
-+    @NotNull Position offset(int x, int y, int z);
-+
-+    /**
-+     * Returns a position offset by the specified amounts.
-+     *
-+     * @param x x value to offset
-+     * @param y y value to offset
-+     * @param z z value to offset
-+     * @return the offset position
-+     */
-+    @NotNull FinePosition offset(double x, double y, double z);
-+
-+    /**
-+     * Returns a new position at the center of the block position this represents
-+     *
-+     * @return a new center position
-+     */
-+    @Contract(value = "-> new", pure = true)
-+    default @NotNull FinePosition toCenter() {
-+        return new FinePositionImpl(this.blockX() + 0.5, this.blockY() + 0.5, this.blockZ() + 0.5);
-+    }
-+
-+    /**
-+     * Returns the block position of this position
-+     * or itself if it already is a block position
-+     *
-+     * @return the block position
-+     */
-+    @Contract(pure = true)
-+    @NotNull BlockPosition toBlock();
-+
-+    /**
-+     * Converts this position to a vector
-+     *
-+     * @return a new vector
-+     */
-+    @Contract(value = "-> new", pure = true)
-+    default @NotNull Vector toVector() {
-+        return new Vector(this.x(), this.y(), this.z());
-+    }
-+
-+    /**
-+     * Creates a new location object at this position with the specified world
-+     *
-+     * @param world the world for the location object
-+     * @return a new location
-+     */
-+    @Contract(value = "_ -> new", pure = true)
-+    default @NotNull Location toLocation(@NotNull World world) {
-+        return new Location(world, this.x(), this.y(), this.z());
-+    }
-+
-+    /**
-+     * Creates a position at the coordinates
-+     *
-+     * @param x x coord
-+     * @param y y coord
-+     * @param z z coord
-+     * @return a position with those coords
-+     */
-+    @Contract(value = "_, _, _ -> new", pure = true)
-+    static @NotNull BlockPosition block(int x, int y, int z) {
-+        return new BlockPositionImpl(x, y, z);
-+    }
-+
-+    /**
-+     * Creates a position from the location.
-+     *
-+     * @param location the location to copy the position of
-+     * @return a new position at that location
-+     */
-+    @Contract(value = "_ -> new", pure = true)
-+    static @NotNull BlockPosition block(@NotNull Location location) {
-+        return new BlockPositionImpl(location.getBlockX(), location.getBlockY(), location.getBlockZ());
-+    }
-+
-+    /**
-+     * Creates a position at the coordinates
-+     *
-+     * @param x x coord
-+     * @param y y coord
-+     * @param z z coord
-+     * @return a position with those coords
-+     */
-+    @Contract(value = "_, _, _ -> new", pure = true)
-+    static @NotNull FinePosition fine(double x, double y, double z) {
-+        return new FinePositionImpl(x, y, z);
-+    }
-+
-+    /**
-+     * Creates a position from the location.
-+     *
-+     * @param location the location to copy the position of
-+     * @return a new position at that location
-+     */
-+    @Contract(value = "_ -> new", pure = true)
-+    static @NotNull FinePosition fine(@NotNull Location location) {
-+        return new FinePositionImpl(location.getX(), location.getY(), location.getZ());
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 7c4db051472fb6a6c6d24092dc6f75487356690a..3b99f359f556e6f2c341d55fa69b7462e69b6546 100644
---- a/src/main/java/org/bukkit/Location.java
-+++ b/src/main/java/org/bukkit/Location.java
-@@ -20,7 +20,7 @@ import org.jetbrains.annotations.Nullable;
-  * magnitude than 360 are valid, but may be normalized to any other equivalent
-  * representation by the implementation.
-  */
--public class Location implements Cloneable, ConfigurationSerializable {
-+public class Location implements Cloneable, ConfigurationSerializable, io.papermc.paper.math.FinePosition { // Paper
-     private Reference<World> world;
-     private double x;
-     private double y;
-@@ -706,4 +706,26 @@ public class Location implements Cloneable, ConfigurationSerializable {
-         }
-         return pitch;
-     }
-+
-+    // Paper - add Position
-+    @Override
-+    public double x() {
-+        return this.getX();
-+    }
-+
-+    @Override
-+    public double y() {
-+        return this.getY();
-+    }
-+
-+    @Override
-+    public double z() {
-+        return this.getZ();
-+    }
-+
-+    @Override
-+    public @NotNull Location toLocation(@NotNull World world) {
-+        return new Location(world, this.x(), this.y(), this.z(), this.getYaw(), this.getPitch());
-+    }
-+    // Paper end
- }

patches/api/0009-Player-affects-spawning-API.patch

@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jedediah Smith <jedediah@silencegreys.com>
+Date: Mon, 29 Feb 2016 17:22:34 -0600
+Subject: [PATCH] Player affects spawning API
+
+
+diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
+index 3f9236ce97adb4b724e18a5f05497681bed5d4d5..7c13de51561df662691a36ca1cc91ca7997d773a 100644
+--- a/src/main/java/org/bukkit/entity/Player.java
++++ b/src/main/java/org/bukkit/entity/Player.java
+@@ -1850,6 +1850,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+     @Deprecated // Paper
+     public String getLocale();
+ 
++    // Paper start
++    /**
++     * Get whether the player can affect mob spawning
++     *
++     * @return if the player can affect mob spawning
++     */
++    public boolean getAffectsSpawning();
++
++    /**
++     * Set whether the player can affect mob spawning
++     *
++     * @param affects Whether the player can affect mob spawning
++     */
++    public void setAffectsSpawning(boolean affects);
++    // Paper end
++
+     /**
+      * Update the list of commands sent to the client.
+      * <br>

patches/api/0010-Add-getTPS-method.patch

@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Mon, 29 Feb 2016 17:24:57 -0600
+Subject: [PATCH] Add getTPS method
+
+
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index a5c02f744664248f46aa35452318b6a728cd4afd..3603bcdadeea10f2babe8d6c609d7eaee3f0f89c 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -1889,6 +1889,17 @@ public final class Bukkit {
+         return server.getEntity(uuid);
+     }
+ 
++    // Paper start
++    /**
++     * Gets the current server TPS
++     * @return current server TPS (1m, 5m, 15m in Paper-Server)
++     */
++    @NotNull
++    public static double[] getTPS() {
++        return server.getTPS();
++    }
++    // Paper end
++
+     /**
+      * Get the advancement specified by this key.
+      *
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index da13ae75ca1892c21a35aff02f92b91783a868bf..36f5e47ffcdce23b0b5594881fdd49a3a3337578 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -1603,6 +1603,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+     @Nullable
+     Entity getEntity(@NotNull UUID uuid);
+ 
++    // Paper start
++    /**
++     * Gets the current server TPS
++     *
++     * @return current server TPS (1m, 5m, 15m in Paper-Server)
++     */
++    @NotNull
++    public double[] getTPS();
++    // Paper end
++
+     /**
+      * Get the advancement specified by this key.
+      *

patches/api/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch

@@ -1,96 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Tue, 18 May 2021 14:42:26 -0700
-Subject: [PATCH] Add command line option to load extra plugin jars not in the
- plugins folder
-
-ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e24589a4cb42b0163e4a1455b8b11d7130b5cd41..71a09ed2b9863d2d339967f41ab6373ec27429d3 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -76,6 +76,20 @@ public final class Bukkit {
-         return server;
-     }
- 
-+    /**
-+     * Returns the de facto plugins directory, generally used for storing plugin jars to be loaded,
-+     * as well as their {@link org.bukkit.plugin.Plugin#getDataFolder() data folders}.
-+     *
-+     * <p>Plugins should use {@link org.bukkit.plugin.Plugin#getDataFolder()} rather than traversing this
-+     * directory manually when determining the location in which to store their data and configuration files.</p>
-+     *
-+     * @return plugins directory
-+     */
-+    @NotNull
-+    public static File getPluginsFolder() {
-+        return server.getPluginsFolder();
-+    }
-+
-     /**
-      * Attempts to set the {@link Server} singleton.
-      * <p>
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ac087402c90dad4b3c499fcf8507e50e9099cea5..a4f8035b40eebff8afe01788781128b04247f28c 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -61,6 +61,18 @@ import org.jetbrains.annotations.Nullable;
-  */
- public interface Server extends PluginMessageRecipient, net.kyori.adventure.audience.ForwardingAudience { // Paper
- 
-+    /**
-+     * Returns the de facto plugins directory, generally used for storing plugin jars to be loaded,
-+     * as well as their {@link org.bukkit.plugin.Plugin#getDataFolder() data folders}.
-+     *
-+     * <p>Plugins should use {@link org.bukkit.plugin.Plugin#getDataFolder()} rather than traversing this
-+     * directory manually when determining the location in which to store their data and configuration files.</p>
-+     *
-+     * @return plugins directory
-+     */
-+    @NotNull
-+    File getPluginsFolder();
-+
-     /**
-      * Used for all administrative messages, such as an operator using a
-      * command.
-diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index f13dcbe448111b24b36105d25527ba87ccc9334e..3fcb73a0fc2daaeb76dd4c6757afce52c5b3118b 100644
---- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -116,9 +116,22 @@ public final class SimplePluginManager implements PluginManager {
-     @Override
-     @NotNull
-     public Plugin[] loadPlugins(@NotNull File directory) {
-+        // Paper start - extra jars
-+        return this.loadPlugins(directory, java.util.Collections.emptyList());
-+    }
-+    @NotNull
-+    public Plugin[] loadPlugins(final @NotNull File directory, final @NotNull List<File> extraPluginJars) {
-+        // Paper end
-         if (true) {
-             List<Plugin> pluginList = new ArrayList<>();
-             java.util.Collections.addAll(pluginList, this.paperPluginManager.loadPlugins(directory));
-+            for (File file : extraPluginJars) {
-+                try {
-+                    pluginList.add(this.paperPluginManager.loadPlugin(file));
-+                } catch (Exception e) {
-+                    this.server.getLogger().log(Level.SEVERE, "Plugin loading error!", e);
-+                }
-+            }
-             return pluginList.toArray(new Plugin[0]);
-         }
-         Preconditions.checkArgument(directory != null, "Directory cannot be null");
-diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index de6b6188587fd254ab96cbc1f95fda2056d9cbe2..eaefbb00e9993d54906cc8cf35cf753c0d6c7707 100644
---- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -93,7 +93,7 @@ public final class JavaPluginLoader implements PluginLoader {
-             throw new InvalidPluginException(ex);
-         }
- 
--        final File parentFile = file.getParentFile();
-+        final File parentFile = this.server.getPluginsFolder(); // Paper
-         final File dataFolder = new File(parentFile, description.getName());
-         @SuppressWarnings("deprecation")
-         final File oldDataFolder = new File(parentFile, description.getRawName());

patches/api/0011-Version-Command-2.0.patch

@@ -0,0 +1,177 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach@zachbr.io>
+Date: Mon, 27 May 2019 01:10:06 -0500
+Subject: [PATCH] Version Command 2.0
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..a736d7bcdc5861a01b66ba36158db1c716339346
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
+@@ -0,0 +1,45 @@
++package com.destroystokyo.paper.util;
++
++import net.kyori.adventure.text.Component;
++import net.kyori.adventure.text.format.NamedTextColor;
++import org.bukkit.Bukkit;
++import org.jetbrains.annotations.NotNull;
++
++public interface VersionFetcher {
++    /**
++     * Amount of time to cache results for in milliseconds
++     * <p>
++     * Negative values will never cache.
++     *
++     * @return cache time
++     */
++    long getCacheTime();
++
++    /**
++     * Gets the version message to cache and show to command senders.
++     *
++     * <p>NOTE: This is run in a new thread separate from that of the command processing thread</p>
++     *
++     * @param serverVersion the current version of the server (will match {@link Bukkit#getVersion()})
++     * @return the message to show when requesting a version
++     */
++    @NotNull
++    Component getVersionMessage(@NotNull String serverVersion);
++
++    class DummyVersionFetcher implements VersionFetcher {
++
++        @Override
++        public long getCacheTime() {
++            return -1;
++        }
++
++        @NotNull
++        @Override
++        public Component getVersionMessage(@NotNull String serverVersion) {
++            Bukkit.getLogger().warning("Version provider has not been set, cannot check for updates!");
++            Bukkit.getLogger().info("Override the default implementation of org.bukkit.UnsafeValues#getVersionFetcher()");
++            new Throwable().printStackTrace();
++            return Component.text("Unable to check for updates. No version provider set.", NamedTextColor.RED);
++        }
++    }
++}
+diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
+index c9ecd5b1908e05a1b39dadcded27241672adcddf..355c46f1c1f08072446f3cc92c0d22898933a7fc 100644
+--- a/src/main/java/org/bukkit/UnsafeValues.java
++++ b/src/main/java/org/bukkit/UnsafeValues.java
+@@ -94,5 +94,12 @@ public interface UnsafeValues {
+      * @return name
+      */
+     String getTimingsServerName();
++
++    /**
++     * Called once by the version command on first use, then cached.
++     */
++    default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
++        return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
++    }
+     // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+index 04b4fb6859df0221f8f9f92c5a7ac2dda1073355..b50f614806f4634960d383e8a33f094c2f46935f 100644
+--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
++++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+@@ -1,5 +1,6 @@
+ package org.bukkit.command.defaults;
+ 
++import com.destroystokyo.paper.util.VersionFetcher; // Paper - version supplier
+ import com.google.common.base.Charsets;
+ import com.google.common.base.Preconditions;
+ import com.google.common.collect.ImmutableList;
+@@ -26,6 +27,15 @@ import org.bukkit.util.StringUtil;
+ import org.jetbrains.annotations.NotNull;
+ 
+ public class VersionCommand extends BukkitCommand {
++    private VersionFetcher versionFetcher;
++    private VersionFetcher getVersionFetcher() { // lazy load because unsafe isn't available at command registration
++        if (versionFetcher == null) {
++            versionFetcher = Bukkit.getUnsafe().getVersionFetcher();
++        }
++
++        return versionFetcher;
++    }
++
+     public VersionCommand(@NotNull String name) {
+         super(name);
+ 
+@@ -40,7 +50,7 @@ public class VersionCommand extends BukkitCommand {
+         if (!testPermission(sender)) return true;
+ 
+         if (args.length == 0) {
+-            sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")");
++            //sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")"); // Paper - moved to setVersionMessage
+             sendVersion(sender);
+         } else {
+             StringBuilder name = new StringBuilder();
+@@ -146,14 +156,14 @@ public class VersionCommand extends BukkitCommand {
+ 
+     private final ReentrantLock versionLock = new ReentrantLock();
+     private boolean hasVersion = false;
+-    private String versionMessage = null;
++    private net.kyori.adventure.text.Component versionMessage = null; // Paper
+     private final Set<CommandSender> versionWaiters = new HashSet<CommandSender>();
+     private boolean versionTaskStarted = false;
+     private long lastCheck = 0;
+ 
+     private void sendVersion(@NotNull CommandSender sender) {
+         if (hasVersion) {
+-            if (System.currentTimeMillis() - lastCheck > 21600000) {
++            if (System.currentTimeMillis() - lastCheck > getVersionFetcher().getCacheTime()) { // Paper - use version supplier
+                 lastCheck = System.currentTimeMillis();
+                 hasVersion = false;
+             } else {
+@@ -168,7 +178,7 @@ public class VersionCommand extends BukkitCommand {
+                 return;
+             }
+             versionWaiters.add(sender);
+-            sender.sendMessage("Checking version, please wait...");
++            sender.sendMessage(net.kyori.adventure.text.Component.text("Checking version, please wait...", net.kyori.adventure.text.format.NamedTextColor.WHITE, net.kyori.adventure.text.format.TextDecoration.ITALIC)); // Paper
+             if (!versionTaskStarted) {
+                 versionTaskStarted = true;
+                 new Thread(new Runnable() {
+@@ -186,6 +196,13 @@ public class VersionCommand extends BukkitCommand {
+ 
+     private void obtainVersion() {
+         String version = Bukkit.getVersion();
++        // Paper start
++        if (version.startsWith("null")) { // running from ide?
++            setVersionMessage(net.kyori.adventure.text.Component.text("Unknown version, custom build?", net.kyori.adventure.text.format.NamedTextColor.YELLOW));
++            return;
++        }
++        setVersionMessage(getVersionFetcher().getVersionMessage(version));
++        /*
+         if (version == null) version = "Custom";
+         String[] parts = version.substring(0, version.indexOf(' ')).split("-");
+         if (parts.length == 4) {
+@@ -215,11 +232,24 @@ public class VersionCommand extends BukkitCommand {
+         } else {
+             setVersionMessage("Unknown version, custom build?");
+         }
++         */
++        // Paper end
+     }
+ 
+-    private void setVersionMessage(@NotNull String msg) {
++    // Paper start
++    private void setVersionMessage(final @NotNull net.kyori.adventure.text.Component msg) {
+         lastCheck = System.currentTimeMillis();
+-        versionMessage = msg;
++        final net.kyori.adventure.text.Component message = net.kyori.adventure.text.TextComponent.ofChildren(
++            net.kyori.adventure.text.Component.text("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")", net.kyori.adventure.text.format.NamedTextColor.WHITE),
++            net.kyori.adventure.text.Component.newline(),
++            msg
++        );
++        this.versionMessage = net.kyori.adventure.text.Component.text()
++            .append(message)
++            .hoverEvent(net.kyori.adventure.text.Component.text("Click to copy to clipboard", net.kyori.adventure.text.format.NamedTextColor.WHITE))
++            .clickEvent(net.kyori.adventure.text.event.ClickEvent.copyToClipboard(net.kyori.adventure.text.serializer.plain.PlainComponentSerializer.plain().serialize(message)))
++            .build();
++        // Paper end
+         versionLock.lock();
+         try {
+             hasVersion = true;

patches/api/0012-Entity-Origin-API.patch

@@ -0,0 +1,66 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Byteflux <byte@byteflux.net>
+Date: Mon, 29 Feb 2016 17:50:31 -0600
+Subject: [PATCH] Entity Origin API
+
+
+diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
+index a829779ac56a271cad463806984991b4713a27be..20c529bdd94a6bac09d9f8222f33dfc9e8d53fa9 100644
+--- a/src/main/java/org/bukkit/entity/Entity.java
++++ b/src/main/java/org/bukkit/entity/Entity.java
+@@ -698,5 +698,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+     default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
+         return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.customName())));
+     }
++
++    /**
++     * Gets the location where this entity originates from.
++     * <p>
++     * This value can be null if the entity hasn't yet been added to the world.
++     *
++     * @return Location where entity originates or null if not yet added
++     */
++    @Nullable
++    Location getOrigin();
+     // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
+index 64f9d3fd870d65afd2ee9a85625b149163eee144..14cb0d770561151570ab4399ca5facff43076819 100644
+--- a/src/main/java/org/bukkit/entity/FallingBlock.java
++++ b/src/main/java/org/bukkit/entity/FallingBlock.java
+@@ -54,4 +54,15 @@ public interface FallingBlock extends Entity {
+      * @param hurtEntities whether entities will be damaged by this block.
+      */
+     void setHurtEntities(boolean hurtEntities);
++
++    /**
++     * Gets the source block location of the FallingBlock
++     *
++     * @return the source block location the FallingBlock was spawned from
++     * @deprecated replaced by {@link Entity#getOrigin()}
++     */
++    @Deprecated
++    default org.bukkit.Location getSourceLoc() {
++        return this.getOrigin();
++    }
+ }
+diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
+index a23cfdf66877f0a61eae700de084c76e6ee7b431..0813bd913c8fdb2001963ce3e82c07c2af105418 100644
+--- a/src/main/java/org/bukkit/entity/TNTPrimed.java
++++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
+@@ -53,4 +53,15 @@ public interface TNTPrimed extends Explosive {
+      * @param source the source of this primed TNT
+      */
+     public void setSource(@Nullable Entity source);
++
++    /**
++     * Gets the source block location of the TNTPrimed
++     *
++     * @return the source block location the TNTPrimed was spawned from
++     * @deprecated replaced by {@link Entity#getOrigin()}
++     */
++    @Deprecated
++    default org.bukkit.Location getSourceLoc() {
++        return this.getOrigin();
++    }
+ }

patches/api/0012-Player-affects-spawning-API.patch

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <jedediah@silencegreys.com>
-Date: Mon, 29 Feb 2016 17:22:34 -0600
-Subject: [PATCH] Player affects spawning API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8d8a540c844e5365eed75a87db197a8fd4249bcd..4ddea8d71723db4326459c96324a817c70492261 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1916,6 +1916,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     @Deprecated // Paper
-     public String getLocale();
- 
-+    // Paper start
-+    /**
-+     * Get whether the player can affect mob spawning
-+     *
-+     * @return if the player can affect mob spawning
-+     */
-+    public boolean getAffectsSpawning();
-+
-+    /**
-+     * Set whether the player can affect mob spawning
-+     *
-+     * @param affects Whether the player can affect mob spawning
-+     */
-+    public void setAffectsSpawning(boolean affects);
-+    // Paper end
-+
-     /**
-      * Update the list of commands sent to the client.
-      * <br>

patches/api/0013-Add-getTPS-method.patch

@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 29 Feb 2016 17:24:57 -0600
-Subject: [PATCH] Add getTPS method
-
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 71a09ed2b9863d2d339967f41ab6373ec27429d3..397f57f0ab4844fb88c60681bf6e6e3db8a98945 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1891,6 +1891,17 @@ public final class Bukkit {
-         return server.getEntity(uuid);
-     }
- 
-+    // Paper start
-+    /**
-+     * Gets the current server TPS
-+     * @return current server TPS (1m, 5m, 15m in Paper-Server)
-+     */
-+    @NotNull
-+    public static double[] getTPS() {
-+        return server.getTPS();
-+    }
-+    // Paper end
-+
-     /**
-      * Get the advancement specified by this key.
-      *
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a4f8035b40eebff8afe01788781128b04247f28c..3f3531e208472a0e76f76e2b1a08a699527cef8f 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1605,6 +1605,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     @Nullable
-     Entity getEntity(@NotNull UUID uuid);
- 
-+    // Paper start
-+    /**
-+     * Gets the current server TPS
-+     *
-+     * @return current server TPS (1m, 5m, 15m in Paper-Server)
-+     */
-+    @NotNull
-+    public double[] getTPS();
-+    // Paper end
-+
-     /**
-      * Get the advancement specified by this key.
-      *

patches/api/0014-Add-view-distance-API.patch

@@ -0,0 +1,159 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Byteflux <byte@byteflux.net>
+Date: Mon, 29 Feb 2016 18:05:37 -0600
+Subject: [PATCH] Add view distance API
+
+Add per player no-tick, tick, and send view distances.
+
+Also add send/no-tick view distance to World.
+
+diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
+index 425cad3b6c365560f6614767d763ad61a92e6722..75a87b221cc0f6334c5283130a7b2bfdf4eedd03 100644
+--- a/src/main/java/org/bukkit/World.java
++++ b/src/main/java/org/bukkit/World.java
+@@ -2673,6 +2673,62 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+     int getSimulationDistance();
+     // Spigot end
+ 
++    // Paper start - view distance api
++    /**
++     * Sets the view distance for this world.
++     * @param viewDistance view distance in [2, 32]
++     */
++    void setViewDistance(int viewDistance);
++
++    /**
++     * Sets the simulation distance for this world.
++     * @param simulationDistance simulation distance in [2, 32]
++     */
++    void setSimulationDistance(int simulationDistance);
++
++    /**
++     * Returns the no-tick view distance for this world.
++     * <p>
++     * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
++     * be set to tick.
++     * </p>
++     * @return The no-tick view distance for this world.
++     * @deprecated Use {@link #getViewDistance()}
++     */
++    @Deprecated
++    int getNoTickViewDistance();
++
++    /**
++     * Sets the no-tick view distance for this world.
++     * <p>
++     * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
++     * be set to tick.
++     * </p>
++     * @param viewDistance view distance in [2, 32]
++     * @deprecated Use {@link #setViewDistance(int)}
++     */
++    @Deprecated
++    void setNoTickViewDistance(int viewDistance);
++
++    /**
++     * Gets the sending view distance for this world.
++     * <p>
++     * Sending view distance is the view distance where chunks will load in for players in this world.
++     * </p>
++     * @return The sending view distance for this world.
++     */
++    int getSendViewDistance();
++
++    /**
++     * Sets the sending view distance for this world.
++     * <p>
++     * Sending view distance is the view distance where chunks will load in for players in this world.
++     * </p>
++     * @param viewDistance view distance in [2, 32] or -1
++     */
++    void setSendViewDistance(int viewDistance);
++    // Paper end - view distance api
++
+     // Spigot start
+     public class Spigot {
+ 
+diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
+index 7c13de51561df662691a36ca1cc91ca7997d773a..292f7827df666c10d7b82aa9b1688bf3f0da5c7b 100644
+--- a/src/main/java/org/bukkit/entity/Player.java
++++ b/src/main/java/org/bukkit/entity/Player.java
+@@ -1864,6 +1864,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * @param affects Whether the player can affect mob spawning
+      */
+     public void setAffectsSpawning(boolean affects);
++
++    /**
++     * Gets the view distance for this player
++     *
++     * @return the player's view distance
++     * @see org.bukkit.World#getViewDistance()
++     */
++    public int getViewDistance();
++
++    /**
++     * Sets the view distance for this player
++     *
++     * @param viewDistance the player's view distance
++     * @see org.bukkit.World#setViewDistance(int)
++     */
++    public void setViewDistance(int viewDistance);
++
++    /**
++     * Gets the simulation distance for this player
++     *
++     * @return the player's simulation distance
++     */
++    public int getSimulationDistance();
++
++    /**
++     * Sets the simulation distance for this player
++     *
++     * @param simulationDistance the player's new simulation distance
++     */
++    public void setSimulationDistance(int simulationDistance);
++    
++    /**
++     * Gets the no-ticking view distance for this player.
++     * <p>
++     * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
++     * be set to tick.
++     * </p>
++     * @return The no-tick view distance for this player.
++     * @deprecated Use {@link #getViewDistance()}
++     */
++    @Deprecated
++    public int getNoTickViewDistance();
++
++    /**
++     * Sets the no-ticking view distance for this player.
++     * <p>
++     * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
++     * be set to tick.
++     * </p>
++     * @param viewDistance view distance in [2, 32] or -1
++     * @deprecated Use {@link #setViewDistance(int)}
++     */
++    @Deprecated
++    public void setNoTickViewDistance(int viewDistance);
++
++    /**
++     * Gets the sending view distance for this player.
++     * <p>
++     * Sending view distance is the view distance where chunks will load in for players.
++     * </p>
++     * @return The sending view distance for this player.
++     */
++    public int getSendViewDistance();
++
++    /**
++     * Sets the sending view distance for this player.
++     * <p>
++     * Sending view distance is the view distance where chunks will load in for players.
++     * </p>
++     * @param viewDistance view distance in [2, 32] or -1
++     */
++    public void setSendViewDistance(int viewDistance);
+     // Paper end
+ 
+     /**

patches/api/0014-Version-Command-2.0.patch

@@ -1,177 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach@zachbr.io>
-Date: Mon, 27 May 2019 01:10:06 -0500
-Subject: [PATCH] Version Command 2.0
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..a736d7bcdc5861a01b66ba36158db1c716339346
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
-@@ -0,0 +1,45 @@
-+package com.destroystokyo.paper.util;
-+
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import org.bukkit.Bukkit;
-+import org.jetbrains.annotations.NotNull;
-+
-+public interface VersionFetcher {
-+    /**
-+     * Amount of time to cache results for in milliseconds
-+     * <p>
-+     * Negative values will never cache.
-+     *
-+     * @return cache time
-+     */
-+    long getCacheTime();
-+
-+    /**
-+     * Gets the version message to cache and show to command senders.
-+     *
-+     * <p>NOTE: This is run in a new thread separate from that of the command processing thread</p>
-+     *
-+     * @param serverVersion the current version of the server (will match {@link Bukkit#getVersion()})
-+     * @return the message to show when requesting a version
-+     */
-+    @NotNull
-+    Component getVersionMessage(@NotNull String serverVersion);
-+
-+    class DummyVersionFetcher implements VersionFetcher {
-+
-+        @Override
-+        public long getCacheTime() {
-+            return -1;
-+        }
-+
-+        @NotNull
-+        @Override
-+        public Component getVersionMessage(@NotNull String serverVersion) {
-+            Bukkit.getLogger().warning("Version provider has not been set, cannot check for updates!");
-+            Bukkit.getLogger().info("Override the default implementation of org.bukkit.UnsafeValues#getVersionFetcher()");
-+            new Throwable().printStackTrace();
-+            return Component.text("Unable to check for updates. No version provider set.", NamedTextColor.RED);
-+        }
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index daf3ac72cae4d19c0273058dc6a1e1afe9a47f77..24fad8e59a3a5a174d24505cedda2a3fd52115b1 100644
---- a/src/main/java/org/bukkit/UnsafeValues.java
-+++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -114,5 +114,12 @@ public interface UnsafeValues {
-      * @return name
-      */
-     String getTimingsServerName();
-+
-+    /**
-+     * Called once by the version command on first use, then cached.
-+     */
-+    default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
-+        return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
-+    }
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index 04b4fb6859df0221f8f9f92c5a7ac2dda1073355..b50f614806f4634960d383e8a33f094c2f46935f 100644
---- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -1,5 +1,6 @@
- package org.bukkit.command.defaults;
- 
-+import com.destroystokyo.paper.util.VersionFetcher; // Paper - version supplier
- import com.google.common.base.Charsets;
- import com.google.common.base.Preconditions;
- import com.google.common.collect.ImmutableList;
-@@ -26,6 +27,15 @@ import org.bukkit.util.StringUtil;
- import org.jetbrains.annotations.NotNull;
- 
- public class VersionCommand extends BukkitCommand {
-+    private VersionFetcher versionFetcher;
-+    private VersionFetcher getVersionFetcher() { // lazy load because unsafe isn't available at command registration
-+        if (versionFetcher == null) {
-+            versionFetcher = Bukkit.getUnsafe().getVersionFetcher();
-+        }
-+
-+        return versionFetcher;
-+    }
-+
-     public VersionCommand(@NotNull String name) {
-         super(name);
- 
-@@ -40,7 +50,7 @@ public class VersionCommand extends BukkitCommand {
-         if (!testPermission(sender)) return true;
- 
-         if (args.length == 0) {
--            sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")");
-+            //sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")"); // Paper - moved to setVersionMessage
-             sendVersion(sender);
-         } else {
-             StringBuilder name = new StringBuilder();
-@@ -146,14 +156,14 @@ public class VersionCommand extends BukkitCommand {
- 
-     private final ReentrantLock versionLock = new ReentrantLock();
-     private boolean hasVersion = false;
--    private String versionMessage = null;
-+    private net.kyori.adventure.text.Component versionMessage = null; // Paper
-     private final Set<CommandSender> versionWaiters = new HashSet<CommandSender>();
-     private boolean versionTaskStarted = false;
-     private long lastCheck = 0;
- 
-     private void sendVersion(@NotNull CommandSender sender) {
-         if (hasVersion) {
--            if (System.currentTimeMillis() - lastCheck > 21600000) {
-+            if (System.currentTimeMillis() - lastCheck > getVersionFetcher().getCacheTime()) { // Paper - use version supplier
-                 lastCheck = System.currentTimeMillis();
-                 hasVersion = false;
-             } else {
-@@ -168,7 +178,7 @@ public class VersionCommand extends BukkitCommand {
-                 return;
-             }
-             versionWaiters.add(sender);
--            sender.sendMessage("Checking version, please wait...");
-+            sender.sendMessage(net.kyori.adventure.text.Component.text("Checking version, please wait...", net.kyori.adventure.text.format.NamedTextColor.WHITE, net.kyori.adventure.text.format.TextDecoration.ITALIC)); // Paper
-             if (!versionTaskStarted) {
-                 versionTaskStarted = true;
-                 new Thread(new Runnable() {
-@@ -186,6 +196,13 @@ public class VersionCommand extends BukkitCommand {
- 
-     private void obtainVersion() {
-         String version = Bukkit.getVersion();
-+        // Paper start
-+        if (version.startsWith("null")) { // running from ide?
-+            setVersionMessage(net.kyori.adventure.text.Component.text("Unknown version, custom build?", net.kyori.adventure.text.format.NamedTextColor.YELLOW));
-+            return;
-+        }
-+        setVersionMessage(getVersionFetcher().getVersionMessage(version));
-+        /*
-         if (version == null) version = "Custom";
-         String[] parts = version.substring(0, version.indexOf(' ')).split("-");
-         if (parts.length == 4) {
-@@ -215,11 +232,24 @@ public class VersionCommand extends BukkitCommand {
-         } else {
-             setVersionMessage("Unknown version, custom build?");
-         }
-+         */
-+        // Paper end
-     }
- 
--    private void setVersionMessage(@NotNull String msg) {
-+    // Paper start
-+    private void setVersionMessage(final @NotNull net.kyori.adventure.text.Component msg) {
-         lastCheck = System.currentTimeMillis();
--        versionMessage = msg;
-+        final net.kyori.adventure.text.Component message = net.kyori.adventure.text.TextComponent.ofChildren(
-+            net.kyori.adventure.text.Component.text("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")", net.kyori.adventure.text.format.NamedTextColor.WHITE),
-+            net.kyori.adventure.text.Component.newline(),
-+            msg
-+        );
-+        this.versionMessage = net.kyori.adventure.text.Component.text()
-+            .append(message)
-+            .hoverEvent(net.kyori.adventure.text.Component.text("Click to copy to clipboard", net.kyori.adventure.text.format.NamedTextColor.WHITE))
-+            .clickEvent(net.kyori.adventure.text.event.ClickEvent.copyToClipboard(net.kyori.adventure.text.serializer.plain.PlainComponentSerializer.plain().serialize(message)))
-+            .build();
-+        // Paper end
-         versionLock.lock();
-         try {
-             hasVersion = true;

patches/api/0015-Entity-Origin-API.patch

@@ -1,66 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Byteflux <byte@byteflux.net>
-Date: Mon, 29 Feb 2016 17:50:31 -0600
-Subject: [PATCH] Entity Origin API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 0a539af95e1bd331cec241403a15e4e6dbf6d996..1b0b365905d4e7f77d3f792797816eeb35d31c69 100644
---- a/src/main/java/org/bukkit/entity/Entity.java
-+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -724,5 +724,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
-     default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
-         return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.customName())));
-     }
-+
-+    /**
-+     * Gets the location where this entity originates from.
-+     * <p>
-+     * This value can be null if the entity hasn't yet been added to the world.
-+     *
-+     * @return Location where entity originates or null if not yet added
-+     */
-+    @Nullable
-+    Location getOrigin();
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index 64f9d3fd870d65afd2ee9a85625b149163eee144..14cb0d770561151570ab4399ca5facff43076819 100644
---- a/src/main/java/org/bukkit/entity/FallingBlock.java
-+++ b/src/main/java/org/bukkit/entity/FallingBlock.java
-@@ -54,4 +54,15 @@ public interface FallingBlock extends Entity {
-      * @param hurtEntities whether entities will be damaged by this block.
-      */
-     void setHurtEntities(boolean hurtEntities);
-+
-+    /**
-+     * Gets the source block location of the FallingBlock
-+     *
-+     * @return the source block location the FallingBlock was spawned from
-+     * @deprecated replaced by {@link Entity#getOrigin()}
-+     */
-+    @Deprecated
-+    default org.bukkit.Location getSourceLoc() {
-+        return this.getOrigin();
-+    }
- }
-diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
-index a23cfdf66877f0a61eae700de084c76e6ee7b431..0813bd913c8fdb2001963ce3e82c07c2af105418 100644
---- a/src/main/java/org/bukkit/entity/TNTPrimed.java
-+++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
-@@ -53,4 +53,15 @@ public interface TNTPrimed extends Explosive {
-      * @param source the source of this primed TNT
-      */
-     public void setSource(@Nullable Entity source);
-+
-+    /**
-+     * Gets the source block location of the TNTPrimed
-+     *
-+     * @return the source block location the TNTPrimed was spawned from
-+     * @deprecated replaced by {@link Entity#getOrigin()}
-+     */
-+    @Deprecated
-+    default org.bukkit.Location getSourceLoc() {
-+        return this.getOrigin();
-+    }
- }

patches/api/0017-Add-view-distance-API.patch

@@ -1,159 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Byteflux <byte@byteflux.net>
-Date: Mon, 29 Feb 2016 18:05:37 -0600
-Subject: [PATCH] Add view distance API
-
-Add per player no-tick, tick, and send view distances.
-
-Also add send/no-tick view distance to World.
-
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index ed57cd69d88504b78782271c9a3d423a29471674..8a6a548314eef8d486be908e38e3a4562f26bdb4 100644
---- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -2698,6 +2698,62 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
-     int getSimulationDistance();
-     // Spigot end
- 
-+    // Paper start - view distance api
-+    /**
-+     * Sets the view distance for this world.
-+     * @param viewDistance view distance in [2, 32]
-+     */
-+    void setViewDistance(int viewDistance);
-+
-+    /**
-+     * Sets the simulation distance for this world.
-+     * @param simulationDistance simulation distance in [2, 32]
-+     */
-+    void setSimulationDistance(int simulationDistance);
-+
-+    /**
-+     * Returns the no-tick view distance for this world.
-+     * <p>
-+     * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
-+     * be set to tick.
-+     * </p>
-+     * @return The no-tick view distance for this world.
-+     * @deprecated Use {@link #getViewDistance()}
-+     */
-+    @Deprecated
-+    int getNoTickViewDistance();
-+
-+    /**
-+     * Sets the no-tick view distance for this world.
-+     * <p>
-+     * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
-+     * be set to tick.
-+     * </p>
-+     * @param viewDistance view distance in [2, 32]
-+     * @deprecated Use {@link #setViewDistance(int)}
-+     */
-+    @Deprecated
-+    void setNoTickViewDistance(int viewDistance);
-+
-+    /**
-+     * Gets the sending view distance for this world.
-+     * <p>
-+     * Sending view distance is the view distance where chunks will load in for players in this world.
-+     * </p>
-+     * @return The sending view distance for this world.
-+     */
-+    int getSendViewDistance();
-+
-+    /**
-+     * Sets the sending view distance for this world.
-+     * <p>
-+     * Sending view distance is the view distance where chunks will load in for players in this world.
-+     * </p>
-+     * @param viewDistance view distance in [2, 32] or -1
-+     */
-+    void setSendViewDistance(int viewDistance);
-+    // Paper end - view distance api
-+
-     // Spigot start
-     public class Spigot {
- 
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4ddea8d71723db4326459c96324a817c70492261..a8310063973bb18502d561903b78149a6fda4939 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1930,6 +1930,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * @param affects Whether the player can affect mob spawning
-      */
-     public void setAffectsSpawning(boolean affects);
-+
-+    /**
-+     * Gets the view distance for this player
-+     *
-+     * @return the player's view distance
-+     * @see org.bukkit.World#getViewDistance()
-+     */
-+    public int getViewDistance();
-+
-+    /**
-+     * Sets the view distance for this player
-+     *
-+     * @param viewDistance the player's view distance
-+     * @see org.bukkit.World#setViewDistance(int)
-+     */
-+    public void setViewDistance(int viewDistance);
-+
-+    /**
-+     * Gets the simulation distance for this player
-+     *
-+     * @return the player's simulation distance
-+     */
-+    public int getSimulationDistance();
-+
-+    /**
-+     * Sets the simulation distance for this player
-+     *
-+     * @param simulationDistance the player's new simulation distance
-+     */
-+    public void setSimulationDistance(int simulationDistance);
-+    
-+    /**
-+     * Gets the no-ticking view distance for this player.
-+     * <p>
-+     * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
-+     * be set to tick.
-+     * </p>
-+     * @return The no-tick view distance for this player.
-+     * @deprecated Use {@link #getViewDistance()}
-+     */
-+    @Deprecated
-+    public int getNoTickViewDistance();
-+
-+    /**
-+     * Sets the no-ticking view distance for this player.
-+     * <p>
-+     * No-tick view distance is the view distance where chunks will load, however the chunks and their entities will not
-+     * be set to tick.
-+     * </p>
-+     * @param viewDistance view distance in [2, 32] or -1
-+     * @deprecated Use {@link #setViewDistance(int)}
-+     */
-+    @Deprecated
-+    public void setNoTickViewDistance(int viewDistance);
-+
-+    /**
-+     * Gets the sending view distance for this player.
-+     * <p>
-+     * Sending view distance is the view distance where chunks will load in for players.
-+     * </p>
-+     * @return The sending view distance for this player.
-+     */
-+    public int getSendViewDistance();
-+
-+    /**
-+     * Sets the sending view distance for this player.
-+     * <p>
-+     * Sending view distance is the view distance where chunks will load in for players.
-+     * </p>
-+     * @param viewDistance view distance in [2, 32] or -1
-+     */
-+    public void setSendViewDistance(int viewDistance);
-     // Paper end
- 
-     /**

patches/api/0017-Automatically-disable-plugins-that-fail-to-load.patch

@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Mon, 29 Feb 2016 19:45:21 -0600
+Subject: [PATCH] Automatically disable plugins that fail to load
+
+
+diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+index 333c47a1f7e9d7ddf91aad5ec15163427f7b8039..5eb24f38f158d43fb42836b83c108f808c89512e 100644
+--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
++++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+@@ -335,6 +335,10 @@ public final class JavaPluginLoader implements PluginLoader {
+                 jPlugin.setEnabled(true);
+             } catch (Throwable ex) {
+                 server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
++                // Paper start - Disable plugins that fail to load
++                this.server.getPluginManager().disablePlugin(jPlugin);
++                return;
++                // Paper end
+             }
+ 
+             // Perhaps abort here, rather than continue going, but as it stands,

patches/api/0018-Expose-server-CommandMap.patch

@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: kashike <kashike@vq.lc>
+Date: Mon, 29 Feb 2016 19:48:59 -0600
+Subject: [PATCH] Expose server CommandMap
+
+
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index 3603bcdadeea10f2babe8d6c609d7eaee3f0f89c..5475f7df443a31e839d353e251b0d9d55e53a84f 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -2090,6 +2090,19 @@ public final class Bukkit {
+         return server.getUnsafe();
+     }
+ 
++
++    // Paper start
++    /**
++     * Gets the active {@link org.bukkit.command.CommandMap}
++     *
++     * @return the active command map
++     */
++    @NotNull
++    public static org.bukkit.command.CommandMap getCommandMap() {
++        return server.getCommandMap();
++    }
++    // Paper end
++
+     @NotNull
+     public static Server.Spigot spigot() {
+         return server.spigot();
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index 36f5e47ffcdce23b0b5594881fdd49a3a3337578..2dac2c6e01b4f230750605ab1f49317927705c6b 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -1613,6 +1613,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+     public double[] getTPS();
+     // Paper end
+ 
++    // Paper start
++    /**
++     * Gets the active {@link org.bukkit.command.CommandMap}
++     *
++     * @return the active command map
++     */
++    @NotNull
++    org.bukkit.command.CommandMap getCommandMap();
++
+     /**
+      * Get the advancement specified by this key.
+      *

patches/api/0019-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -0,0 +1,124 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.com>
+Date: Mon, 29 Feb 2016 19:54:32 -0600
+Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
+
+Change Javadoc to be accurate
+
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index 5475f7df443a31e839d353e251b0d9d55e53a84f..7a8eaf46ecd37163dbe34beb2cf8754bddae302f 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -379,6 +379,30 @@ public final class Bukkit {
+         return server.broadcastMessage(message);
+     }
+ 
++    // Paper start
++    /**
++     * Sends the component to all online players.
++     *
++     * @param component the component to send
++     * @deprecated use {@code sendMessage} methods on {@link #getServer()} that accept {@link net.kyori.adventure.text.Component}
++     */
++    @Deprecated
++    public static void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
++        server.broadcast(component);
++    }
++
++    /**
++     * Sends an array of components as a single message to all online players.
++     *
++     * @param components the components to send
++     * @deprecated use {@code sendMessage} methods on {@link #getServer()} that accept {@link net.kyori.adventure.text.Component}
++     */
++    @Deprecated
++    public static void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
++        server.broadcast(components);
++    }
++    // Paper end
++
+     /**
+      * Gets the name of the update folder. The update folder is used to safely
+      * update plugins at the right moment on a plugin load.
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index 2dac2c6e01b4f230750605ab1f49317927705c6b..1aed052ea337f2875b581064bd8e79d8a5a1a9ec 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -312,6 +312,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+     @Deprecated // Paper
+     public int broadcastMessage(@NotNull String message);
+ 
++    // Paper start
++    /**
++     * Sends the component to all online players.
++     *
++     * @param component the component to send
++     * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
++     */
++    @Deprecated
++    public default void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
++        spigot().broadcast(component);
++    }
++
++    /**
++     * Sends an array of components as a single message to all online players.
++     *
++     * @param components the components to send
++     * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
++     */
++    @Deprecated
++    public default void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
++        spigot().broadcast(components);
++    }
++    // Paper end
++
+     /**
+      * Gets the name of the update folder. The update folder is used to safely
+      * update plugins at the right moment on a plugin load.
+diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
+index 292f7827df666c10d7b82aa9b1688bf3f0da5c7b..b91c12089ba0723356ef2d3d1b8b0c66ca8850bf 100644
+--- a/src/main/java/org/bukkit/entity/Player.java
++++ b/src/main/java/org/bukkit/entity/Player.java
+@@ -778,6 +778,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      */
+     public void sendMap(@NotNull MapView map);
+ 
++    // Paper start
++    /**
++     * Sends the component to the player
++     *
++     * @param component the components to send
++     * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
++     */
++    @Override
++    @Deprecated
++    public default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
++        spigot().sendMessage(component);
++    }
++
++    /**
++     * Sends an array of components as a single message to the player
++     *
++     * @param components the components to send
++     * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
++     */
++    @Override
++    @Deprecated
++    public default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
++        spigot().sendMessage(components);
++    }
++
++    /**
++     * Sends an array of components as a single message to the specified screen position of this player
++     *
++     * @param position the screen position
++     * @param components the components to send
++     */
++    public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
++        spigot().sendMessage(position, components);
++    }
++    // Paper end
++
+     /**
+      * Forces an update of the player's entire inventory.
+      *

patches/api/0020-Add-exception-reporting-event.patch

@@ -0,0 +1,579 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.com>
+Date: Mon, 29 Feb 2016 20:24:35 -0600
+Subject: [PATCH] Add exception reporting event
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..306dbd975e9380c22dae0dad526725cc47a36f16
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
+@@ -0,0 +1,42 @@
++package com.destroystokyo.paper.event.server;
++
++import com.google.common.base.Preconditions;
++import org.bukkit.Bukkit;
++import org.bukkit.event.Event;
++import org.bukkit.event.HandlerList;
++import com.destroystokyo.paper.exception.ServerException;
++import org.jetbrains.annotations.NotNull;
++
++/**
++ * Called whenever an exception is thrown in a recoverable section of the server.
++ */
++public class ServerExceptionEvent extends Event {
++    private static final HandlerList handlers = new HandlerList();
++    @NotNull private ServerException exception;
++
++    public ServerExceptionEvent(@NotNull ServerException exception) {
++        super(!Bukkit.isPrimaryThread());
++        this.exception = Preconditions.checkNotNull(exception, "exception");
++    }
++
++    /**
++     * Gets the wrapped exception that was thrown.
++     *
++     * @return Exception thrown
++     */
++    @NotNull
++    public ServerException getException() {
++        return exception;
++    }
++
++    @NotNull
++    @Override
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    @NotNull
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++}
+diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..6fb39af0479a818f7f1465bcdfe505ab4ff7da1a
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
+@@ -0,0 +1,64 @@
++package com.destroystokyo.paper.exception;
++
++import org.bukkit.command.Command;
++import org.bukkit.command.CommandSender;
++
++import static com.google.common.base.Preconditions.checkNotNull;
++
++/**
++ * Thrown when a command throws an exception
++ */
++public class ServerCommandException extends ServerException {
++
++    private final Command command;
++    private final CommandSender commandSender;
++    private final String[] arguments;
++
++    public ServerCommandException(String message, Throwable cause, Command command, CommandSender commandSender, String[] arguments) {
++        super(message, cause);
++        this.commandSender = checkNotNull(commandSender, "commandSender");
++        this.arguments = checkNotNull(arguments, "arguments");
++        this.command = checkNotNull(command, "command");
++    }
++
++    public ServerCommandException(Throwable cause, Command command, CommandSender commandSender, String[] arguments) {
++        super(cause);
++        this.commandSender = checkNotNull(commandSender, "commandSender");
++        this.arguments = checkNotNull(arguments, "arguments");
++        this.command = checkNotNull(command, "command");
++    }
++
++    protected ServerCommandException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace, Command command, CommandSender commandSender, String[] arguments) {
++        super(message, cause, enableSuppression, writableStackTrace);
++        this.commandSender = checkNotNull(commandSender, "commandSender");
++        this.arguments = checkNotNull(arguments, "arguments");
++        this.command = checkNotNull(command, "command");
++    }
++
++    /**
++     * Gets the command which threw the exception
++     *
++     * @return exception throwing command
++     */
++    public Command getCommand() {
++        return command;
++    }
++
++    /**
++     * Gets the command sender which executed the command request
++     *
++     * @return command sender of exception thrown command request
++     */
++    public CommandSender getCommandSender() {
++        return commandSender;
++    }
++
++    /**
++     * Gets the arguments which threw the exception for the command
++     *
++     * @return arguments of exception thrown command request
++     */
++    public String[] getArguments() {
++        return arguments;
++    }
++}
+diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..410b24139535cd5d8439ad581c43c61b5757fbf6
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
+@@ -0,0 +1,52 @@
++package com.destroystokyo.paper.exception;
++
++import org.bukkit.event.Event;
++import org.bukkit.event.Listener;
++import org.bukkit.plugin.Plugin;
++
++import static com.google.common.base.Preconditions.*;
++
++/**
++ * Exception thrown when a server event listener throws an exception
++ */
++public class ServerEventException extends ServerPluginException {
++
++    private final Listener listener;
++    private final Event event;
++
++    public ServerEventException(String message, Throwable cause, Plugin responsiblePlugin, Listener listener, Event event) {
++        super(message, cause, responsiblePlugin);
++        this.listener = checkNotNull(listener, "listener");
++        this.event = checkNotNull(event, "event");
++    }
++
++    public ServerEventException(Throwable cause, Plugin responsiblePlugin, Listener listener, Event event) {
++        super(cause, responsiblePlugin);
++        this.listener = checkNotNull(listener, "listener");
++        this.event = checkNotNull(event, "event");
++    }
++
++    protected ServerEventException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace, Plugin responsiblePlugin, Listener listener, Event event) {
++        super(message, cause, enableSuppression, writableStackTrace, responsiblePlugin);
++        this.listener = checkNotNull(listener, "listener");
++        this.event = checkNotNull(event, "event");
++    }
++
++    /**
++     * Gets the listener which threw the exception
++     *
++     * @return event listener
++     */
++    public Listener getListener() {
++        return listener;
++    }
++
++    /**
++     * Gets the event which caused the exception
++     *
++     * @return event
++     */
++    public Event getEvent() {
++        return event;
++    }
++}
+diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..c06ea3942447d4824b83ff839cb449fb818dede1
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
+@@ -0,0 +1,23 @@
++package com.destroystokyo.paper.exception;
++
++/**
++ * Wrapper exception for all exceptions that are thrown by the server.
++ */
++public class ServerException extends Exception {
++
++    public ServerException(String message) {
++        super(message);
++    }
++
++    public ServerException(String message, Throwable cause) {
++        super(message, cause);
++    }
++
++    public ServerException(Throwable cause) {
++        super(cause);
++    }
++
++    protected ServerException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
++        super(message, cause, enableSuppression, writableStackTrace);
++    }
++}
+diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..e762ed0dbad51625e65fef2e1898679108459a36
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
+@@ -0,0 +1,35 @@
++package com.destroystokyo.paper.exception;
++
++import org.bukkit.Bukkit;
++import com.destroystokyo.paper.event.server.ServerExceptionEvent;
++
++/**
++ * Thrown when the internal server throws a recoverable exception.
++ */
++public class ServerInternalException extends ServerException {
++
++    public ServerInternalException(String message) {
++        super(message);
++    }
++
++    public ServerInternalException(String message, Throwable cause) {
++        super(message, cause);
++    }
++
++    public ServerInternalException(Throwable cause) {
++        super(cause);
++    }
++
++    protected ServerInternalException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
++        super(message, cause, enableSuppression, writableStackTrace);
++    }
++
++    public static void reportInternalException(Throwable cause) {
++        try {
++            Bukkit.getPluginManager().callEvent(new ServerExceptionEvent(new ServerInternalException(cause)));
++            ;
++        } catch (Throwable t) {
++            t.printStackTrace(); // Don't want to rethrow!
++        }
++    }
++}
+diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..f016ba3b1b62e554a9bacbb9635f2dbe441b3c4e
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
+@@ -0,0 +1,20 @@
++package com.destroystokyo.paper.exception;
++
++import org.bukkit.plugin.Plugin;
++
++/**
++ * Thrown whenever there is an exception with any enabling or disabling of plugins.
++ */
++public class ServerPluginEnableDisableException extends ServerPluginException {
++    public ServerPluginEnableDisableException(String message, Throwable cause, Plugin responsiblePlugin) {
++        super(message, cause, responsiblePlugin);
++    }
++
++    public ServerPluginEnableDisableException(Throwable cause, Plugin responsiblePlugin) {
++        super(cause, responsiblePlugin);
++    }
++
++    protected ServerPluginEnableDisableException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace, Plugin responsiblePlugin) {
++        super(message, cause, enableSuppression, writableStackTrace, responsiblePlugin);
++    }
++}
+\ No newline at end of file
+diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..be3f92e3c6bcefe8b78da701b75121275001882e
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
+@@ -0,0 +1,36 @@
++package com.destroystokyo.paper.exception;
++
++import org.bukkit.plugin.Plugin;
++
++import static com.google.common.base.Preconditions.checkNotNull;
++
++/**
++ * Wrapper exception for all cases to which a plugin can be immediately blamed for
++ */
++public class ServerPluginException extends ServerException {
++    public ServerPluginException(String message, Throwable cause, Plugin responsiblePlugin) {
++        super(message, cause);
++        this.responsiblePlugin = checkNotNull(responsiblePlugin, "responsiblePlugin");
++    }
++
++    public ServerPluginException(Throwable cause, Plugin responsiblePlugin) {
++        super(cause);
++        this.responsiblePlugin = checkNotNull(responsiblePlugin, "responsiblePlugin");
++    }
++
++    protected ServerPluginException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace, Plugin responsiblePlugin) {
++        super(message, cause, enableSuppression, writableStackTrace);
++        this.responsiblePlugin = checkNotNull(responsiblePlugin, "responsiblePlugin");
++    }
++
++    private final Plugin responsiblePlugin;
++
++    /**
++     * Gets the plugin which is directly responsible for the exception being thrown
++     *
++     * @return plugin which is responsible for the exception throw
++     */
++    public Plugin getResponsiblePlugin() {
++        return responsiblePlugin;
++    }
++}
+diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..89e132525cfae0ce979e37b3e2793df781e47227
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
+@@ -0,0 +1,64 @@
++package com.destroystokyo.paper.exception;
++
++import org.bukkit.entity.Player;
++import org.bukkit.plugin.Plugin;
++
++import static com.google.common.base.Preconditions.*;
++
++/**
++ * Thrown when an incoming plugin message channel throws an exception
++ */
++public class ServerPluginMessageException extends ServerPluginException {
++
++    private final Player player;
++    private final String channel;
++    private final byte[] data;
++
++    public ServerPluginMessageException(String message, Throwable cause, Plugin responsiblePlugin, Player player, String channel, byte[] data) {
++        super(message, cause, responsiblePlugin);
++        this.player = checkNotNull(player, "player");
++        this.channel = checkNotNull(channel, "channel");
++        this.data = checkNotNull(data, "data");
++    }
++
++    public ServerPluginMessageException(Throwable cause, Plugin responsiblePlugin, Player player, String channel, byte[] data) {
++        super(cause, responsiblePlugin);
++        this.player = checkNotNull(player, "player");
++        this.channel = checkNotNull(channel, "channel");
++        this.data = checkNotNull(data, "data");
++    }
++
++    protected ServerPluginMessageException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace, Plugin responsiblePlugin, Player player, String channel, byte[] data) {
++        super(message, cause, enableSuppression, writableStackTrace, responsiblePlugin);
++        this.player = checkNotNull(player, "player");
++        this.channel = checkNotNull(channel, "channel");
++        this.data = checkNotNull(data, "data");
++    }
++
++    /**
++     * Gets the channel to which the error occurred from recieving data from
++     *
++     * @return exception channel
++     */
++    public String getChannel() {
++        return channel;
++    }
++
++    /**
++     * Gets the data to which the error occurred from
++     *
++     * @return exception data
++     */
++    public byte[] getData() {
++        return data;
++    }
++
++    /**
++     * Gets the player which the plugin message causing the exception originated from
++     *
++     * @return exception player
++     */
++    public Player getPlayer() {
++        return player;
++    }
++}
+diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..2d0b2d4a9b3e5bdeec0e4ea7ab69858d86aa3715
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
+@@ -0,0 +1,37 @@
++package com.destroystokyo.paper.exception;
++
++import org.bukkit.scheduler.BukkitTask;
++
++import static com.google.common.base.Preconditions.checkNotNull;
++
++/**
++ * Thrown when a plugin's scheduler fails with an exception
++ */
++public class ServerSchedulerException extends ServerPluginException {
++
++    private final BukkitTask task;
++
++    public ServerSchedulerException(String message, Throwable cause, BukkitTask task) {
++        super(message, cause, task.getOwner());
++        this.task = checkNotNull(task, "task");
++    }
++
++    public ServerSchedulerException(Throwable cause, BukkitTask task) {
++        super(cause, task.getOwner());
++        this.task = checkNotNull(task, "task");
++    }
++
++    protected ServerSchedulerException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace, BukkitTask task) {
++        super(message, cause, enableSuppression, writableStackTrace, task.getOwner());
++        this.task = checkNotNull(task, "task");
++    }
++
++    /**
++     * Gets the task which threw the exception
++     *
++     * @return exception throwing task
++     */
++    public BukkitTask getTask() {
++        return task;
++    }
++}
+diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..5582999fe94c7a3dac655044ccc6d078cd9521a1
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
+@@ -0,0 +1,22 @@
++package com.destroystokyo.paper.exception;
++
++import org.bukkit.command.Command;
++import org.bukkit.command.CommandSender;
++
++/**
++ * Called when a tab-complete request throws an exception
++ */
++public class ServerTabCompleteException extends ServerCommandException {
++
++    public ServerTabCompleteException(String message, Throwable cause, Command command, CommandSender commandSender, String[] arguments) {
++        super(message, cause, command, commandSender, arguments);
++    }
++
++    public ServerTabCompleteException(Throwable cause, Command command, CommandSender commandSender, String[] arguments) {
++        super(cause, command, commandSender, arguments);
++    }
++
++    protected ServerTabCompleteException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace, Command command, CommandSender commandSender, String[] arguments) {
++        super(message, cause, enableSuppression, writableStackTrace, command, commandSender, arguments);
++    }
++}
+diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
+index f99d71301ceaa3af07ff0525f7d657ac6253d0e6..2e23c124311b38aaea64dd274c33afcd52edcf43 100644
+--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
++++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
+@@ -155,11 +155,14 @@ public class SimpleCommandMap implements CommandMap {
+             target.execute(sender, sentCommandLabel, Arrays.copyOfRange(args, 1, args.length));
+             } // target.timings.stopTiming(); // Spigot // Paper
+         } catch (CommandException ex) {
++            server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
+             //target.timings.stopTiming(); // Spigot // Paper
+             throw ex;
+         } catch (Throwable ex) {
+             //target.timings.stopTiming(); // Spigot // Paper
+-            throw new CommandException("Unhandled exception executing '" + commandLine + "' in " + target, ex);
++            String msg = "Unhandled exception executing '" + commandLine + "' in " + target;
++            server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
++            throw new CommandException(msg, ex);
+         }
+ 
+         // return true as command was handled
+@@ -238,7 +241,9 @@ public class SimpleCommandMap implements CommandMap {
+         } catch (CommandException ex) {
+             throw ex;
+         } catch (Throwable ex) {
+-            throw new CommandException("Unhandled exception executing tab-completer for '" + cmdLine + "' in " + target, ex);
++            String msg = "Unhandled exception executing tab-completer for '" + cmdLine + "' in " + target;
++            server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerTabCompleteException(msg, ex, target, sender, args))); // Paper
++            throw new CommandException(msg, ex);
+         }
+     }
+ 
+diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+index 1bfa9fcb1b803eecfe33156f81ee88d2922ca88a..b535ab89b5a04371bac41720d28b4af8b18f1c20 100644
+--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
++++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+@@ -488,7 +488,8 @@ public final class SimplePluginManager implements PluginManager {
+             try {
+                 plugin.getPluginLoader().enablePlugin(plugin);
+             } catch (Throwable ex) {
+-                server.getLogger().log(Level.SEVERE, "Error occurred (in the plugin loader) while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
++                handlePluginException("Error occurred (in the plugin loader) while enabling "
++                        + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin);
+             }
+ 
+             HandlerList.bakeAll();
+@@ -509,32 +510,37 @@ public final class SimplePluginManager implements PluginManager {
+             try {
+                 plugin.getPluginLoader().disablePlugin(plugin);
+             } catch (Throwable ex) {
+-                server.getLogger().log(Level.SEVERE, "Error occurred (in the plugin loader) while disabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
++                handlePluginException("Error occurred (in the plugin loader) while disabling "
++                        + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
+             }
+ 
+             try {
+                 server.getScheduler().cancelTasks(plugin);
+             } catch (Throwable ex) {
+-                server.getLogger().log(Level.SEVERE, "Error occurred (in the plugin loader) while cancelling tasks for " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
++                handlePluginException("Error occurred (in the plugin loader) while cancelling tasks for "
++                        + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
+             }
+ 
+             try {
+                 server.getServicesManager().unregisterAll(plugin);
+             } catch (Throwable ex) {
+-                server.getLogger().log(Level.SEVERE, "Error occurred (in the plugin loader) while unregistering services for " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
++                handlePluginException("Error occurred (in the plugin loader) while unregistering services for "
++                        + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
+             }
+ 
+             try {
+                 HandlerList.unregisterAll(plugin);
+             } catch (Throwable ex) {
+-                server.getLogger().log(Level.SEVERE, "Error occurred (in the plugin loader) while unregistering events for " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
++                handlePluginException("Error occurred (in the plugin loader) while unregistering events for "
++                        + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
+             }
+ 
+             try {
+                 server.getMessenger().unregisterIncomingPluginChannel(plugin);
+                 server.getMessenger().unregisterOutgoingPluginChannel(plugin);
+             } catch (Throwable ex) {
+-                server.getLogger().log(Level.SEVERE, "Error occurred (in the plugin loader) while unregistering plugin channels for " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
++                handlePluginException("Error occurred (in the plugin loader) while unregistering plugin channels for "
++                        + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
+             }
+ 
+             try {
+@@ -547,6 +553,13 @@ public final class SimplePluginManager implements PluginManager {
+         }
+     }
+ 
++    // Paper start
++    private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
++        server.getLogger().log(Level.SEVERE, msg, ex);
++        callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
++    }
++    // Paper end
++
+     @Override
+     public void clearPlugins() {
+         synchronized (this) {
+@@ -610,7 +623,13 @@ public final class SimplePluginManager implements PluginManager {
+                             ));
+                 }
+             } catch (Throwable ex) {
+-                server.getLogger().log(Level.SEVERE, "Could not pass event " + event.getEventName() + " to " + registration.getPlugin().getDescription().getFullName(), ex);
++                // Paper start - error reporting
++                String msg = "Could not pass event " + event.getEventName() + " to " + registration.getPlugin().getDescription().getFullName();
++                server.getLogger().log(Level.SEVERE, msg, ex);
++                if (!(event instanceof com.destroystokyo.paper.event.server.ServerExceptionEvent)) { // We don't want to cause an endless event loop
++                    callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
++                }
++                // Paper end
+             }
+         }
+     }

patches/api/0020-Expose-server-CommandMap.patch

@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Mon, 29 Feb 2016 19:48:59 -0600
-Subject: [PATCH] Expose server CommandMap
-
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 397f57f0ab4844fb88c60681bf6e6e3db8a98945..1035ce181415a19f8d6460f70d3d900e3f7017d3 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2092,6 +2092,19 @@ public final class Bukkit {
-         return server.getUnsafe();
-     }
- 
-+
-+    // Paper start
-+    /**
-+     * Gets the active {@link org.bukkit.command.CommandMap}
-+     *
-+     * @return the active command map
-+     */
-+    @NotNull
-+    public static org.bukkit.command.CommandMap getCommandMap() {
-+        return server.getCommandMap();
-+    }
-+    // Paper end
-+
-     @NotNull
-     public static Server.Spigot spigot() {
-         return server.spigot();
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 3f3531e208472a0e76f76e2b1a08a699527cef8f..6a7b91af3e738613cf79c13e2844efe9a2efd254 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1615,6 +1615,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     public double[] getTPS();
-     // Paper end
- 
-+    // Paper start
-+    /**
-+     * Gets the active {@link org.bukkit.command.CommandMap}
-+     *
-+     * @return the active command map
-+     */
-+    @NotNull
-+    org.bukkit.command.CommandMap getCommandMap();
-+
-     /**
-      * Get the advancement specified by this key.
-      *

patches/api/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch

@@ -0,0 +1,54 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: kashike <kashike@vq.lc>
+Date: Tue, 8 Mar 2016 13:05:59 -0800
+Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
+
+
+diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
+index ec97093a4410322ad44e111d894a3b1a5c5f7b88..f3cf27e075ea01d9d825aead3782db66cd4f2c3b 100644
+--- a/src/main/java/org/bukkit/command/CommandSender.java
++++ b/src/main/java/org/bukkit/command/CommandSender.java
+@@ -1,6 +1,9 @@
+ package org.bukkit.command;
+ 
+ import java.util.UUID;
++import net.kyori.adventure.audience.MessageType;
++import net.kyori.adventure.identity.Identity;
++import net.kyori.adventure.text.Component;
+ import org.bukkit.Server;
+ import org.bukkit.permissions.Permissible;
+ import org.jetbrains.annotations.NotNull;
+@@ -145,5 +148,33 @@ public interface CommandSender extends net.kyori.adventure.audience.Audience, Pe
+     default void sendPlainMessage(final @NotNull String message) {
+         this.sendMessage(net.kyori.adventure.text.Component.text(message));
+     }
++
++    /**
++     * Sends the component to the sender
++     *
++     * <p>If this sender does not support sending full components then
++     * the component will be sent as legacy text.</p>
++     *
++     * @param component the component to send
++     * @deprecated use {@link #sendMessage(Identity, Component, MessageType)} instead
++     */
++    @Deprecated
++    default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
++        this.sendMessage(component.toLegacyText());
++    }
++
++    /**
++     * Sends an array of components as a single message to the sender
++     *
++     * <p>If this sender does not support sending full components then
++     * the components will be sent as legacy text.</p>
++     *
++     * @param components the components to send
++     * @deprecated use {@link #sendMessage(Identity, Component, MessageType)} instead
++     */
++    @Deprecated
++    default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
++        this.sendMessage(new net.md_5.bungee.api.chat.TextComponent(components).toLegacyText());
++    }
+     // Paper end
+ }

patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -1,124 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Mon, 29 Feb 2016 19:54:32 -0600
-Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
-
-Change Javadoc to be accurate
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 1035ce181415a19f8d6460f70d3d900e3f7017d3..316146305465b68b703e898206745de94ad5350f 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -379,6 +379,30 @@ public final class Bukkit {
-         return server.broadcastMessage(message);
-     }
- 
-+    // Paper start
-+    /**
-+     * Sends the component to all online players.
-+     *
-+     * @param component the component to send
-+     * @deprecated use {@code sendMessage} methods on {@link #getServer()} that accept {@link net.kyori.adventure.text.Component}
-+     */
-+    @Deprecated
-+    public static void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
-+        server.broadcast(component);
-+    }
-+
-+    /**
-+     * Sends an array of components as a single message to all online players.
-+     *
-+     * @param components the components to send
-+     * @deprecated use {@code sendMessage} methods on {@link #getServer()} that accept {@link net.kyori.adventure.text.Component}
-+     */
-+    @Deprecated
-+    public static void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
-+        server.broadcast(components);
-+    }
-+    // Paper end
-+
-     /**
-      * Gets the name of the update folder. The update folder is used to safely
-      * update plugins at the right moment on a plugin load.
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6a7b91af3e738613cf79c13e2844efe9a2efd254..bef555b3de44fed312b45a5d5cd811b18fda88c8 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -312,6 +312,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     @Deprecated // Paper
-     public int broadcastMessage(@NotNull String message);
- 
-+    // Paper start
-+    /**
-+     * Sends the component to all online players.
-+     *
-+     * @param component the component to send
-+     * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
-+     */
-+    @Deprecated
-+    public default void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
-+        spigot().broadcast(component);
-+    }
-+
-+    /**
-+     * Sends an array of components as a single message to all online players.
-+     *
-+     * @param components the components to send
-+     * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
-+     */
-+    @Deprecated
-+    public default void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
-+        spigot().broadcast(components);
-+    }
-+    // Paper end
-+
-     /**
-      * Gets the name of the update folder. The update folder is used to safely
-      * update plugins at the right moment on a plugin load.
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a8310063973bb18502d561903b78149a6fda4939..a2c813d6d94ae2a87278d92445635ae8dd3ab00a 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -813,6 +813,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      */
-     public void sendMap(@NotNull MapView map);
- 
-+    // Paper start
-+    /**
-+     * Sends the component to the player
-+     *
-+     * @param component the components to send
-+     * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
-+     */
-+    @Override
-+    @Deprecated
-+    public default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
-+        spigot().sendMessage(component);
-+    }
-+
-+    /**
-+     * Sends an array of components as a single message to the player
-+     *
-+     * @param components the components to send
-+     * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
-+     */
-+    @Override
-+    @Deprecated
-+    public default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
-+        spigot().sendMessage(components);
-+    }
-+
-+    /**
-+     * Sends an array of components as a single message to the specified screen position of this player
-+     *
-+     * @param position the screen position
-+     * @param components the components to send
-+     */
-+    public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
-+        spigot().sendMessage(position, components);
-+    }
-+    // Paper end
-+
-     /**
-      * Add custom chat completion suggestions shown to the player while typing a
-      * message.

patches/api/0022-Add-exception-reporting-event.patch

@@ -1,580 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Mon, 29 Feb 2016 20:24:35 -0600
-Subject: [PATCH] Add exception reporting event
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..306dbd975e9380c22dae0dad526725cc47a36f16
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
-@@ -0,0 +1,42 @@
-+package com.destroystokyo.paper.event.server;
-+
-+import com.google.common.base.Preconditions;
-+import org.bukkit.Bukkit;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.HandlerList;
-+import com.destroystokyo.paper.exception.ServerException;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Called whenever an exception is thrown in a recoverable section of the server.
-+ */
-+public class ServerExceptionEvent extends Event {
-+    private static final HandlerList handlers = new HandlerList();
-+    @NotNull private ServerException exception;
-+
-+    public ServerExceptionEvent(@NotNull ServerException exception) {
-+        super(!Bukkit.isPrimaryThread());
-+        this.exception = Preconditions.checkNotNull(exception, "exception");
-+    }
-+
-+    /**
-+     * Gets the wrapped exception that was thrown.
-+     *
-+     * @return Exception thrown
-+     */
-+    @NotNull
-+    public ServerException getException() {
-+        return exception;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..6fb39af0479a818f7f1465bcdfe505ab4ff7da1a
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
-@@ -0,0 +1,64 @@
-+package com.destroystokyo.paper.exception;
-+
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+
-+import static com.google.common.base.Preconditions.checkNotNull;
-+
-+/**
-+ * Thrown when a command throws an exception
-+ */
-+public class ServerCommandException extends ServerException {
-+
-+    private final Command command;
-+    private final CommandSender commandSender;
-+    private final String[] arguments;
-+
-+    public ServerCommandException(String message, Throwable cause, Command command, CommandSender commandSender, String[] arguments) {
-+        super(message, cause);
-+        this.commandSender = checkNotNull(commandSender, "commandSender");
-+        this.arguments = checkNotNull(arguments, "arguments");
-+        this.command = checkNotNull(command, "command");
-+    }
-+
-+    public ServerCommandException(Throwable cause, Command command, CommandSender commandSender, String[] arguments) {
-+        super(cause);
-+        this.commandSender = checkNotNull(commandSender, "commandSender");
-+        this.arguments = checkNotNull(arguments, "arguments");
-+        this.command = checkNotNull(command, "command");
-+    }
-+
-+    protected ServerCommandException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace, Command command, CommandSender commandSender, String[] arguments) {
-+        super(message, cause, enableSuppression, writableStackTrace);
-+        this.commandSender = checkNotNull(commandSender, "commandSender");
-+        this.arguments = checkNotNull(arguments, "arguments");
-+        this.command = checkNotNull(command, "command");
-+    }
-+
-+    /**
-+     * Gets the command which threw the exception
-+     *
-+     * @return exception throwing command
-+     */
-+    public Command getCommand() {
-+        return command;
-+    }
-+
-+    /**
-+     * Gets the command sender which executed the command request
-+     *
-+     * @return command sender of exception thrown command request
-+     */
-+    public CommandSender getCommandSender() {
-+        return commandSender;
-+    }
-+
-+    /**
-+     * Gets the arguments which threw the exception for the command
-+     *
-+     * @return arguments of exception thrown command request
-+     */
-+    public String[] getArguments() {
-+        return arguments;
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..410b24139535cd5d8439ad581c43c61b5757fbf6
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
-@@ -0,0 +1,52 @@
-+package com.destroystokyo.paper.exception;
-+
-+import org.bukkit.event.Event;
-+import org.bukkit.event.Listener;
-+import org.bukkit.plugin.Plugin;
-+
-+import static com.google.common.base.Preconditions.*;
-+
-+/**
-+ * Exception thrown when a server event listener throws an exception
-+ */
-+public class ServerEventException extends ServerPluginException {
-+
-+    private final Listener listener;
-+    private final Event event;
-+
-+    public ServerEventException(String message, Throwable cause, Plugin responsiblePlugin, Listener listener, Event event) {
-+        super(message, cause, responsiblePlugin);
-+        this.listener = checkNotNull(listener, "listener");
-+        this.event = checkNotNull(event, "event");
-+    }
-+
-+    public ServerEventException(Throwable cause, Plugin responsiblePlugin, Listener listener, Event event) {
-+        super(cause, responsiblePlugin);
-+        this.listener = checkNotNull(listener, "listener");
-+        this.event = checkNotNull(event, "event");
-+    }
-+
-+    protected ServerEventException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace, Plugin responsiblePlugin, Listener listener, Event event) {
-+        super(message, cause, enableSuppression, writableStackTrace, responsiblePlugin);
-+        this.listener = checkNotNull(listener, "listener");
-+        this.event = checkNotNull(event, "event");
-+    }
-+
-+    /**
-+     * Gets the listener which threw the exception
-+     *
-+     * @return event listener
-+     */
-+    public Listener getListener() {
-+        return listener;
-+    }
-+
-+    /**
-+     * Gets the event which caused the exception
-+     *
-+     * @return event
-+     */
-+    public Event getEvent() {
-+        return event;
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..c06ea3942447d4824b83ff839cb449fb818dede1
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
-@@ -0,0 +1,23 @@
-+package com.destroystokyo.paper.exception;
-+
-+/**
-+ * Wrapper exception for all exceptions that are thrown by the server.
-+ */
-+public class ServerException extends Exception {
-+
-+    public ServerException(String message) {
-+        super(message);
-+    }
-+
-+    public ServerException(String message, Throwable cause) {
-+        super(message, cause);
-+    }
-+
-+    public ServerException(Throwable cause) {
-+        super(cause);
-+    }
-+
-+    protected ServerException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-+        super(message, cause, enableSuppression, writableStackTrace);
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..2c3effca7c9d6c904cbe248d312b74e2cd360acf
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
-@@ -0,0 +1,36 @@
-+package com.destroystokyo.paper.exception;
-+
-+import java.util.logging.Level;
-+import org.bukkit.Bukkit;
-+import com.destroystokyo.paper.event.server.ServerExceptionEvent;
-+
-+/**
-+ * Thrown when the internal server throws a recoverable exception.
-+ */
-+public class ServerInternalException extends ServerException {
-+
-+    public ServerInternalException(String message) {
-+        super(message);
-+    }
-+
-+    public ServerInternalException(String message, Throwable cause) {
-+        super(message, cause);
-+    }
-+
-+    public ServerInternalException(Throwable cause) {
-+        super(cause);
-+    }
-+
-+    protected ServerInternalException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-+        super(message, cause, enableSuppression, writableStackTrace);
-+    }
-+
-+    public static void reportInternalException(Throwable cause) {
-+        try {
-+            Bukkit.getPluginManager().callEvent(new ServerExceptionEvent(new ServerInternalException(cause)));
-+            ;
-+        } catch (Throwable t) {
-+            Bukkit.getLogger().log(Level.WARNING, "Exception posting ServerExceptionEvent", t); // Don't want to rethrow!
-+        }
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..f016ba3b1b62e554a9bacbb9635f2dbe441b3c4e
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
-@@ -0,0 +1,20 @@
-+package com.destroystokyo.paper.exception;
-+
-+import org.bukkit.plugin.Plugin;
-+
-+/**
-+ * Thrown whenever there is an exception with any enabling or disabling of plugins.
-+ */
-+public class ServerPluginEnableDisableException extends ServerPluginException {
-+    public ServerPluginEnableDisableException(String message, Throwable cause, Plugin responsiblePlugin) {
-+        super(message, cause, responsiblePlugin);
-+    }
-+
-+    public ServerPluginEnableDisableException(Throwable cause, Plugin responsiblePlugin) {
-+        super(cause, responsiblePlugin);
-+    }
-+
-+    protected ServerPluginEnableDisableException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace, Plugin responsiblePlugin) {
-+        super(message, cause, enableSuppression, writableStackTrace, responsiblePlugin);
-+    }
-+}
-\ No newline at end of file
-diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..be3f92e3c6bcefe8b78da701b75121275001882e
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
-@@ -0,0 +1,36 @@
-+package com.destroystokyo.paper.exception;
-+
-+import org.bukkit.plugin.Plugin;
-+
-+import static com.google.common.base.Preconditions.checkNotNull;
-+
-+/**
-+ * Wrapper exception for all cases to which a plugin can be immediately blamed for
-+ */
-+public class ServerPluginException extends ServerException {
-+    public ServerPluginException(String message, Throwable cause, Plugin responsiblePlugin) {
-+        super(message, cause);
-+        this.responsiblePlugin = checkNotNull(responsiblePlugin, "responsiblePlugin");
-+    }
-+
-+    public ServerPluginException(Throwable cause, Plugin responsiblePlugin) {
-+        super(cause);
-+        this.responsiblePlugin = checkNotNull(responsiblePlugin, "responsiblePlugin");
-+    }
-+
-+    protected ServerPluginException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace, Plugin responsiblePlugin) {
-+        super(message, cause, enableSuppression, writableStackTrace);
-+        this.responsiblePlugin = checkNotNull(responsiblePlugin, "responsiblePlugin");
-+    }
-+
-+    private final Plugin responsiblePlugin;
-+
-+    /**
-+     * Gets the plugin which is directly responsible for the exception being thrown
-+     *
-+     * @return plugin which is responsible for the exception throw
-+     */
-+    public Plugin getResponsiblePlugin() {
-+        return responsiblePlugin;
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..89e132525cfae0ce979e37b3e2793df781e47227
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
-@@ -0,0 +1,64 @@
-+package com.destroystokyo.paper.exception;
-+
-+import org.bukkit.entity.Player;
-+import org.bukkit.plugin.Plugin;
-+
-+import static com.google.common.base.Preconditions.*;
-+
-+/**
-+ * Thrown when an incoming plugin message channel throws an exception
-+ */
-+public class ServerPluginMessageException extends ServerPluginException {
-+
-+    private final Player player;
-+    private final String channel;
-+    private final byte[] data;
-+
-+    public ServerPluginMessageException(String message, Throwable cause, Plugin responsiblePlugin, Player player, String channel, byte[] data) {
-+        super(message, cause, responsiblePlugin);
-+        this.player = checkNotNull(player, "player");
-+        this.channel = checkNotNull(channel, "channel");
-+        this.data = checkNotNull(data, "data");
-+    }
-+
-+    public ServerPluginMessageException(Throwable cause, Plugin responsiblePlugin, Player player, String channel, byte[] data) {
-+        super(cause, responsiblePlugin);
-+        this.player = checkNotNull(player, "player");
-+        this.channel = checkNotNull(channel, "channel");
-+        this.data = checkNotNull(data, "data");
-+    }
-+
-+    protected ServerPluginMessageException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace, Plugin responsiblePlugin, Player player, String channel, byte[] data) {
-+        super(message, cause, enableSuppression, writableStackTrace, responsiblePlugin);
-+        this.player = checkNotNull(player, "player");
-+        this.channel = checkNotNull(channel, "channel");
-+        this.data = checkNotNull(data, "data");
-+    }
-+
-+    /**
-+     * Gets the channel to which the error occurred from recieving data from
-+     *
-+     * @return exception channel
-+     */
-+    public String getChannel() {
-+        return channel;
-+    }
-+
-+    /**
-+     * Gets the data to which the error occurred from
-+     *
-+     * @return exception data
-+     */
-+    public byte[] getData() {
-+        return data;
-+    }
-+
-+    /**
-+     * Gets the player which the plugin message causing the exception originated from
-+     *
-+     * @return exception player
-+     */
-+    public Player getPlayer() {
-+        return player;
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..2d0b2d4a9b3e5bdeec0e4ea7ab69858d86aa3715
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
-@@ -0,0 +1,37 @@
-+package com.destroystokyo.paper.exception;
-+
-+import org.bukkit.scheduler.BukkitTask;
-+
-+import static com.google.common.base.Preconditions.checkNotNull;
-+
-+/**
-+ * Thrown when a plugin's scheduler fails with an exception
-+ */
-+public class ServerSchedulerException extends ServerPluginException {
-+
-+    private final BukkitTask task;
-+
-+    public ServerSchedulerException(String message, Throwable cause, BukkitTask task) {
-+        super(message, cause, task.getOwner());
-+        this.task = checkNotNull(task, "task");
-+    }
-+
-+    public ServerSchedulerException(Throwable cause, BukkitTask task) {
-+        super(cause, task.getOwner());
-+        this.task = checkNotNull(task, "task");
-+    }
-+
-+    protected ServerSchedulerException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace, BukkitTask task) {
-+        super(message, cause, enableSuppression, writableStackTrace, task.getOwner());
-+        this.task = checkNotNull(task, "task");
-+    }
-+
-+    /**
-+     * Gets the task which threw the exception
-+     *
-+     * @return exception throwing task
-+     */
-+    public BukkitTask getTask() {
-+        return task;
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..5582999fe94c7a3dac655044ccc6d078cd9521a1
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
-@@ -0,0 +1,22 @@
-+package com.destroystokyo.paper.exception;
-+
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+
-+/**
-+ * Called when a tab-complete request throws an exception
-+ */
-+public class ServerTabCompleteException extends ServerCommandException {
-+
-+    public ServerTabCompleteException(String message, Throwable cause, Command command, CommandSender commandSender, String[] arguments) {
-+        super(message, cause, command, commandSender, arguments);
-+    }
-+
-+    public ServerTabCompleteException(Throwable cause, Command command, CommandSender commandSender, String[] arguments) {
-+        super(cause, command, commandSender, arguments);
-+    }
-+
-+    protected ServerTabCompleteException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace, Command command, CommandSender commandSender, String[] arguments) {
-+        super(message, cause, enableSuppression, writableStackTrace, command, commandSender, arguments);
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 4205649948a9e2a72f64c3f007112245abac6d50..b3b32ce429edbf1ed040354dbe28ab86f0d24201 100644
---- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
-+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -155,11 +155,14 @@ public class SimpleCommandMap implements CommandMap {
-             target.execute(sender, sentCommandLabel, Arrays.copyOfRange(args, 1, args.length));
-             } // target.timings.stopTiming(); // Spigot // Paper
-         } catch (CommandException ex) {
-+            server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
-             //target.timings.stopTiming(); // Spigot // Paper
-             throw ex;
-         } catch (Throwable ex) {
-             //target.timings.stopTiming(); // Spigot // Paper
--            throw new CommandException("Unhandled exception executing '" + commandLine + "' in " + target, ex);
-+            String msg = "Unhandled exception executing '" + commandLine + "' in " + target;
-+            server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
-+            throw new CommandException(msg, ex);
-         }
- 
-         // return true as command was handled
-@@ -238,7 +241,9 @@ public class SimpleCommandMap implements CommandMap {
-         } catch (CommandException ex) {
-             throw ex;
-         } catch (Throwable ex) {
--            throw new CommandException("Unhandled exception executing tab-completer for '" + cmdLine + "' in " + target, ex);
-+            String msg = "Unhandled exception executing tab-completer for '" + cmdLine + "' in " + target;
-+            server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerTabCompleteException(msg, ex, target, sender, args))); // Paper
-+            throw new CommandException(msg, ex);
-         }
-     }
- 
-diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 3fcb73a0fc2daaeb76dd4c6757afce52c5b3118b..2b8308989fce7f8a16907f8711b362e671fdbfb6 100644
---- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -515,7 +515,8 @@ public final class SimplePluginManager implements PluginManager {
-             try {
-                 plugin.getPluginLoader().enablePlugin(plugin);
-             } catch (Throwable ex) {
--                server.getLogger().log(Level.SEVERE, "Error occurred (in the plugin loader) while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
-+                handlePluginException("Error occurred (in the plugin loader) while enabling "
-+                        + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin);
-             }
- 
-             HandlerList.bakeAll();
-@@ -538,32 +539,37 @@ public final class SimplePluginManager implements PluginManager {
-             try {
-                 plugin.getPluginLoader().disablePlugin(plugin);
-             } catch (Throwable ex) {
--                server.getLogger().log(Level.SEVERE, "Error occurred (in the plugin loader) while disabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
-+                handlePluginException("Error occurred (in the plugin loader) while disabling "
-+                        + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
-             }
- 
-             try {
-                 server.getScheduler().cancelTasks(plugin);
-             } catch (Throwable ex) {
--                server.getLogger().log(Level.SEVERE, "Error occurred (in the plugin loader) while cancelling tasks for " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
-+                handlePluginException("Error occurred (in the plugin loader) while cancelling tasks for "
-+                        + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
-             }
- 
-             try {
-                 server.getServicesManager().unregisterAll(plugin);
-             } catch (Throwable ex) {
--                server.getLogger().log(Level.SEVERE, "Error occurred (in the plugin loader) while unregistering services for " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
-+                handlePluginException("Error occurred (in the plugin loader) while unregistering services for "
-+                        + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
-             }
- 
-             try {
-                 HandlerList.unregisterAll(plugin);
-             } catch (Throwable ex) {
--                server.getLogger().log(Level.SEVERE, "Error occurred (in the plugin loader) while unregistering events for " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
-+                handlePluginException("Error occurred (in the plugin loader) while unregistering events for "
-+                        + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
-             }
- 
-             try {
-                 server.getMessenger().unregisterIncomingPluginChannel(plugin);
-                 server.getMessenger().unregisterOutgoingPluginChannel(plugin);
-             } catch (Throwable ex) {
--                server.getLogger().log(Level.SEVERE, "Error occurred (in the plugin loader) while unregistering plugin channels for " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
-+                handlePluginException("Error occurred (in the plugin loader) while unregistering plugin channels for "
-+                        + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
-             }
- 
-             try {
-@@ -576,6 +582,13 @@ public final class SimplePluginManager implements PluginManager {
-         }
-     }
- 
-+    // Paper start
-+    private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
-+        server.getLogger().log(Level.SEVERE, msg, ex);
-+        callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
-+    }
-+    // Paper end
-+
-     @Override
-     public void clearPlugins() {
-         if (true) {this.paperPluginManager.clearPlugins(); return;} // Paper
-@@ -641,7 +654,13 @@ public final class SimplePluginManager implements PluginManager {
-                             ));
-                 }
-             } catch (Throwable ex) {
--                server.getLogger().log(Level.SEVERE, "Could not pass event " + event.getEventName() + " to " + registration.getPlugin().getDescription().getFullName(), ex);
-+                // Paper start - error reporting
-+                String msg = "Could not pass event " + event.getEventName() + " to " + registration.getPlugin().getDescription().getFullName();
-+                server.getLogger().log(Level.SEVERE, msg, ex);
-+                if (!(event instanceof com.destroystokyo.paper.event.server.ServerExceptionEvent)) { // We don't want to cause an endless event loop
-+                    callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
-+                }
-+                // Paper end
-             }
-         }
-     }

patches/api/0023-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch

@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Tue, 8 Mar 2016 13:05:59 -0800
-Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
-
-
-diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
-index 5e7f8822a17459583d9950dc09e3888f492bfd87..d0e1fbb58c5ce71bf2b8d9db9aa3c1b4ca797435 100644
---- a/src/main/java/org/bukkit/command/CommandSender.java
-+++ b/src/main/java/org/bukkit/command/CommandSender.java
-@@ -1,6 +1,9 @@
- package org.bukkit.command;
- 
- import java.util.UUID;
-+import net.kyori.adventure.audience.MessageType;
-+import net.kyori.adventure.identity.Identity;
-+import net.kyori.adventure.text.Component;
- import org.bukkit.Server;
- import org.bukkit.permissions.Permissible;
- import org.jetbrains.annotations.NotNull;
-@@ -145,5 +148,33 @@ public interface CommandSender extends net.kyori.adventure.audience.Audience, Pe
-     default void sendPlainMessage(final @NotNull String message) {
-         this.sendMessage(net.kyori.adventure.text.Component.text(message));
-     }
-+
-+    /**
-+     * Sends the component to the sender
-+     *
-+     * <p>If this sender does not support sending full components then
-+     * the component will be sent as legacy text.</p>
-+     *
-+     * @param component the component to send
-+     * @deprecated use {@link #sendMessage(Identity, Component, MessageType)} instead
-+     */
-+    @Deprecated
-+    default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
-+        this.sendMessage(component.toLegacyText());
-+    }
-+
-+    /**
-+     * Sends an array of components as a single message to the sender
-+     *
-+     * <p>If this sender does not support sending full components then
-+     * the components will be sent as legacy text.</p>
-+     *
-+     * @param components the components to send
-+     * @deprecated use {@link #sendMessage(Identity, Component, MessageType)} instead
-+     */
-+    @Deprecated
-+    default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
-+        this.sendMessage(new net.md_5.bungee.api.chat.TextComponent(components).toLegacyText());
-+    }
-     // Paper end
- }

patches/api/0023-Player-Tab-List-and-Title-APIs.patch

@@ -0,0 +1,577 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Techcable <Techcable@outlook.com>
+Date: Mon, 29 Feb 2016 20:02:40 -0600
+Subject: [PATCH] Player Tab List and Title APIs
+
+Co-authored-by: Fruxz <cedricspitzer@outlook.de>
+
+diff --git a/src/main/java/com/destroystokyo/paper/Title.java b/src/main/java/com/destroystokyo/paper/Title.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb902cb35d8c
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/Title.java
+@@ -0,0 +1,420 @@
++package com.destroystokyo.paper;
++
++import net.md_5.bungee.api.chat.BaseComponent;
++import net.md_5.bungee.api.chat.TextComponent;
++
++import org.bukkit.Bukkit;
++import org.bukkit.entity.Player;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
++import java.util.ArrayList;
++import java.util.Arrays;
++import java.util.Collection;
++import java.util.List;
++
++import static com.google.common.base.Preconditions.checkArgument;
++import static com.google.common.base.Preconditions.checkNotNull;
++import static com.google.common.base.Preconditions.checkState;
++
++/**
++ * Represents a title to may be sent to a {@link Player}.
++ *
++ * <p>A title can be sent without subtitle text.</p>
++ *
++ * @deprecated use {@link net.kyori.adventure.title.Title}
++ */
++@Deprecated
++public final class Title {
++
++    /**
++     * The default number of ticks for the title to fade in.
++     */
++    public static final int DEFAULT_FADE_IN = 20;
++    /**
++     * The default number of ticks for the title to stay.
++     */
++    public static final int DEFAULT_STAY = 200;
++    /**
++     * The default number of ticks for the title to fade out.
++     */
++    public static final int DEFAULT_FADE_OUT = 20;
++
++    private final BaseComponent[] title;
++    private final BaseComponent[] subtitle;
++    private final int fadeIn;
++    private final int stay;
++    private final int fadeOut;
++
++    /**
++     * Create a title with the default time values and no subtitle.
++     *
++     * <p>Times use default values.</p>
++     *
++     * @param title the main text of the title
++     * @throws NullPointerException if the title is null
++     */
++    public Title(@NotNull BaseComponent title) {
++        this(title, null);
++    }
++
++    /**
++     * Create a title with the default time values and no subtitle.
++     *
++     * <p>Times use default values.</p>
++     *
++     * @param title the main text of the title
++     * @throws NullPointerException if the title is null
++     */
++    public Title(@NotNull BaseComponent[] title) {
++        this(title, null);
++    }
++
++    /**
++     * Create a title with the default time values and no subtitle.
++     *
++     * <p>Times use default values.</p>
++     *
++     * @param title the main text of the title
++     * @throws NullPointerException if the title is null
++     */
++    public Title(@NotNull String title) {
++        this(title, null);
++    }
++
++    /**
++     * Create a title with the default time values.
++     *
++     * <p>Times use default values.</p>
++     *
++     * @param title    the main text of the title
++     * @param subtitle the secondary text of the title
++     */
++    public Title(@NotNull BaseComponent title, @Nullable BaseComponent subtitle) {
++        this(title, subtitle, DEFAULT_FADE_IN, DEFAULT_STAY, DEFAULT_FADE_OUT);
++    }
++
++    /**
++     * Create a title with the default time values.
++     *
++     * <p>Times use default values.</p>
++     *
++     * @param title    the main text of the title
++     * @param subtitle the secondary text of the title
++     */
++    public Title(@NotNull BaseComponent[] title, @Nullable BaseComponent[] subtitle) {
++        this(title, subtitle, DEFAULT_FADE_IN, DEFAULT_STAY, DEFAULT_FADE_OUT);
++    }
++
++    /**
++     * Create a title with the default time values.
++     *
++     * <p>Times use default values.</p>
++     *
++     * @param title    the main text of the title
++     * @param subtitle the secondary text of the title
++     */
++    public Title(@NotNull String title, @Nullable String subtitle) {
++        this(title, subtitle, DEFAULT_FADE_IN, DEFAULT_STAY, DEFAULT_FADE_OUT);
++    }
++
++    /**
++     * Creates a new title.
++     *
++     * @param title    the main text of the title
++     * @param subtitle the secondary text of the title
++     * @param fadeIn   the number of ticks for the title to fade in
++     * @param stay     the number of ticks for the title to stay on screen
++     * @param fadeOut  the number of ticks for the title to fade out
++     * @throws IllegalArgumentException if any of the times are negative
++     */
++    public Title(@NotNull BaseComponent title, @Nullable BaseComponent subtitle, int fadeIn, int stay, int fadeOut) {
++        this(
++                new BaseComponent[]{checkNotNull(title, "title")},
++                subtitle == null ? null : new BaseComponent[]{subtitle},
++                fadeIn,
++                stay,
++                fadeOut
++        );
++    }
++
++    /**
++     * Creates a new title.
++     *
++     * @param title    the main text of the title
++     * @param subtitle the secondary text of the title
++     * @param fadeIn   the number of ticks for the title to fade in
++     * @param stay     the number of ticks for the title to stay on screen
++     * @param fadeOut  the number of ticks for the title to fade out
++     * @throws IllegalArgumentException if any of the times are negative
++     */
++    public Title(@Nullable BaseComponent[] title, @NotNull BaseComponent[] subtitle, int fadeIn, int stay, int fadeOut) {
++        checkArgument(fadeIn >= 0, "Negative fadeIn: %s", fadeIn);
++        checkArgument(stay >= 0, "Negative stay: %s", stay);
++        checkArgument(fadeOut >= 0, "Negative fadeOut: %s", fadeOut);
++        this.title = checkNotNull(title, "title");
++        this.subtitle = subtitle;
++        this.fadeIn = fadeIn;
++        this.stay = stay;
++        this.fadeOut = fadeOut;
++    }
++
++    /**
++     * Creates a new title.
++     *
++     * <p>It is recommended to the {@link BaseComponent} constrctors.</p>
++     *
++     * @param title    the main text of the title
++     * @param subtitle the secondary text of the title
++     * @param fadeIn   the number of ticks for the title to fade in
++     * @param stay     the number of ticks for the title to stay on screen
++     * @param fadeOut  the number of ticks for the title to fade out
++     */
++    public Title(@NotNull String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut) {
++        this(
++                TextComponent.fromLegacyText(checkNotNull(title, "title")),
++                subtitle == null ? null : TextComponent.fromLegacyText(subtitle),
++                fadeIn,
++                stay,
++                fadeOut
++        );
++    }
++
++    /**
++     * Gets the text of this title
++     *
++     * @return the text
++     */
++    @NotNull
++    public BaseComponent[] getTitle() {
++        return this.title;
++    }
++
++    /**
++     * Gets the text of this title's subtitle
++     *
++     * @return the text
++     */
++    @Nullable
++    public BaseComponent[] getSubtitle() {
++        return this.subtitle;
++    }
++
++    /**
++     * Gets the number of ticks to fade in.
++     *
++     * <p>The returned value is never negative.</p>
++     *
++     * @return the number of ticks to fade in
++     */
++    public int getFadeIn() {
++        return this.fadeIn;
++    }
++
++    /**
++     * Gets the number of ticks to stay.
++     *
++     * <p>The returned value is never negative.</p>
++     *
++     * @return the number of ticks to stay
++     */
++    public int getStay() {
++        return this.stay;
++    }
++
++    /**
++     * Gets the number of ticks to fade out.
++     *
++     * <p>The returned value is never negative.</p>
++     *
++     * @return the number of ticks to fade out
++     */
++    public int getFadeOut() {
++        return this.fadeOut;
++    }
++
++    /**
++     * Sends the title directly to an player
++     *
++     * @param player the receiver of the title
++     */
++    public void send(@NotNull Player player) {
++        player.sendTitle(this);
++    }
++
++    /**
++     * Sends the title directly to the defined players
++     *
++     * @param players the receivers of the title
++     */
++    public void send(@NotNull Collection<? extends Player> players) {
++        for (Player player : players) {
++            player.sendTitle(this);
++        }
++    }
++
++    /**
++     * Sends the title directly to the defined players
++     *
++     * @param players the receivers of the title
++     */
++    public void send(@NotNull Player[] players) {
++        for (Player player : players) {
++            player.sendTitle(this);
++        }
++    }
++
++    /**
++     * Sends the title directly to all online players
++     */
++    public void broadcast() {
++        send(Bukkit.getOnlinePlayers());
++    }
++
++    @NotNull
++    public static Builder builder() {
++        return new Builder();
++    }
++
++    /**
++     * A builder for creating titles
++     */
++    public static final class Builder {
++
++        private BaseComponent[] title;
++        private BaseComponent[] subtitle;
++        private int fadeIn = DEFAULT_FADE_IN;
++        private int stay = DEFAULT_STAY;
++        private int fadeOut = DEFAULT_FADE_OUT;
++
++        /**
++         * Sets the title to the given text.
++         *
++         * @param title the title text
++         * @return this builder instance
++         * @throws NullPointerException if the title is null
++         */
++        @NotNull
++        public Builder title(@NotNull BaseComponent title) {
++            return this.title(new BaseComponent[]{checkNotNull(title, "title")});
++        }
++
++        /**
++         * Sets the title to the given text.
++         *
++         * @param title the title text
++         * @return this builder instance
++         * @throws NullPointerException if the title is null
++         */
++        @NotNull
++        public Builder title(@NotNull BaseComponent[] title) {
++            this.title = checkNotNull(title, "title");
++            return this;
++        }
++
++        /**
++         * Sets the title to the given text.
++         *
++         * <p>It is recommended to the {@link BaseComponent} methods.</p>
++         *
++         * @param title the title text
++         * @return this builder instance
++         * @throws NullPointerException if the title is null
++         */
++        @NotNull
++        public Builder title(@NotNull String title) {
++            return this.title(TextComponent.fromLegacyText(checkNotNull(title, "title")));
++        }
++
++        /**
++         * Sets the subtitle to the given text.
++         *
++         * @param subtitle the title text
++         * @return this builder instance
++         */
++        @NotNull
++        public Builder subtitle(@Nullable BaseComponent subtitle) {
++            return this.subtitle(subtitle == null ? null : new BaseComponent[]{subtitle});
++        }
++
++        /**
++         * Sets the subtitle to the given text.
++         *
++         * @param subtitle the title text
++         * @return this builder instance
++         */
++        @NotNull
++        public Builder subtitle(@Nullable BaseComponent[] subtitle) {
++            this.subtitle = subtitle;
++            return this;
++        }
++
++        /**
++         * Sets the subtitle to the given text.
++         *
++         * <p>It is recommended to the {@link BaseComponent} methods.</p>
++         *
++         * @param subtitle the title text
++         * @return this builder instance
++         */
++        @NotNull
++        public Builder subtitle(@Nullable String subtitle) {
++            return this.subtitle(subtitle == null ? null : TextComponent.fromLegacyText(subtitle));
++        }
++
++        /**
++         * Sets the number of ticks for the title to fade in
++         *
++         * @param fadeIn the number of ticks to fade in
++         * @return this builder instance
++         * @throws IllegalArgumentException if it is negative
++         */
++        @NotNull
++        public Builder fadeIn(int fadeIn) {
++            checkArgument(fadeIn >= 0, "Negative fadeIn: %s", fadeIn);
++            this.fadeIn = fadeIn;
++            return this;
++        }
++
++
++        /**
++         * Sets the number of ticks for the title to stay.
++         *
++         * @param stay the number of ticks to stay
++         * @return this builder instance
++         * @throws IllegalArgumentException if it is negative
++         */
++        @NotNull
++        public Builder stay(int stay) {
++            checkArgument(stay >= 0, "Negative stay: %s", stay);
++            this.stay = stay;
++            return this;
++        }
++
++        /**
++         * Sets the number of ticks for the title to fade out.
++         *
++         * @param fadeOut the number of ticks to fade out
++         * @return this builder instance
++         * @throws IllegalArgumentException if it is negative
++         */
++        @NotNull
++        public Builder fadeOut(int fadeOut) {
++            checkArgument(fadeOut >= 0, "Negative fadeOut: %s", fadeOut);
++            this.fadeOut = fadeOut;
++            return this;
++        }
++
++        /**
++         * Create a title based on the values in the builder.
++         *
++         * @return a title from the values in this builder
++         * @throws IllegalStateException if title isn't specified
++         */
++        @NotNull
++        public Title build() {
++            checkState(title != null, "Title not specified");
++            return new Title(this.title, this.subtitle, this.fadeIn, this.stay, this.fadeOut);
++        }
++    }
++}
+diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
+index b91c12089ba0723356ef2d3d1b8b0c66ca8850bf..74a3abef2ff1be11427558293e81f3b7fe9fff16 100644
+--- a/src/main/java/org/bukkit/entity/Player.java
++++ b/src/main/java/org/bukkit/entity/Player.java
+@@ -3,6 +3,7 @@ package org.bukkit.entity;
+ import java.net.InetSocketAddress;
+ import java.util.Collection;
+ import java.util.UUID;
++import com.destroystokyo.paper.Title; // Paper
+ import org.bukkit.DyeColor;
+ import org.bukkit.Effect;
+ import org.bukkit.GameMode;
+@@ -812,6 +813,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+     public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
+         spigot().sendMessage(position, components);
+     }
++
++    /**
++     * Set the text displayed in the player list header and footer for this player
++     *
++     * @param header content for the top of the player list
++     * @param footer content for the bottom of the player list
++     * @deprecated in favour of {@link #sendPlayerListHeaderAndFooter(net.kyori.adventure.text.Component, net.kyori.adventure.text.Component)}
++     */
++    @Deprecated
++    public void setPlayerListHeaderFooter(@Nullable net.md_5.bungee.api.chat.BaseComponent[] header, @Nullable net.md_5.bungee.api.chat.BaseComponent[] footer);
++
++    /**
++     * Set the text displayed in the player list header and footer for this player
++     *
++     * @param header content for the top of the player list
++     * @param footer content for the bottom of the player list
++     * @deprecated in favour of {@link #sendPlayerListHeaderAndFooter(net.kyori.adventure.text.Component, net.kyori.adventure.text.Component)}
++     */
++    @Deprecated
++    public void setPlayerListHeaderFooter(@Nullable net.md_5.bungee.api.chat.BaseComponent header, @Nullable net.md_5.bungee.api.chat.BaseComponent footer);
++
++    /**
++     * Update the times for titles displayed to the player
++     *
++     * @param fadeInTicks  ticks to fade-in
++     * @param stayTicks    ticks to stay visible
++     * @param fadeOutTicks ticks to fade-out
++     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
++     */
++    @Deprecated
++    public void setTitleTimes(int fadeInTicks, int stayTicks, int fadeOutTicks);
++
++    /**
++     * Update the subtitle of titles displayed to the player
++     *
++     * @param subtitle Subtitle to set
++     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
++     */
++    @Deprecated
++    public void setSubtitle(net.md_5.bungee.api.chat.BaseComponent[] subtitle);
++
++    /**
++     * Update the subtitle of titles displayed to the player
++     *
++     * @param subtitle Subtitle to set
++     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
++     */
++    @Deprecated
++    public void setSubtitle(net.md_5.bungee.api.chat.BaseComponent subtitle);
++
++    /**
++     * Show the given title to the player, along with the last subtitle set, using the last set times
++     *
++     * @param title Title to set
++     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
++     */
++    @Deprecated
++    public void showTitle(@Nullable net.md_5.bungee.api.chat.BaseComponent[] title);
++
++    /**
++     * Show the given title to the player, along with the last subtitle set, using the last set times
++     *
++     * @param title Title to set
++     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
++     */
++    @Deprecated
++    public void showTitle(@Nullable net.md_5.bungee.api.chat.BaseComponent title);
++
++    /**
++     * Show the given title and subtitle to the player using the given times
++     *
++     * @param title        big text
++     * @param subtitle     little text under it
++     * @param fadeInTicks  ticks to fade-in
++     * @param stayTicks    ticks to stay visible
++     * @param fadeOutTicks ticks to fade-out
++     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
++     */
++    @Deprecated
++    public void showTitle(@Nullable net.md_5.bungee.api.chat.BaseComponent[] title, @Nullable net.md_5.bungee.api.chat.BaseComponent[] subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks);
++
++    /**
++     * Show the given title and subtitle to the player using the given times
++     *
++     * @param title        big text
++     * @param subtitle     little text under it
++     * @param fadeInTicks  ticks to fade-in
++     * @param stayTicks    ticks to stay visible
++     * @param fadeOutTicks ticks to fade-out
++     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
++     */
++    @Deprecated
++    public void showTitle(@Nullable net.md_5.bungee.api.chat.BaseComponent title, @Nullable net.md_5.bungee.api.chat.BaseComponent subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks);
++
++    /**
++     * Show the title to the player, overriding any previously displayed title.
++     *
++     * <p>This method overrides any previous title, use {@link #updateTitle(Title)} to change the existing one.</p>
++     *
++     * @param title the title to send
++     * @throws NullPointerException if the title is null
++     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
++     */
++    @Deprecated
++    void sendTitle(@NotNull Title title);
++
++    /**
++     * Show the title to the player, overriding any previously displayed title.
++     *
++     * <p>This method doesn't override previous titles, but changes their values.</p>
++     *
++     * @param title the title to send
++     * @throws NullPointerException if title is null
++     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
++     */
++    @Deprecated
++    void updateTitle(@NotNull Title title);
++
++    /**
++     * Hide any title that is currently visible to the player
++     *
++     * @deprecated use {@link #clearTitle()}
++     */
++    @Deprecated
++    public void hideTitle();
+     // Paper end
+ 
+     /**

patches/api/0024-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: mrapple <tony@oc.tc>
+Date: Sun, 25 Nov 2012 13:47:27 -0600
+Subject: [PATCH] Add methods for working with arrows stuck in living entities
+
+
+diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
+index 2b816f0e6bdb912ceeff82c0043272b3970fe243..f00502b59f15c3a92ce18e7d1aa4e546fd45b16a 100644
+--- a/src/main/java/org/bukkit/entity/LivingEntity.java
++++ b/src/main/java/org/bukkit/entity/LivingEntity.java
+@@ -689,4 +689,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+      * @return Whether the entity is invisible
+      */
+     public boolean isInvisible();
++
++    // Paper start
++    /**
++     * Get the number of arrows stuck in this entity
++     * @return Number of arrows stuck
++     */
++    int getArrowsStuck();
++
++    /**
++     * Set the number of arrows stuck in this entity
++     *
++     * @param arrows Number of arrows to stick in this entity
++     */
++    void setArrowsStuck(int arrows);
++    // Paper end
+ }

patches/api/0025-Complete-resource-pack-API.patch

@@ -0,0 +1,182 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jedediah Smith <jedediah@silencegreys.com>
+Date: Sat, 4 Apr 2015 22:59:54 -0400
+Subject: [PATCH] Complete resource pack API
+
+
+diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
+index 74a3abef2ff1be11427558293e81f3b7fe9fff16..bc3fc130b38bb9e102ab6a95e6ca75d815ba4902 100644
+--- a/src/main/java/org/bukkit/entity/Player.java
++++ b/src/main/java/org/bukkit/entity/Player.java
+@@ -1329,7 +1329,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * @throws IllegalArgumentException Thrown if the URL is null.
+      * @throws IllegalArgumentException Thrown if the URL is too long. The
+      *     length restriction is an implementation specific arbitrary value.
++     * @deprecated use {@link #setResourcePack(String, String)}
+      */
++    @Deprecated // Paper
+     public void setResourcePack(@NotNull String url);
+ 
+     /**
+@@ -2145,6 +2147,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+     default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
+         return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName())));
+     }
++
++    /**
++     * Request that the player's client download and switch resource packs.
++     * <p>
++     * The player's client will download the new resource pack asynchronously
++     * in the background, and will automatically switch to it once the
++     * download is complete. If the client has downloaded and cached the same
++     * resource pack in the past, it will perform a quick timestamp check
++     * over the network to determine if the resource pack has changed and
++     * needs to be downloaded again. When this request is sent for the very
++     * first time from a given server, the client will first display a
++     * confirmation GUI to the player before proceeding with the download.
++     * <p>
++     * Notes:
++     * <ul>
++     * <li>Players can disable server resources on their client, in which
++     *     case this method will have no affect on them.
++     * <li>There is no concept of resetting resource packs back to default
++     *     within Minecraft, so players will have to relog to do so.
++     * </ul>
++     *
++     * @param url The URL from which the client will download the resource
++     *     pack. The string must contain only US-ASCII characters and should
++     *     be encoded as per RFC 1738.
++     * @param hash A 40 character hexadecimal and lowercase SHA-1 digest of
++     *     the resource pack file.
++     * @throws IllegalArgumentException Thrown if the URL is null.
++     * @throws IllegalArgumentException Thrown if the URL is too long. The
++     *     length restriction is an implementation specific arbitrary value.
++     */
++    void setResourcePack(@NotNull String url, @NotNull String hash);
++
++    /**
++     * Request that the player's client download and switch resource packs.
++     * <p>
++     * The player's client will download the new resource pack asynchronously
++     * in the background, and will automatically switch to it once the
++     * download is complete. If the client has downloaded and cached the same
++     * resource pack in the past, it will perform a quick timestamp check
++     * over the network to determine if the resource pack has changed and
++     * needs to be downloaded again. When this request is sent for the very
++     * first time from a given server, the client will first display a
++     * confirmation GUI to the player before proceeding with the download.
++     * <p>
++     * Notes:
++     * <ul>
++     * <li>Players can disable server resources on their client, in which
++     *     case this method will have no affect on them.
++     * <li>There is no concept of resetting resource packs back to default
++     *     within Minecraft, so players will have to relog to do so.
++     * </ul>
++     *
++     * @param url The URL from which the client will download the resource
++     *     pack. The string must contain only US-ASCII characters and should
++     *     be encoded as per RFC 1738.
++     * @param hash A 40 character hexadecimal and lowercase SHA-1 digest of
++     *     the resource pack file.
++     * @param required Marks if the resource pack should be required by the client
++     * @throws IllegalArgumentException Thrown if the URL is null.
++     * @throws IllegalArgumentException Thrown if the URL is too long. The
++     *     length restriction is an implementation specific arbitrary value.
++     */
++    void setResourcePack(@NotNull String url, @NotNull String hash, boolean required);
++
++    /**
++     * Request that the player's client download and switch resource packs.
++     * <p>
++     * The player's client will download the new resource pack asynchronously
++     * in the background, and will automatically switch to it once the
++     * download is complete. If the client has downloaded and cached the same
++     * resource pack in the past, it will perform a quick timestamp check
++     * over the network to determine if the resource pack has changed and
++     * needs to be downloaded again. When this request is sent for the very
++     * first time from a given server, the client will first display a
++     * confirmation GUI to the player before proceeding with the download.
++     * <p>
++     * Notes:
++     * <ul>
++     * <li>Players can disable server resources on their client, in which
++     *     case this method will have no affect on them.
++     * <li>There is no concept of resetting resource packs back to default
++     *     within Minecraft, so players will have to relog to do so.
++     * </ul>
++     *
++     * @param url The URL from which the client will download the resource
++     *     pack. The string must contain only US-ASCII characters and should
++     *     be encoded as per RFC 1738.
++     * @param hash A 40 character hexadecimal and lowercase SHA-1 digest of
++     *     the resource pack file.
++     * @param required Marks if the resource pack should be required by the client
++     * @param resourcePackPrompt A Prompt to be displayed in the client request
++     * @throws IllegalArgumentException Thrown if the URL is null.
++     * @throws IllegalArgumentException Thrown if the URL is too long. The
++     *     length restriction is an implementation specific arbitrary value.
++     */
++    void setResourcePack(@NotNull String url, @NotNull String hash, boolean required, @Nullable net.kyori.adventure.text.Component resourcePackPrompt);
++    /**
++     * @return the most recent resource pack status received from the player,
++     *         or null if no status has ever been received from this player.
++     */
++    @Nullable
++    org.bukkit.event.player.PlayerResourcePackStatusEvent.Status getResourcePackStatus();
++
++    /**
++     * @return the most recent resource pack hash received from the player,
++     *         or null if no hash has ever been received from this player.
++     *
++     * @deprecated This is no longer sent from the client and will always be null
++     */
++    @Nullable
++    @Deprecated
++    String getResourcePackHash();
++
++    /**
++     * @return true if the last resource pack status received from this player
++     *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
++     */
++    boolean hasResourcePack();
+     // Paper end
+ 
+     // Spigot start
+diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
+index b98195650d49d78ec35970ca0376b6289b861e4b..4c2102a11c3d682d98f0db4ccafa35231e66bcdd 100644
+--- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
++++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
+@@ -11,13 +11,32 @@ import org.jetbrains.annotations.NotNull;
+ public class PlayerResourcePackStatusEvent extends PlayerEvent {
+ 
+     private static final HandlerList handlers = new HandlerList();
++    @Deprecated
++    private final String hash; // Paper
+     private final Status status;
+ 
+     public PlayerResourcePackStatusEvent(@NotNull final Player who, @NotNull Status resourcePackStatus) {
+         super(who);
++        this.hash = null; // Paper
+         this.status = resourcePackStatus;
+     }
+ 
++    @Deprecated // Paper
++    public PlayerResourcePackStatusEvent(final Player who, Status resourcePackStatus, String hash) {
++        super(who);
++        this.hash = hash; // Paper
++        this.status = resourcePackStatus;
++    }
++
++    @Deprecated
++    /**
++     * @deprecated Hash does not seem to ever be set
++     */
++    public String getHash() {
++        return this.hash;
++    }
++    // Paper end
++
+     /**
+      * Gets the status of this pack.
+      *

patches/api/0025-Player-Tab-List-and-Title-APIs.patch

@@ -1,569 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Techcable <Techcable@outlook.com>
-Date: Mon, 29 Feb 2016 20:02:40 -0600
-Subject: [PATCH] Player Tab List and Title APIs
-
-Co-authored-by: Fruxz <cedricspitzer@outlook.de>
-
-diff --git a/src/main/java/com/destroystokyo/paper/Title.java b/src/main/java/com/destroystokyo/paper/Title.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb902cb35d8c
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/Title.java
-@@ -0,0 +1,420 @@
-+package com.destroystokyo.paper;
-+
-+import net.md_5.bungee.api.chat.BaseComponent;
-+import net.md_5.bungee.api.chat.TextComponent;
-+
-+import org.bukkit.Bukkit;
-+import org.bukkit.entity.Player;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+import java.util.Collection;
-+import java.util.List;
-+
-+import static com.google.common.base.Preconditions.checkArgument;
-+import static com.google.common.base.Preconditions.checkNotNull;
-+import static com.google.common.base.Preconditions.checkState;
-+
-+/**
-+ * Represents a title to may be sent to a {@link Player}.
-+ *
-+ * <p>A title can be sent without subtitle text.</p>
-+ *
-+ * @deprecated use {@link net.kyori.adventure.title.Title}
-+ */
-+@Deprecated
-+public final class Title {
-+
-+    /**
-+     * The default number of ticks for the title to fade in.
-+     */
-+    public static final int DEFAULT_FADE_IN = 20;
-+    /**
-+     * The default number of ticks for the title to stay.
-+     */
-+    public static final int DEFAULT_STAY = 200;
-+    /**
-+     * The default number of ticks for the title to fade out.
-+     */
-+    public static final int DEFAULT_FADE_OUT = 20;
-+
-+    private final BaseComponent[] title;
-+    private final BaseComponent[] subtitle;
-+    private final int fadeIn;
-+    private final int stay;
-+    private final int fadeOut;
-+
-+    /**
-+     * Create a title with the default time values and no subtitle.
-+     *
-+     * <p>Times use default values.</p>
-+     *
-+     * @param title the main text of the title
-+     * @throws NullPointerException if the title is null
-+     */
-+    public Title(@NotNull BaseComponent title) {
-+        this(title, null);
-+    }
-+
-+    /**
-+     * Create a title with the default time values and no subtitle.
-+     *
-+     * <p>Times use default values.</p>
-+     *
-+     * @param title the main text of the title
-+     * @throws NullPointerException if the title is null
-+     */
-+    public Title(@NotNull BaseComponent[] title) {
-+        this(title, null);
-+    }
-+
-+    /**
-+     * Create a title with the default time values and no subtitle.
-+     *
-+     * <p>Times use default values.</p>
-+     *
-+     * @param title the main text of the title
-+     * @throws NullPointerException if the title is null
-+     */
-+    public Title(@NotNull String title) {
-+        this(title, null);
-+    }
-+
-+    /**
-+     * Create a title with the default time values.
-+     *
-+     * <p>Times use default values.</p>
-+     *
-+     * @param title    the main text of the title
-+     * @param subtitle the secondary text of the title
-+     */
-+    public Title(@NotNull BaseComponent title, @Nullable BaseComponent subtitle) {
-+        this(title, subtitle, DEFAULT_FADE_IN, DEFAULT_STAY, DEFAULT_FADE_OUT);
-+    }
-+
-+    /**
-+     * Create a title with the default time values.
-+     *
-+     * <p>Times use default values.</p>
-+     *
-+     * @param title    the main text of the title
-+     * @param subtitle the secondary text of the title
-+     */
-+    public Title(@NotNull BaseComponent[] title, @Nullable BaseComponent[] subtitle) {
-+        this(title, subtitle, DEFAULT_FADE_IN, DEFAULT_STAY, DEFAULT_FADE_OUT);
-+    }
-+
-+    /**
-+     * Create a title with the default time values.
-+     *
-+     * <p>Times use default values.</p>
-+     *
-+     * @param title    the main text of the title
-+     * @param subtitle the secondary text of the title
-+     */
-+    public Title(@NotNull String title, @Nullable String subtitle) {
-+        this(title, subtitle, DEFAULT_FADE_IN, DEFAULT_STAY, DEFAULT_FADE_OUT);
-+    }
-+
-+    /**
-+     * Creates a new title.
-+     *
-+     * @param title    the main text of the title
-+     * @param subtitle the secondary text of the title
-+     * @param fadeIn   the number of ticks for the title to fade in
-+     * @param stay     the number of ticks for the title to stay on screen
-+     * @param fadeOut  the number of ticks for the title to fade out
-+     * @throws IllegalArgumentException if any of the times are negative
-+     */
-+    public Title(@NotNull BaseComponent title, @Nullable BaseComponent subtitle, int fadeIn, int stay, int fadeOut) {
-+        this(
-+                new BaseComponent[]{checkNotNull(title, "title")},
-+                subtitle == null ? null : new BaseComponent[]{subtitle},
-+                fadeIn,
-+                stay,
-+                fadeOut
-+        );
-+    }
-+
-+    /**
-+     * Creates a new title.
-+     *
-+     * @param title    the main text of the title
-+     * @param subtitle the secondary text of the title
-+     * @param fadeIn   the number of ticks for the title to fade in
-+     * @param stay     the number of ticks for the title to stay on screen
-+     * @param fadeOut  the number of ticks for the title to fade out
-+     * @throws IllegalArgumentException if any of the times are negative
-+     */
-+    public Title(@Nullable BaseComponent[] title, @NotNull BaseComponent[] subtitle, int fadeIn, int stay, int fadeOut) {
-+        checkArgument(fadeIn >= 0, "Negative fadeIn: %s", fadeIn);
-+        checkArgument(stay >= 0, "Negative stay: %s", stay);
-+        checkArgument(fadeOut >= 0, "Negative fadeOut: %s", fadeOut);
-+        this.title = checkNotNull(title, "title");
-+        this.subtitle = subtitle;
-+        this.fadeIn = fadeIn;
-+        this.stay = stay;
-+        this.fadeOut = fadeOut;
-+    }
-+
-+    /**
-+     * Creates a new title.
-+     *
-+     * <p>It is recommended to the {@link BaseComponent} constrctors.</p>
-+     *
-+     * @param title    the main text of the title
-+     * @param subtitle the secondary text of the title
-+     * @param fadeIn   the number of ticks for the title to fade in
-+     * @param stay     the number of ticks for the title to stay on screen
-+     * @param fadeOut  the number of ticks for the title to fade out
-+     */
-+    public Title(@NotNull String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut) {
-+        this(
-+                TextComponent.fromLegacyText(checkNotNull(title, "title")),
-+                subtitle == null ? null : TextComponent.fromLegacyText(subtitle),
-+                fadeIn,
-+                stay,
-+                fadeOut
-+        );
-+    }
-+
-+    /**
-+     * Gets the text of this title
-+     *
-+     * @return the text
-+     */
-+    @NotNull
-+    public BaseComponent[] getTitle() {
-+        return this.title;
-+    }
-+
-+    /**
-+     * Gets the text of this title's subtitle
-+     *
-+     * @return the text
-+     */
-+    @Nullable
-+    public BaseComponent[] getSubtitle() {
-+        return this.subtitle;
-+    }
-+
-+    /**
-+     * Gets the number of ticks to fade in.
-+     *
-+     * <p>The returned value is never negative.</p>
-+     *
-+     * @return the number of ticks to fade in
-+     */
-+    public int getFadeIn() {
-+        return this.fadeIn;
-+    }
-+
-+    /**
-+     * Gets the number of ticks to stay.
-+     *
-+     * <p>The returned value is never negative.</p>
-+     *
-+     * @return the number of ticks to stay
-+     */
-+    public int getStay() {
-+        return this.stay;
-+    }
-+
-+    /**
-+     * Gets the number of ticks to fade out.
-+     *
-+     * <p>The returned value is never negative.</p>
-+     *
-+     * @return the number of ticks to fade out
-+     */
-+    public int getFadeOut() {
-+        return this.fadeOut;
-+    }
-+
-+    /**
-+     * Sends the title directly to an player
-+     *
-+     * @param player the receiver of the title
-+     */
-+    public void send(@NotNull Player player) {
-+        player.sendTitle(this);
-+    }
-+
-+    /**
-+     * Sends the title directly to the defined players
-+     *
-+     * @param players the receivers of the title
-+     */
-+    public void send(@NotNull Collection<? extends Player> players) {
-+        for (Player player : players) {
-+            player.sendTitle(this);
-+        }
-+    }
-+
-+    /**
-+     * Sends the title directly to the defined players
-+     *
-+     * @param players the receivers of the title
-+     */
-+    public void send(@NotNull Player[] players) {
-+        for (Player player : players) {
-+            player.sendTitle(this);
-+        }
-+    }
-+
-+    /**
-+     * Sends the title directly to all online players
-+     */
-+    public void broadcast() {
-+        send(Bukkit.getOnlinePlayers());
-+    }
-+
-+    @NotNull
-+    public static Builder builder() {
-+        return new Builder();
-+    }
-+
-+    /**
-+     * A builder for creating titles
-+     */
-+    public static final class Builder {
-+
-+        private BaseComponent[] title;
-+        private BaseComponent[] subtitle;
-+        private int fadeIn = DEFAULT_FADE_IN;
-+        private int stay = DEFAULT_STAY;
-+        private int fadeOut = DEFAULT_FADE_OUT;
-+
-+        /**
-+         * Sets the title to the given text.
-+         *
-+         * @param title the title text
-+         * @return this builder instance
-+         * @throws NullPointerException if the title is null
-+         */
-+        @NotNull
-+        public Builder title(@NotNull BaseComponent title) {
-+            return this.title(new BaseComponent[]{checkNotNull(title, "title")});
-+        }
-+
-+        /**
-+         * Sets the title to the given text.
-+         *
-+         * @param title the title text
-+         * @return this builder instance
-+         * @throws NullPointerException if the title is null
-+         */
-+        @NotNull
-+        public Builder title(@NotNull BaseComponent[] title) {
-+            this.title = checkNotNull(title, "title");
-+            return this;
-+        }
-+
-+        /**
-+         * Sets the title to the given text.
-+         *
-+         * <p>It is recommended to the {@link BaseComponent} methods.</p>
-+         *
-+         * @param title the title text
-+         * @return this builder instance
-+         * @throws NullPointerException if the title is null
-+         */
-+        @NotNull
-+        public Builder title(@NotNull String title) {
-+            return this.title(TextComponent.fromLegacyText(checkNotNull(title, "title")));
-+        }
-+
-+        /**
-+         * Sets the subtitle to the given text.
-+         *
-+         * @param subtitle the title text
-+         * @return this builder instance
-+         */
-+        @NotNull
-+        public Builder subtitle(@Nullable BaseComponent subtitle) {
-+            return this.subtitle(subtitle == null ? null : new BaseComponent[]{subtitle});
-+        }
-+
-+        /**
-+         * Sets the subtitle to the given text.
-+         *
-+         * @param subtitle the title text
-+         * @return this builder instance
-+         */
-+        @NotNull
-+        public Builder subtitle(@Nullable BaseComponent[] subtitle) {
-+            this.subtitle = subtitle;
-+            return this;
-+        }
-+
-+        /**
-+         * Sets the subtitle to the given text.
-+         *
-+         * <p>It is recommended to the {@link BaseComponent} methods.</p>
-+         *
-+         * @param subtitle the title text
-+         * @return this builder instance
-+         */
-+        @NotNull
-+        public Builder subtitle(@Nullable String subtitle) {
-+            return this.subtitle(subtitle == null ? null : TextComponent.fromLegacyText(subtitle));
-+        }
-+
-+        /**
-+         * Sets the number of ticks for the title to fade in
-+         *
-+         * @param fadeIn the number of ticks to fade in
-+         * @return this builder instance
-+         * @throws IllegalArgumentException if it is negative
-+         */
-+        @NotNull
-+        public Builder fadeIn(int fadeIn) {
-+            checkArgument(fadeIn >= 0, "Negative fadeIn: %s", fadeIn);
-+            this.fadeIn = fadeIn;
-+            return this;
-+        }
-+
-+
-+        /**
-+         * Sets the number of ticks for the title to stay.
-+         *
-+         * @param stay the number of ticks to stay
-+         * @return this builder instance
-+         * @throws IllegalArgumentException if it is negative
-+         */
-+        @NotNull
-+        public Builder stay(int stay) {
-+            checkArgument(stay >= 0, "Negative stay: %s", stay);
-+            this.stay = stay;
-+            return this;
-+        }
-+
-+        /**
-+         * Sets the number of ticks for the title to fade out.
-+         *
-+         * @param fadeOut the number of ticks to fade out
-+         * @return this builder instance
-+         * @throws IllegalArgumentException if it is negative
-+         */
-+        @NotNull
-+        public Builder fadeOut(int fadeOut) {
-+            checkArgument(fadeOut >= 0, "Negative fadeOut: %s", fadeOut);
-+            this.fadeOut = fadeOut;
-+            return this;
-+        }
-+
-+        /**
-+         * Create a title based on the values in the builder.
-+         *
-+         * @return a title from the values in this builder
-+         * @throws IllegalStateException if title isn't specified
-+         */
-+        @NotNull
-+        public Title build() {
-+            checkState(title != null, "Title not specified");
-+            return new Title(this.title, this.subtitle, this.fadeIn, this.stay, this.fadeOut);
-+        }
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a2c813d6d94ae2a87278d92445635ae8dd3ab00a..3e2b8c1ae51404352adccc9ad108982173306ee9 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -847,6 +847,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
-         spigot().sendMessage(position, components);
-     }
-+
-+    /**
-+     * Set the text displayed in the player list header and footer for this player
-+     *
-+     * @param header content for the top of the player list
-+     * @param footer content for the bottom of the player list
-+     * @deprecated in favour of {@link #sendPlayerListHeaderAndFooter(net.kyori.adventure.text.Component, net.kyori.adventure.text.Component)}
-+     */
-+    @Deprecated
-+    public void setPlayerListHeaderFooter(@Nullable net.md_5.bungee.api.chat.BaseComponent[] header, @Nullable net.md_5.bungee.api.chat.BaseComponent[] footer);
-+
-+    /**
-+     * Set the text displayed in the player list header and footer for this player
-+     *
-+     * @param header content for the top of the player list
-+     * @param footer content for the bottom of the player list
-+     * @deprecated in favour of {@link #sendPlayerListHeaderAndFooter(net.kyori.adventure.text.Component, net.kyori.adventure.text.Component)}
-+     */
-+    @Deprecated
-+    public void setPlayerListHeaderFooter(@Nullable net.md_5.bungee.api.chat.BaseComponent header, @Nullable net.md_5.bungee.api.chat.BaseComponent footer);
-+
-+    /**
-+     * Update the times for titles displayed to the player
-+     *
-+     * @param fadeInTicks  ticks to fade-in
-+     * @param stayTicks    ticks to stay visible
-+     * @param fadeOutTicks ticks to fade-out
-+     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
-+     */
-+    @Deprecated
-+    public void setTitleTimes(int fadeInTicks, int stayTicks, int fadeOutTicks);
-+
-+    /**
-+     * Update the subtitle of titles displayed to the player
-+     *
-+     * @param subtitle Subtitle to set
-+     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
-+     */
-+    @Deprecated
-+    public void setSubtitle(net.md_5.bungee.api.chat.BaseComponent[] subtitle);
-+
-+    /**
-+     * Update the subtitle of titles displayed to the player
-+     *
-+     * @param subtitle Subtitle to set
-+     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
-+     */
-+    @Deprecated
-+    public void setSubtitle(net.md_5.bungee.api.chat.BaseComponent subtitle);
-+
-+    /**
-+     * Show the given title to the player, along with the last subtitle set, using the last set times
-+     *
-+     * @param title Title to set
-+     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
-+     */
-+    @Deprecated
-+    public void showTitle(@Nullable net.md_5.bungee.api.chat.BaseComponent[] title);
-+
-+    /**
-+     * Show the given title to the player, along with the last subtitle set, using the last set times
-+     *
-+     * @param title Title to set
-+     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
-+     */
-+    @Deprecated
-+    public void showTitle(@Nullable net.md_5.bungee.api.chat.BaseComponent title);
-+
-+    /**
-+     * Show the given title and subtitle to the player using the given times
-+     *
-+     * @param title        big text
-+     * @param subtitle     little text under it
-+     * @param fadeInTicks  ticks to fade-in
-+     * @param stayTicks    ticks to stay visible
-+     * @param fadeOutTicks ticks to fade-out
-+     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
-+     */
-+    @Deprecated
-+    public void showTitle(@Nullable net.md_5.bungee.api.chat.BaseComponent[] title, @Nullable net.md_5.bungee.api.chat.BaseComponent[] subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks);
-+
-+    /**
-+     * Show the given title and subtitle to the player using the given times
-+     *
-+     * @param title        big text
-+     * @param subtitle     little text under it
-+     * @param fadeInTicks  ticks to fade-in
-+     * @param stayTicks    ticks to stay visible
-+     * @param fadeOutTicks ticks to fade-out
-+     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
-+     */
-+    @Deprecated
-+    public void showTitle(@Nullable net.md_5.bungee.api.chat.BaseComponent title, @Nullable net.md_5.bungee.api.chat.BaseComponent subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks);
-+
-+    /**
-+     * Show the title to the player, overriding any previously displayed title.
-+     *
-+     * <p>This method overrides any previous title, use {@link #updateTitle(com.destroystokyo.paper.Title)} to change the existing one.</p>
-+     *
-+     * @param title the title to send
-+     * @throws NullPointerException if the title is null
-+     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
-+     */
-+    @Deprecated
-+    void sendTitle(@NotNull com.destroystokyo.paper.Title title);
-+
-+    /**
-+     * Show the title to the player, overriding any previously displayed title.
-+     *
-+     * <p>This method doesn't override previous titles, but changes their values.</p>
-+     *
-+     * @param title the title to send
-+     * @throws NullPointerException if title is null
-+     * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
-+     */
-+    @Deprecated
-+    void updateTitle(@NotNull com.destroystokyo.paper.Title title);
-+
-+    /**
-+     * Hide any title that is currently visible to the player
-+     *
-+     * @deprecated use {@link #clearTitle()}
-+     */
-+    @Deprecated
-+    public void hideTitle();
-     // Paper end
- 
-     /**

patches/api/0026-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: mrapple <tony@oc.tc>
-Date: Sun, 25 Nov 2012 13:47:27 -0600
-Subject: [PATCH] Add methods for working with arrows stuck in living entities
-
-Upstream added methods for this so the original methods
-are now deprecated
-
-diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 2b816f0e6bdb912ceeff82c0043272b3970fe243..9977bb3cb5a66c84db816f8e4597db1c053f77c8 100644
---- a/src/main/java/org/bukkit/entity/LivingEntity.java
-+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -215,12 +215,26 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-      */
-     public int getArrowsInBody();
- 
-+    // Paper start
-+    /**
-+     * Set the amount of arrows in the entity's body.
-+     * <p>
-+     * Does not fire the {@link org.bukkit.event.entity.ArrowBodyCountChangeEvent}.
-+     *
-+     * @param count amount of arrows in entity's body
-+     */
-+    default void setArrowsInBody(final int count) {
-+        this.setArrowsInBody(count, false);
-+    }
-+    // Paper end
-+
-     /**
-      * Set the amount of arrows in the entity's body.
-      *
-      * @param count amount of arrows in entity's body
-+     * @param fireEvent whether to fire the {@link org.bukkit.event.entity.ArrowBodyCountChangeEvent} event
-      */
--    public void setArrowsInBody(int count);
-+    void setArrowsInBody(int count, boolean fireEvent); // Paper
- 
-     /**
-      * Returns the living entity's current maximum no damage ticks.
-@@ -689,4 +703,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-      * @return Whether the entity is invisible
-      */
-     public boolean isInvisible();
-+
-+    // Paper start
-+    /**
-+     * Get the number of arrows stuck in this entity
-+     * @return Number of arrows stuck
-+     * @deprecated use {@link #getArrowsInBody()}
-+     */
-+    @Deprecated
-+    int getArrowsStuck();
-+
-+    /**
-+     * Set the number of arrows stuck in this entity
-+     *
-+     * @param arrows Number of arrows to stick in this entity
-+     * @deprecated use {@link #setArrowsInBody(int, boolean)}. <b>This method previously fired {@link org.bukkit.event.entity.ArrowBodyCountChangeEvent} so if
-+     * you want to retain exact functionality, pass {@code true} for {@code fireEvent}.</b>
-+     */
-+    @Deprecated
-+    void setArrowsStuck(int arrows);
-+    // Paper end
- }

patches/api/0026-Use-ASM-for-event-executors.patch

@@ -0,0 +1,394 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Techcable <Techcable@outlook.com>
+Date: Thu, 3 Mar 2016 13:20:33 -0700
+Subject: [PATCH] Use ASM for event executors.
+
+Uses method handles for private or static methods.
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 7b8196db1fd1e283dc9ef71e3fe5137cc5920ba9..f0f8047cb3a43b447dc50b730dab3d0bc471b25a 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -39,6 +39,9 @@ dependencies {
+     apiAndDocs("net.kyori:adventure-text-serializer-legacy")
+     apiAndDocs("net.kyori:adventure-text-serializer-plain")
+     apiAndDocs("net.kyori:adventure-text-logger-slf4j")
++
++    implementation("org.ow2.asm:asm:9.2")
++    implementation("org.ow2.asm:asm-commons:9.2")
+     // Paper end
+ 
+     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..5b28e9b1daba7834af67dbc193dd656bedd9a994
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
+@@ -0,0 +1,42 @@
++package com.destroystokyo.paper.event.executor;
++
++import java.lang.invoke.MethodHandle;
++import java.lang.invoke.MethodHandles;
++import java.lang.reflect.Method;
++
++import com.destroystokyo.paper.util.SneakyThrow;
++import org.bukkit.event.Event;
++import org.bukkit.event.EventException;
++import org.bukkit.event.Listener;
++import org.bukkit.plugin.EventExecutor;
++import org.jetbrains.annotations.NotNull;
++
++public class MethodHandleEventExecutor implements EventExecutor {
++    private final Class<? extends Event> eventClass;
++    private final MethodHandle handle;
++
++    public MethodHandleEventExecutor(@NotNull Class<? extends Event> eventClass, @NotNull MethodHandle handle) {
++        this.eventClass = eventClass;
++        this.handle = handle;
++    }
++
++    public MethodHandleEventExecutor(@NotNull Class<? extends Event> eventClass, @NotNull Method m) {
++        this.eventClass = eventClass;
++        try {
++            m.setAccessible(true);
++            this.handle = MethodHandles.lookup().unreflect(m);
++        } catch (IllegalAccessException e) {
++            throw new AssertionError("Unable to set accessible", e);
++        }
++    }
++
++    @Override
++    public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException {
++        if (!eventClass.isInstance(event)) return;
++        try {
++            handle.invoke(listener, event);
++        } catch (Throwable t) {
++            SneakyThrow.sneaky(t);
++        }
++    }
++}
+diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..c83672427324bd068ed52916f700b68446a226f6
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
+@@ -0,0 +1,43 @@
++package com.destroystokyo.paper.event.executor;
++
++import java.lang.invoke.MethodHandle;
++import java.lang.invoke.MethodHandles;
++import java.lang.reflect.Method;
++import java.lang.reflect.Modifier;
++
++import com.destroystokyo.paper.util.SneakyThrow;
++import com.google.common.base.Preconditions;
++
++import org.bukkit.Bukkit;
++import org.bukkit.event.Event;
++import org.bukkit.event.EventException;
++import org.bukkit.event.Listener;
++import org.bukkit.plugin.EventExecutor;
++import org.jetbrains.annotations.NotNull;
++
++public class StaticMethodHandleEventExecutor implements EventExecutor {
++    private final Class<? extends Event> eventClass;
++    private final MethodHandle handle;
++
++    public StaticMethodHandleEventExecutor(@NotNull Class<? extends Event> eventClass, @NotNull Method m) {
++        Preconditions.checkArgument(Modifier.isStatic(m.getModifiers()), "Not a static method: %s", m);
++        Preconditions.checkArgument(eventClass != null, "eventClass is null");
++        this.eventClass = eventClass;
++        try {
++            m.setAccessible(true);
++            this.handle = MethodHandles.lookup().unreflect(m);
++        } catch (IllegalAccessException e) {
++            throw new AssertionError("Unable to set accessible", e);
++        }
++    }
++
++    @Override
++    public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException {
++        if (!eventClass.isInstance(event)) return;
++        try {
++            handle.invoke(event);
++        } catch (Throwable throwable) {
++            SneakyThrow.sneaky(throwable);
++        }
++    }
++}
+diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..b8d5c13980858dc27fb5383726b7ebcaf14adcb8
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
+@@ -0,0 +1,51 @@
++package com.destroystokyo.paper.event.executor.asm;
++
++import java.lang.reflect.Method;
++import java.util.concurrent.atomic.AtomicInteger;
++
++import org.bukkit.plugin.EventExecutor;
++import org.jetbrains.annotations.NotNull;
++import org.objectweb.asm.ClassWriter;
++import org.objectweb.asm.Type;
++import org.objectweb.asm.commons.GeneratorAdapter;
++
++import static org.objectweb.asm.Opcodes.*;
++
++public class ASMEventExecutorGenerator {
++    @NotNull
++    public static byte[] generateEventExecutor(@NotNull Method m, @NotNull String name) {
++        ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
++        writer.visit(V1_8, ACC_PUBLIC, name.replace('.', '/'), null, Type.getInternalName(Object.class), new String[] {Type.getInternalName(EventExecutor.class)});
++        // Generate constructor
++        GeneratorAdapter methodGenerator = new GeneratorAdapter(writer.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null), ACC_PUBLIC, "<init>", "()V");
++        methodGenerator.loadThis();
++        methodGenerator.visitMethodInsn(INVOKESPECIAL, Type.getInternalName(Object.class), "<init>", "()V", false); // Invoke the super class (Object) constructor
++        methodGenerator.returnValue();
++        methodGenerator.endMethod();
++        // Generate the execute method
++        methodGenerator = new GeneratorAdapter(writer.visitMethod(ACC_PUBLIC, "execute", "(Lorg/bukkit/event/Listener;Lorg/bukkit/event/Event;)V", null, null), ACC_PUBLIC, "execute", "(Lorg/bukkit/event/Listener;Lorg/bukkit/event/Listener;)V");
++        methodGenerator.loadArg(0);
++        methodGenerator.checkCast(Type.getType(m.getDeclaringClass()));
++        methodGenerator.loadArg(1);
++        methodGenerator.checkCast(Type.getType(m.getParameterTypes()[0]));
++        methodGenerator.visitMethodInsn(m.getDeclaringClass().isInterface() ? INVOKEINTERFACE : INVOKEVIRTUAL, Type.getInternalName(m.getDeclaringClass()), m.getName(), Type.getMethodDescriptor(m), m.getDeclaringClass().isInterface());
++        // The only purpose of this switch statement is to generate the correct pop instruction, should the event handler method return something other than void.
++        // Non-void event handlers will be unsupported in a future release.
++        switch (Type.getType(m.getReturnType()).getSize()) {
++            // case 0 is omitted because the only type that has size 0 is void - no pop instruction needed.
++            case 1 -> methodGenerator.pop(); // handles reference types and most primitives
++            case 2 -> methodGenerator.pop2(); // handles long and double
++        }
++        methodGenerator.returnValue();
++        methodGenerator.endMethod();
++        writer.visitEnd();
++        return writer.toByteArray();
++    }
++
++    public static AtomicInteger NEXT_ID = new AtomicInteger(1);
++    @NotNull
++    public static String generateName() {
++        int id = NEXT_ID.getAndIncrement();
++        return "com.destroystokyo.paper.event.executor.asm.generated.GeneratedEventExecutor" + id;
++    }
++}
+diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..f79685b48bb581277a6891927988b6f7a4389dc4
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
+@@ -0,0 +1,34 @@
++package com.destroystokyo.paper.event.executor.asm;
++
++import org.jetbrains.annotations.NotNull;
++
++public interface ClassDefiner {
++
++    /**
++     * Returns if the defined classes can bypass access checks
++     *
++     * @return if classes bypass access checks
++     */
++    public default boolean isBypassAccessChecks() {
++        return false;
++    }
++
++    /**
++     * Define a class
++     *
++     * @param parentLoader the parent classloader
++     * @param name         the name of the class
++     * @param data         the class data to load
++     * @return the defined class
++     * @throws ClassFormatError     if the class data is invalid
++     * @throws NullPointerException if any of the arguments are null
++     */
++    @NotNull
++    public Class<?> defineClass(@NotNull ClassLoader parentLoader, @NotNull String name, @NotNull byte[] data);
++
++    @NotNull
++    public static ClassDefiner getInstance() {
++        return SafeClassDefiner.INSTANCE;
++    }
++
++}
+diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..ac99477e9f2c08041aeff31abc1d1edee58d0a67
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
+@@ -0,0 +1,66 @@
++package com.destroystokyo.paper.event.executor.asm;
++
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentMap;
++
++import com.google.common.base.Preconditions;
++
++import com.google.common.collect.MapMaker;
++import org.jetbrains.annotations.NotNull;
++import org.objectweb.asm.Type;
++
++public class SafeClassDefiner implements ClassDefiner {
++    /* default */ static final SafeClassDefiner INSTANCE = new SafeClassDefiner();
++
++    private SafeClassDefiner() {}
++
++    private final ConcurrentMap<ClassLoader, GeneratedClassLoader> loaders = new MapMaker().weakKeys().makeMap();
++
++    @NotNull
++    @Override
++    public Class<?> defineClass(@NotNull ClassLoader parentLoader, @NotNull String name, @NotNull byte[] data) {
++        GeneratedClassLoader loader = loaders.computeIfAbsent(parentLoader, GeneratedClassLoader::new);
++        synchronized (loader.getClassLoadingLock(name)) {
++            Preconditions.checkState(!loader.hasClass(name), "%s already defined", name);
++            Class<?> c = loader.define(name, data);
++            assert c.getName().equals(name);
++            return c;
++        }
++    }
++
++    private static class GeneratedClassLoader extends ClassLoader {
++        static {
++            ClassLoader.registerAsParallelCapable();
++        }
++
++        protected GeneratedClassLoader(@NotNull ClassLoader parent) {
++            super(parent);
++        }
++
++        private Class<?> define(@NotNull String name, byte[] data) {
++            synchronized (getClassLoadingLock(name)) {
++                assert !hasClass(name);
++                Class<?> c = defineClass(name, data, 0, data.length);
++                resolveClass(c);
++                return c;
++            }
++        }
++
++        @Override
++        @NotNull
++        public Object getClassLoadingLock(@NotNull String name) {
++            return super.getClassLoadingLock(name);
++        }
++
++        public boolean hasClass(@NotNull String name) {
++            synchronized (getClassLoadingLock(name)) {
++                try {
++                    Class.forName(name);
++                    return true;
++                } catch (ClassNotFoundException e) {
++                    return false;
++                }
++            }
++        }
++    }
++}
+diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
+index a850f0780de05463fc0d3f9e15ff7f19d88b2aed..9026e108ccd3a88aee1267ee275137befa646455 100644
+--- a/src/main/java/org/bukkit/plugin/EventExecutor.java
++++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
+@@ -5,9 +5,75 @@ import org.bukkit.event.EventException;
+ import org.bukkit.event.Listener;
+ import org.jetbrains.annotations.NotNull;
+ 
++// Paper start
++import java.lang.reflect.Method;
++import java.lang.reflect.Modifier;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentMap;
++import java.util.function.Function;
++
++import com.destroystokyo.paper.event.executor.MethodHandleEventExecutor;
++import com.destroystokyo.paper.event.executor.StaticMethodHandleEventExecutor;
++import com.destroystokyo.paper.event.executor.asm.ASMEventExecutorGenerator;
++import com.destroystokyo.paper.event.executor.asm.ClassDefiner;
++import com.google.common.base.Preconditions;
++// Paper end
++
+ /**
+  * Interface which defines the class for event call backs to plugins
+  */
+ public interface EventExecutor {
+     public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException;
++
++    // Paper start
++    ConcurrentMap<Method, Class<? extends EventExecutor>> eventExecutorMap = new ConcurrentHashMap<Method, Class<? extends EventExecutor>>() {
++        @NotNull
++        @Override
++        public Class<? extends EventExecutor> computeIfAbsent(@NotNull Method key, @NotNull Function<? super Method, ? extends Class<? extends EventExecutor>> mappingFunction) {
++            Class<? extends EventExecutor> executorClass = get(key);
++            if (executorClass != null)
++                return executorClass;
++
++            //noinspection SynchronizationOnLocalVariableOrMethodParameter
++            synchronized (key) {
++                executorClass = get(key);
++                if (executorClass != null)
++                    return executorClass;
++
++                return super.computeIfAbsent(key, mappingFunction);
++            }
++        }
++    };
++
++    @NotNull
++    public static EventExecutor create(@NotNull Method m, @NotNull Class<? extends Event> eventClass) {
++        Preconditions.checkNotNull(m, "Null method");
++        Preconditions.checkArgument(m.getParameterCount() != 0, "Incorrect number of arguments %s", m.getParameterCount());
++        Preconditions.checkArgument(m.getParameterTypes()[0] == eventClass, "First parameter %s doesn't match event class %s", m.getParameterTypes()[0], eventClass);
++        ClassDefiner definer = ClassDefiner.getInstance();
++        if (Modifier.isStatic(m.getModifiers())) {
++            return new StaticMethodHandleEventExecutor(eventClass, m);
++        } else if (definer.isBypassAccessChecks() || Modifier.isPublic(m.getDeclaringClass().getModifiers()) && Modifier.isPublic(m.getModifiers())) {
++            // get the existing generated EventExecutor class for the Method or generate one
++            Class<? extends EventExecutor> executorClass = eventExecutorMap.computeIfAbsent(m, (__) -> {
++                String name = ASMEventExecutorGenerator.generateName();
++                byte[] classData = ASMEventExecutorGenerator.generateEventExecutor(m, name);
++                return definer.defineClass(m.getDeclaringClass().getClassLoader(), name, classData).asSubclass(EventExecutor.class);
++            });
++
++            try {
++                EventExecutor asmExecutor = executorClass.newInstance();
++                // Define a wrapper to conform to bukkit stupidity (passing in events that don't match and wrapper exception)
++                return (listener, event) -> {
++                    if (!eventClass.isInstance(event)) return;
++                    asmExecutor.execute(listener, event);
++                };
++            } catch (InstantiationException | IllegalAccessException e) {
++                throw new AssertionError("Unable to initialize generated event executor", e);
++            }
++        } else {
++            return new MethodHandleEventExecutor(eventClass, m);
++        }
++    }
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+index 5eb24f38f158d43fb42836b83c108f808c89512e..5d74fab03a15d7099e5dacb780eade4cdc185797 100644
+--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
++++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+@@ -291,21 +291,7 @@ public final class JavaPluginLoader implements PluginLoader {
+                 }
+             }
+ 
+-            EventExecutor executor = new co.aikar.timings.TimedEventExecutor(new EventExecutor() { // Paper
+-                @Override
+-                public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException { // Paper
+-                    try {
+-                        if (!eventClass.isAssignableFrom(event.getClass())) {
+-                            return;
+-                        }
+-                        method.invoke(listener, event);
+-                    } catch (InvocationTargetException ex) {
+-                        throw new EventException(ex.getCause());
+-                    } catch (Throwable t) {
+-                        throw new EventException(t);
+-                    }
+-                }
+-            }, plugin, method, eventClass); // Paper
++            EventExecutor executor = new co.aikar.timings.TimedEventExecutor(EventExecutor.create(method, eventClass), plugin, method, eventClass); // Paper // Paper (Yes.) - Use factory method `EventExecutor.create()`
+             if (false) { // Spigot - RL handles useTimings check now
+                 eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
+             } else {

patches/api/0027-Complete-resource-pack-API.patch

@@ -1,182 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <jedediah@silencegreys.com>
-Date: Sat, 4 Apr 2015 22:59:54 -0400
-Subject: [PATCH] Complete resource pack API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 3e2b8c1ae51404352adccc9ad108982173306ee9..cdc67b2c6770119ada67033b388befa607bd46db 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1394,7 +1394,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * @throws IllegalArgumentException Thrown if the URL is null.
-      * @throws IllegalArgumentException Thrown if the URL is too long. The
-      *     length restriction is an implementation specific arbitrary value.
-+     * @deprecated use {@link #setResourcePack(String, String)}
-      */
-+    @Deprecated // Paper
-     public void setResourcePack(@NotNull String url);
- 
-     /**
-@@ -2210,6 +2212,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
-         return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName())));
-     }
-+
-+    /**
-+     * Request that the player's client download and switch resource packs.
-+     * <p>
-+     * The player's client will download the new resource pack asynchronously
-+     * in the background, and will automatically switch to it once the
-+     * download is complete. If the client has downloaded and cached the same
-+     * resource pack in the past, it will perform a quick timestamp check
-+     * over the network to determine if the resource pack has changed and
-+     * needs to be downloaded again. When this request is sent for the very
-+     * first time from a given server, the client will first display a
-+     * confirmation GUI to the player before proceeding with the download.
-+     * <p>
-+     * Notes:
-+     * <ul>
-+     * <li>Players can disable server resources on their client, in which
-+     *     case this method will have no affect on them.
-+     * <li>There is no concept of resetting resource packs back to default
-+     *     within Minecraft, so players will have to relog to do so.
-+     * </ul>
-+     *
-+     * @param url The URL from which the client will download the resource
-+     *     pack. The string must contain only US-ASCII characters and should
-+     *     be encoded as per RFC 1738.
-+     * @param hash A 40 character hexadecimal and lowercase SHA-1 digest of
-+     *     the resource pack file.
-+     * @throws IllegalArgumentException Thrown if the URL is null.
-+     * @throws IllegalArgumentException Thrown if the URL is too long. The
-+     *     length restriction is an implementation specific arbitrary value.
-+     */
-+    void setResourcePack(@NotNull String url, @NotNull String hash);
-+
-+    /**
-+     * Request that the player's client download and switch resource packs.
-+     * <p>
-+     * The player's client will download the new resource pack asynchronously
-+     * in the background, and will automatically switch to it once the
-+     * download is complete. If the client has downloaded and cached the same
-+     * resource pack in the past, it will perform a quick timestamp check
-+     * over the network to determine if the resource pack has changed and
-+     * needs to be downloaded again. When this request is sent for the very
-+     * first time from a given server, the client will first display a
-+     * confirmation GUI to the player before proceeding with the download.
-+     * <p>
-+     * Notes:
-+     * <ul>
-+     * <li>Players can disable server resources on their client, in which
-+     *     case this method will have no affect on them.
-+     * <li>There is no concept of resetting resource packs back to default
-+     *     within Minecraft, so players will have to relog to do so.
-+     * </ul>
-+     *
-+     * @param url The URL from which the client will download the resource
-+     *     pack. The string must contain only US-ASCII characters and should
-+     *     be encoded as per RFC 1738.
-+     * @param hash A 40 character hexadecimal and lowercase SHA-1 digest of
-+     *     the resource pack file.
-+     * @param required Marks if the resource pack should be required by the client
-+     * @throws IllegalArgumentException Thrown if the URL is null.
-+     * @throws IllegalArgumentException Thrown if the URL is too long. The
-+     *     length restriction is an implementation specific arbitrary value.
-+     */
-+    void setResourcePack(@NotNull String url, @NotNull String hash, boolean required);
-+
-+    /**
-+     * Request that the player's client download and switch resource packs.
-+     * <p>
-+     * The player's client will download the new resource pack asynchronously
-+     * in the background, and will automatically switch to it once the
-+     * download is complete. If the client has downloaded and cached the same
-+     * resource pack in the past, it will perform a quick timestamp check
-+     * over the network to determine if the resource pack has changed and
-+     * needs to be downloaded again. When this request is sent for the very
-+     * first time from a given server, the client will first display a
-+     * confirmation GUI to the player before proceeding with the download.
-+     * <p>
-+     * Notes:
-+     * <ul>
-+     * <li>Players can disable server resources on their client, in which
-+     *     case this method will have no affect on them.
-+     * <li>There is no concept of resetting resource packs back to default
-+     *     within Minecraft, so players will have to relog to do so.
-+     * </ul>
-+     *
-+     * @param url The URL from which the client will download the resource
-+     *     pack. The string must contain only US-ASCII characters and should
-+     *     be encoded as per RFC 1738.
-+     * @param hash A 40 character hexadecimal and lowercase SHA-1 digest of
-+     *     the resource pack file.
-+     * @param required Marks if the resource pack should be required by the client
-+     * @param resourcePackPrompt A Prompt to be displayed in the client request
-+     * @throws IllegalArgumentException Thrown if the URL is null.
-+     * @throws IllegalArgumentException Thrown if the URL is too long. The
-+     *     length restriction is an implementation specific arbitrary value.
-+     */
-+    void setResourcePack(@NotNull String url, @NotNull String hash, boolean required, @Nullable net.kyori.adventure.text.Component resourcePackPrompt);
-+    /**
-+     * @return the most recent resource pack status received from the player,
-+     *         or null if no status has ever been received from this player.
-+     */
-+    @Nullable
-+    org.bukkit.event.player.PlayerResourcePackStatusEvent.Status getResourcePackStatus();
-+
-+    /**
-+     * @return the most recent resource pack hash received from the player,
-+     *         or null if no hash has ever been received from this player.
-+     *
-+     * @deprecated This is no longer sent from the client and will always be null
-+     */
-+    @Nullable
-+    @Deprecated
-+    String getResourcePackHash();
-+
-+    /**
-+     * @return true if the last resource pack status received from this player
-+     *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
-+     */
-+    boolean hasResourcePack();
-     // Paper end
- 
-     // Spigot start
-diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
-index b98195650d49d78ec35970ca0376b6289b861e4b..4c2102a11c3d682d98f0db4ccafa35231e66bcdd 100644
---- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
-@@ -11,13 +11,32 @@ import org.jetbrains.annotations.NotNull;
- public class PlayerResourcePackStatusEvent extends PlayerEvent {
- 
-     private static final HandlerList handlers = new HandlerList();
-+    @Deprecated
-+    private final String hash; // Paper
-     private final Status status;
- 
-     public PlayerResourcePackStatusEvent(@NotNull final Player who, @NotNull Status resourcePackStatus) {
-         super(who);
-+        this.hash = null; // Paper
-         this.status = resourcePackStatus;
-     }
- 
-+    @Deprecated // Paper
-+    public PlayerResourcePackStatusEvent(final Player who, Status resourcePackStatus, String hash) {
-+        super(who);
-+        this.hash = hash; // Paper
-+        this.status = resourcePackStatus;
-+    }
-+
-+    @Deprecated
-+    /**
-+     * @deprecated Hash does not seem to ever be set
-+     */
-+    public String getHash() {
-+        return this.hash;
-+    }
-+    // Paper end
-+
-     /**
-      * Gets the status of this pack.
-      *

patches/api/0029-Add-command-to-reload-permissions.yml-and-require-co.patch

@@ -0,0 +1,104 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William <admin@domnian.com>
+Date: Fri, 18 Mar 2016 03:28:07 -0400
+Subject: [PATCH] Add command to reload permissions.yml and require confirm to
+ reload
+
+
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index 7a8eaf46ecd37163dbe34beb2cf8754bddae302f..9463169bdb45a53ad774a0e3a5ec07704508685f 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -2125,6 +2125,13 @@ public final class Bukkit {
+     public static org.bukkit.command.CommandMap getCommandMap() {
+         return server.getCommandMap();
+     }
++
++    /**
++     * Reload the Permissions in permissions.yml
++     */
++    public static void reloadPermissions() {
++        server.reloadPermissions();
++    }
+     // Paper end
+ 
+     @NotNull
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index 1aed052ea337f2875b581064bd8e79d8a5a1a9ec..cd51a1a9a59cfa868237ab750d98d9df8464152f 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -1874,4 +1874,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+     @NotNull
+     Spigot spigot();
+     // Spigot end
++
++    void reloadPermissions(); // Paper
+ }
+diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+index 50cc311be7904cc8fc6070a21c8e4de3a489fd20..5fa9d648bc780e874f658597f1a24715bccac5cb 100644
+--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
++++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+@@ -13,15 +13,35 @@ public class ReloadCommand extends BukkitCommand {
+     public ReloadCommand(@NotNull String name) {
+         super(name);
+         this.description = "Reloads the server configuration and plugins";
+-        this.usageMessage = "/reload";
++        this.usageMessage = "/reload [permissions]"; // Paper
+         this.setPermission("bukkit.command.reload");
+         this.setAliases(Arrays.asList("rl"));
+     }
+ 
+     @Override
+-    public boolean execute(@NotNull CommandSender sender, @NotNull String currentAlias, @NotNull String[] args) {
++    public boolean execute(@NotNull CommandSender sender, @NotNull String currentAlias, @NotNull String[] args) { // Paper
+         if (!testPermission(sender)) return true;
+ 
++        // Paper start - Reload permissions.yml & require confirm
++        boolean confirmed = System.getProperty("LetMeReload") != null;
++        if (args.length == 1) {
++            if (args[0].equalsIgnoreCase("permissions")) {
++                Bukkit.getServer().reloadPermissions();
++                Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Permissions successfully reloaded.", net.kyori.adventure.text.format.NamedTextColor.GREEN));
++                return true;
++            } else if ("confirm".equalsIgnoreCase(args[0])) {
++                confirmed = true;
++            } else {
++                Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Usage: " + usageMessage, net.kyori.adventure.text.format.NamedTextColor.RED));
++                return true;
++            }
++        }
++        if (!confirmed) {
++            Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Are you sure you wish to reload your server? Doing so may cause bugs and memory leaks. It is recommended to restart instead of using /reload. To confirm, please type ", net.kyori.adventure.text.format.NamedTextColor.RED).append(net.kyori.adventure.text.Component.text("/reload confirm", net.kyori.adventure.text.format.NamedTextColor.YELLOW)));
++            return true;
++        }
++        // Paper end
++
+         Command.broadcastCommandMessage(sender, ChatColor.RED + "Please note that this command is not supported and may cause issues when using some plugins.");
+         Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server.");
+         Bukkit.reload();
+@@ -33,6 +53,6 @@ public class ReloadCommand extends BukkitCommand {
+     @NotNull
+     @Override
+     public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
+-        return Collections.emptyList();
++        return java.util.Collections.singletonList("permissions"); // Paper
+     }
+ }
+diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+index b535ab89b5a04371bac41720d28b4af8b18f1c20..77caec9f974077ed6580d3cbbc20feb1199feb11 100644
+--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
++++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+@@ -906,4 +906,13 @@ public final class SimplePluginManager implements PluginManager {
+     public void useTimings(boolean use) {
+         co.aikar.timings.Timings.setTimingsEnabled(use); // Paper
+     }
++
++    // Paper start
++    public void clearPermissions() {
++        permissions.clear();
++        defaultPerms.get(true).clear();
++        defaultPerms.get(false).clear();
++    }
++    // Paper end
++
+ }

patches/api/0030-Add-command-to-reload-permissions.yml-and-require-co.patch

@@ -1,86 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William <admin@domnian.com>
-Date: Fri, 18 Mar 2016 03:28:07 -0400
-Subject: [PATCH] Add command to reload permissions.yml and require confirm to
- reload
-
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 316146305465b68b703e898206745de94ad5350f..6311d7ef36b3c6922c73695c353c561c507f2128 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2127,6 +2127,13 @@ public final class Bukkit {
-     public static org.bukkit.command.CommandMap getCommandMap() {
-         return server.getCommandMap();
-     }
-+
-+    /**
-+     * Reload the Permissions in permissions.yml
-+     */
-+    public static void reloadPermissions() {
-+        server.reloadPermissions();
-+    }
-     // Paper end
- 
-     @NotNull
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index bef555b3de44fed312b45a5d5cd811b18fda88c8..994f494fe7cace5c88738858def4051788391a3c 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1876,4 +1876,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     @NotNull
-     Spigot spigot();
-     // Spigot end
-+
-+    void reloadPermissions(); // Paper
- }
-diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-index 50cc311be7904cc8fc6070a21c8e4de3a489fd20..5fa9d648bc780e874f658597f1a24715bccac5cb 100644
---- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-@@ -13,15 +13,35 @@ public class ReloadCommand extends BukkitCommand {
-     public ReloadCommand(@NotNull String name) {
-         super(name);
-         this.description = "Reloads the server configuration and plugins";
--        this.usageMessage = "/reload";
-+        this.usageMessage = "/reload [permissions]"; // Paper
-         this.setPermission("bukkit.command.reload");
-         this.setAliases(Arrays.asList("rl"));
-     }
- 
-     @Override
--    public boolean execute(@NotNull CommandSender sender, @NotNull String currentAlias, @NotNull String[] args) {
-+    public boolean execute(@NotNull CommandSender sender, @NotNull String currentAlias, @NotNull String[] args) { // Paper
-         if (!testPermission(sender)) return true;
- 
-+        // Paper start - Reload permissions.yml & require confirm
-+        boolean confirmed = System.getProperty("LetMeReload") != null;
-+        if (args.length == 1) {
-+            if (args[0].equalsIgnoreCase("permissions")) {
-+                Bukkit.getServer().reloadPermissions();
-+                Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Permissions successfully reloaded.", net.kyori.adventure.text.format.NamedTextColor.GREEN));
-+                return true;
-+            } else if ("confirm".equalsIgnoreCase(args[0])) {
-+                confirmed = true;
-+            } else {
-+                Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Usage: " + usageMessage, net.kyori.adventure.text.format.NamedTextColor.RED));
-+                return true;
-+            }
-+        }
-+        if (!confirmed) {
-+            Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Are you sure you wish to reload your server? Doing so may cause bugs and memory leaks. It is recommended to restart instead of using /reload. To confirm, please type ", net.kyori.adventure.text.format.NamedTextColor.RED).append(net.kyori.adventure.text.Component.text("/reload confirm", net.kyori.adventure.text.format.NamedTextColor.YELLOW)));
-+            return true;
-+        }
-+        // Paper end
-+
-         Command.broadcastCommandMessage(sender, ChatColor.RED + "Please note that this command is not supported and may cause issues when using some plugins.");
-         Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server.");
-         Bukkit.reload();
-@@ -33,6 +53,6 @@ public class ReloadCommand extends BukkitCommand {
-     @NotNull
-     @Override
-     public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
--        return Collections.emptyList();
-+        return java.util.Collections.singletonList("permissions"); // Paper
-     }
- }

patches/api/0030-Custom-replacement-for-eaten-items.patch

@@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jedediah Smith <jedediah@silencegreys.com>
+Date: Sun, 21 Jun 2015 15:05:21 -0400
+Subject: [PATCH] Custom replacement for eaten items
+
+
+diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
+index c2793f3ef01c1246c130971c17e1c2bf8f551435..373f4b5b5185aa81ff728da89c9cc4e0ccf87889 100644
+--- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
++++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
+@@ -22,6 +22,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
+     private static final HandlerList handlers = new HandlerList();
+     private boolean isCancelled = false;
+     private ItemStack item;
++    @Nullable private ItemStack replacement; // Paper
+ 
+     /**
+      * @param player the player consuming
+@@ -58,6 +59,29 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
+         }
+     }
+ 
++    // Paper start
++    /**
++     * Return the custom item stack that will replace the consumed item, or null if no
++     * custom replacement has been set (which means the default replacement will be used).
++     *
++     * @return The custom item stack that will replace the consumed item or null
++     */
++    @Nullable
++    public ItemStack getReplacement() {
++        return this.replacement;
++    }
++
++    /**
++     * Set a custom item stack to replace the consumed item. Pass null to clear any custom
++     * stack that has been set and use the default replacement.
++     *
++     * @param replacement Replacement item to set, null to clear any custom stack and use default
++     */
++    public void setReplacement(@Nullable ItemStack replacement) {
++        this.replacement = replacement;
++    }
++    // Paper end
++
+     @Override
+     public boolean isCancelled() {
+         return this.isCancelled;

patches/api/0031-Custom-replacement-for-eaten-items.patch

@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <jedediah@silencegreys.com>
-Date: Sun, 21 Jun 2015 15:05:21 -0400
-Subject: [PATCH] Custom replacement for eaten items
-
-
-diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
-index 5c054eb531e3caf17c179aff6a712fb8c33d8f77..6110d0417340710333b44312d82c7bd5165a8954 100644
---- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java
-@@ -24,6 +24,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
-     private boolean isCancelled = false;
-     private ItemStack item;
-     private final EquipmentSlot hand;
-+    @Nullable private ItemStack replacement; // Paper
- 
-     /**
-      * @param player the player consuming
-@@ -82,6 +83,29 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable {
-         return hand;
-     }
- 
-+    // Paper start
-+    /**
-+     * Return the custom item stack that will replace the consumed item, or null if no
-+     * custom replacement has been set (which means the default replacement will be used).
-+     *
-+     * @return The custom item stack that will replace the consumed item or null
-+     */
-+    @Nullable
-+    public ItemStack getReplacement() {
-+        return this.replacement;
-+    }
-+
-+    /**
-+     * Set a custom item stack to replace the consumed item. Pass null to clear any custom
-+     * stack that has been set and use the default replacement.
-+     *
-+     * @param replacement Replacement item to set, null to clear any custom stack and use default
-+     */
-+    public void setReplacement(@Nullable ItemStack replacement) {
-+        this.replacement = replacement;
-+    }
-+    // Paper end
-+
-     @Override
-     public boolean isCancelled() {
-         return this.isCancelled;

patches/api/0042-Allow-Reloading-of-Command-Aliases.patch

@@ -0,0 +1,108 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: willies952002 <admin@domnian.com>
+Date: Mon, 28 Nov 2016 10:16:39 -0500
+Subject: [PATCH] Allow Reloading of Command Aliases
+
+Reload the aliases stored in commands.yml
+
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index 9463169bdb45a53ad774a0e3a5ec07704508685f..fe5f6494fb0610dd11e59793701b2182fa862419 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -2132,6 +2132,15 @@ public final class Bukkit {
+     public static void reloadPermissions() {
+         server.reloadPermissions();
+     }
++
++    /**
++     * Reload the Command Aliases in commands.yml
++     *
++     * @return Whether the reload was successful
++     */
++    public static boolean reloadCommandAliases() {
++        return server.reloadCommandAliases();
++    }
+     // Paper end
+ 
+     @NotNull
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index cd51a1a9a59cfa868237ab750d98d9df8464152f..29e71b746adcec45657787bf38427027508b0043 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -1876,4 +1876,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+     // Spigot end
+ 
+     void reloadPermissions(); // Paper
++
++    boolean reloadCommandAliases(); // Paper
+ }
+diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java
+index bd2c7a6964722412148fae39e1b4951fc0002b9b..864c263bbd4dd6dd7c37a74b39b1a40a884d0731 100644
+--- a/src/main/java/org/bukkit/command/CommandMap.java
++++ b/src/main/java/org/bukkit/command/CommandMap.java
+@@ -128,4 +128,14 @@ public interface CommandMap {
+      */
+     @Nullable
+     public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String cmdLine, @Nullable Location location) throws IllegalArgumentException;
++
++    // Paper start - Expose Known Commands
++    /**
++     * Return a Map of known commands
++     *
++     * @return known commands
++     */
++    @NotNull
++    public java.util.Map<String, Command> getKnownCommands();
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
+index 2e23c124311b38aaea64dd274c33afcd52edcf43..950a2d0b3b583c6b9a703190874bbc4df2783ab7 100644
+--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
++++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
+@@ -293,4 +293,11 @@ public class SimpleCommandMap implements CommandMap {
+             }
+         }
+     }
++
++    // Paper start - Expose Known Commands
++    @NotNull
++    public Map<String, Command> getKnownCommands() {
++        return knownCommands;
++    }
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+index 5fa9d648bc780e874f658597f1a24715bccac5cb..3ec32b46264cfff857b50129b5e0fa5584943ec6 100644
+--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
++++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+@@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand {
+     public ReloadCommand(@NotNull String name) {
+         super(name);
+         this.description = "Reloads the server configuration and plugins";
+-        this.usageMessage = "/reload [permissions]"; // Paper
++        this.usageMessage = "/reload [permissions|commands|confirm]"; // Paper
+         this.setPermission("bukkit.command.reload");
+         this.setAliases(Arrays.asList("rl"));
+     }
+@@ -29,6 +29,13 @@ public class ReloadCommand extends BukkitCommand {
+                 Bukkit.getServer().reloadPermissions();
+                 Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Permissions successfully reloaded.", net.kyori.adventure.text.format.NamedTextColor.GREEN));
+                 return true;
++            } else if ("commands".equalsIgnoreCase(args[0])) {
++                if (Bukkit.getServer().reloadCommandAliases()) {
++                    Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Command aliases successfully reloaded.", net.kyori.adventure.text.format.NamedTextColor.GREEN));
++                } else {
++                    Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("An error occurred while trying to reload command aliases.", net.kyori.adventure.text.format.NamedTextColor.RED));
++                }
++                return true;
+             } else if ("confirm".equalsIgnoreCase(args[0])) {
+                 confirmed = true;
+             } else {
+@@ -53,6 +60,6 @@ public class ReloadCommand extends BukkitCommand {
+     @NotNull
+     @Override
+     public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
+-        return java.util.Collections.singletonList("permissions"); // Paper
++        return com.google.common.collect.Lists.newArrayList("permissions", "commands"); // Paper
+     }
+ }

patches/api/0043-Allow-Reloading-of-Command-Aliases.patch

@@ -1,108 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: willies952002 <admin@domnian.com>
-Date: Mon, 28 Nov 2016 10:16:39 -0500
-Subject: [PATCH] Allow Reloading of Command Aliases
-
-Reload the aliases stored in commands.yml
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6311d7ef36b3c6922c73695c353c561c507f2128..a314ff1363cb527fa7e1b366f9191939e9c7ca6e 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2134,6 +2134,15 @@ public final class Bukkit {
-     public static void reloadPermissions() {
-         server.reloadPermissions();
-     }
-+
-+    /**
-+     * Reload the Command Aliases in commands.yml
-+     *
-+     * @return Whether the reload was successful
-+     */
-+    public static boolean reloadCommandAliases() {
-+        return server.reloadCommandAliases();
-+    }
-     // Paper end
- 
-     @NotNull
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 994f494fe7cace5c88738858def4051788391a3c..610475aff60b7f19c4bedb932985c736fb890684 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1878,4 +1878,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     // Spigot end
- 
-     void reloadPermissions(); // Paper
-+
-+    boolean reloadCommandAliases(); // Paper
- }
-diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java
-index bd2c7a6964722412148fae39e1b4951fc0002b9b..864c263bbd4dd6dd7c37a74b39b1a40a884d0731 100644
---- a/src/main/java/org/bukkit/command/CommandMap.java
-+++ b/src/main/java/org/bukkit/command/CommandMap.java
-@@ -128,4 +128,14 @@ public interface CommandMap {
-      */
-     @Nullable
-     public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String cmdLine, @Nullable Location location) throws IllegalArgumentException;
-+
-+    // Paper start - Expose Known Commands
-+    /**
-+     * Return a Map of known commands
-+     *
-+     * @return known commands
-+     */
-+    @NotNull
-+    public java.util.Map<String, Command> getKnownCommands();
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index b3b32ce429edbf1ed040354dbe28ab86f0d24201..1424060c0a162020d4a680e0a592224561067b16 100644
---- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
-+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -293,4 +293,11 @@ public class SimpleCommandMap implements CommandMap {
-             }
-         }
-     }
-+
-+    // Paper start - Expose Known Commands
-+    @NotNull
-+    public Map<String, Command> getKnownCommands() {
-+        return knownCommands;
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-index 5fa9d648bc780e874f658597f1a24715bccac5cb..3ec32b46264cfff857b50129b5e0fa5584943ec6 100644
---- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-@@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand {
-     public ReloadCommand(@NotNull String name) {
-         super(name);
-         this.description = "Reloads the server configuration and plugins";
--        this.usageMessage = "/reload [permissions]"; // Paper
-+        this.usageMessage = "/reload [permissions|commands|confirm]"; // Paper
-         this.setPermission("bukkit.command.reload");
-         this.setAliases(Arrays.asList("rl"));
-     }
-@@ -29,6 +29,13 @@ public class ReloadCommand extends BukkitCommand {
-                 Bukkit.getServer().reloadPermissions();
-                 Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Permissions successfully reloaded.", net.kyori.adventure.text.format.NamedTextColor.GREEN));
-                 return true;
-+            } else if ("commands".equalsIgnoreCase(args[0])) {
-+                if (Bukkit.getServer().reloadCommandAliases()) {
-+                    Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("Command aliases successfully reloaded.", net.kyori.adventure.text.format.NamedTextColor.GREEN));
-+                } else {
-+                    Command.broadcastCommandMessage(sender, net.kyori.adventure.text.Component.text("An error occurred while trying to reload command aliases.", net.kyori.adventure.text.format.NamedTextColor.RED));
-+                }
-+                return true;
-             } else if ("confirm".equalsIgnoreCase(args[0])) {
-                 confirmed = true;
-             } else {
-@@ -53,6 +60,6 @@ public class ReloadCommand extends BukkitCommand {
-     @NotNull
-     @Override
-     public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
--        return java.util.Collections.singletonList("permissions"); // Paper
-+        return com.google.common.collect.Lists.newArrayList("permissions", "commands"); // Paper
-     }
- }

patches/api/0044-Add-ProjectileCollideEvent.patch

@@ -0,0 +1,79 @@
+From 0000000000000000000000000000000000000000 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/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..453663893021768ae21d4980ce17ffba55d9e129
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
+@@ -0,0 +1,67 @@
++package com.destroystokyo.paper.event.entity;
++
++import org.bukkit.entity.Entity;
++import org.bukkit.entity.Projectile;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.entity.EntityEvent;
++import org.jetbrains.annotations.NotNull;
++
++/**
++ * Called when an projectile collides with an entity
++ * <p>
++ * This event is called <b>before</b> {@link org.bukkit.event.entity.EntityDamageByEntityEvent}, and cancelling it will allow the projectile to continue flying
++ */
++public class ProjectileCollideEvent extends EntityEvent implements Cancellable {
++    @NotNull private final Entity collidedWith;
++
++    /**
++     * Get the entity the projectile collided with
++     *
++     * @return the entity collided with
++     */
++    @NotNull
++    public Entity getCollidedWith() {
++        return collidedWith;
++    }
++
++    public ProjectileCollideEvent(@NotNull Projectile what, @NotNull Entity collidedWith) {
++        super(what);
++        this.collidedWith = collidedWith;
++    }
++
++    /**
++     * Get the projectile that collided
++     *
++     * @return the projectile that collided
++     */
++    @NotNull
++    public Projectile getEntity() {
++        return (Projectile) super.getEntity();
++    }
++
++    private static final HandlerList handlerList = new HandlerList();
++
++    @NotNull
++    public static HandlerList getHandlerList() {
++        return handlerList;
++    }
++
++    @NotNull
++    @Override
++    public HandlerList getHandlers() {
++        return handlerList;
++    }
++
++    private boolean cancelled = false;
++
++    @Override
++    public boolean isCancelled() {
++        return cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel) {
++        this.cancelled = cancel;
++    }
++}

patches/api/0045-Add-ProjectileCollideEvent.patch

@@ -1,82 +0,0 @@
-From 0000000000000000000000000000000000000000 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
-
-Now deprecated and replaced with ProjectileHitEvent
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..6ae2bc3d952d34f298220738856024e0b6594199
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
-@@ -0,0 +1,69 @@
-+package com.destroystokyo.paper.event.entity;
-+
-+import org.bukkit.entity.Entity;
-+import org.bukkit.entity.Projectile;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.entity.EntityEvent;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Called when a projectile collides with an entity
-+ * <p>
-+ * This event is called <b>before</b> {@link org.bukkit.event.entity.EntityDamageByEntityEvent}, and cancelling it will allow the projectile to continue flying
-+ * @deprecated Deprecated, use {@link org.bukkit.event.entity.ProjectileHitEvent} and check if there is a hit entity
-+ */
-+@Deprecated
-+public class ProjectileCollideEvent extends EntityEvent implements Cancellable {
-+    @NotNull private final Entity collidedWith;
-+
-+    /**
-+     * Get the entity the projectile collided with
-+     *
-+     * @return the entity collided with
-+     */
-+    @NotNull
-+    public Entity getCollidedWith() {
-+        return collidedWith;
-+    }
-+
-+    public ProjectileCollideEvent(@NotNull Projectile what, @NotNull Entity collidedWith) {
-+        super(what);
-+        this.collidedWith = collidedWith;
-+    }
-+
-+    /**
-+     * Get the projectile that collided
-+     *
-+     * @return the projectile that collided
-+     */
-+    @NotNull
-+    public Projectile getEntity() {
-+        return (Projectile) super.getEntity();
-+    }
-+
-+    private static final HandlerList handlerList = new HandlerList();
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlerList;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlerList;
-+    }
-+
-+    private boolean cancelled = false;
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
-+    }
-+}

patches/api/0045-Add-String-based-Action-Bar-API.patch

@@ -0,0 +1,86 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Tue, 20 Dec 2016 15:55:55 -0500
+Subject: [PATCH] Add String based Action Bar API
+
+
+diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
+index bc3fc130b38bb9e102ab6a95e6ca75d815ba4902..80910fcc46b62ee4974a659713a1a72b5b4c135b 100644
+--- a/src/main/java/org/bukkit/entity/Player.java
++++ b/src/main/java/org/bukkit/entity/Player.java
+@@ -4,6 +4,7 @@ import java.net.InetSocketAddress;
+ import java.util.Collection;
+ import java.util.UUID;
+ import com.destroystokyo.paper.Title; // Paper
++import net.kyori.adventure.text.Component;
+ import org.bukkit.DyeColor;
+ import org.bukkit.Effect;
+ import org.bukkit.GameMode;
+@@ -780,6 +781,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+     public void sendMap(@NotNull MapView map);
+ 
+     // Paper start
++
++    /**
++     * Sends an Action Bar message to the client.
++     *
++     * Use Section symbols for legacy color codes to send formatting.
++     *
++     * @param message The message to send
++     * @deprecated use {@link #sendActionBar(Component)}
++     */
++    @Deprecated
++    public void sendActionBar(@NotNull String message);
++
++    /**
++     * Sends an Action Bar message to the client.
++     *
++     * Use supplied alternative character to the section symbol to represent legacy color codes.
++     *
++     * @param alternateChar Alternate symbol such as '&'
++     * @param message The message to send
++     * @deprecated use {@link #sendActionBar(Component)}
++     */
++    @Deprecated
++    public void sendActionBar(char alternateChar, @NotNull String message);
++
++    /**
++     * Sends an Action Bar message to the client.
++     *
++     * @param message The components to send
++     * @deprecated use {@link #sendActionBar(Component)}
++     */
++    @Deprecated
++    public void sendActionBar(@NotNull net.md_5.bungee.api.chat.BaseComponent... message);
++
+     /**
+      * Sends the component to the player
+      *
+@@ -807,9 +841,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+     /**
+      * Sends an array of components as a single message to the specified screen position of this player
+      *
++     * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client.
+      * @param position the screen position
+      * @param components the components to send
+      */
++    @Deprecated
+     public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
+         spigot().sendMessage(position, components);
+     }
+@@ -2336,6 +2372,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+         /**
+          * Sends the component to the specified screen position of this player
+          *
++         * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client.
+          * @param position the screen position
+          * @param component the components to send
+          * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
+@@ -2348,6 +2385,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+         /**
+          * Sends an array of components as a single message to the specified screen position of this player
+          *
++         * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client.
+          * @param position the screen position
+          * @param components the components to send
+          * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}

patches/api/0046-Add-String-based-Action-Bar-API.patch

@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 20 Dec 2016 15:55:55 -0500
-Subject: [PATCH] Add String based Action Bar API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index cdc67b2c6770119ada67033b388befa607bd46db..0fdaf416960ace84fbe9b9c461641efbb8b631a4 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -814,6 +814,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     public void sendMap(@NotNull MapView map);
- 
-     // Paper start
-+
-+    /**
-+     * Sends an Action Bar message to the client.
-+     *
-+     * Use Section symbols for legacy color codes to send formatting.
-+     *
-+     * @param message The message to send
-+     * @deprecated use {@link #sendActionBar(net.kyori.adventure.text.Component)}
-+     */
-+    @Deprecated
-+    public void sendActionBar(@NotNull String message);
-+
-+    /**
-+     * Sends an Action Bar message to the client.
-+     *
-+     * Use supplied alternative character to the section symbol to represent legacy color codes.
-+     *
-+     * @param alternateChar Alternate symbol such as '&'
-+     * @param message The message to send
-+     * @deprecated use {@link #sendActionBar(net.kyori.adventure.text.Component)}
-+     */
-+    @Deprecated
-+    public void sendActionBar(char alternateChar, @NotNull String message);
-+
-+    /**
-+     * Sends an Action Bar message to the client.
-+     *
-+     * @param message The components to send
-+     * @deprecated use {@link #sendActionBar(net.kyori.adventure.text.Component)}
-+     */
-+    @Deprecated
-+    public void sendActionBar(@NotNull net.md_5.bungee.api.chat.BaseComponent... message);
-+
-     /**
-      * Sends the component to the player
-      *
-@@ -841,9 +874,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     /**
-      * Sends an array of components as a single message to the specified screen position of this player
-      *
-+     * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client.
-      * @param position the screen position
-      * @param components the components to send
-      */
-+    @Deprecated
-     public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
-         spigot().sendMessage(position, components);
-     }

patches/api/0050-Provide-E-TE-Chunk-count-stat-methods.patch

@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Sat, 7 Jan 2017 15:23:03 -0500
+Subject: [PATCH] Provide E/TE/Chunk count stat methods
+
+Provides counts without the ineffeciency of using .getEntities().size()
+which creates copy of the collections.
+
+diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
+index 887b85849803cee22a41a701b43cdc9085ba0dc3..e0683e69029e8ac423bda79521045b06673eabf3 100644
+--- a/src/main/java/org/bukkit/World.java
++++ b/src/main/java/org/bukkit/World.java
+@@ -45,6 +45,33 @@ import org.jetbrains.annotations.Nullable;
+  */
+ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient, Metadatable, PersistentDataHolder, Keyed, net.kyori.adventure.audience.ForwardingAudience { // Paper
+ 
++    // Paper start
++    /**
++     * @return The amount of Entities in this world
++     */
++    int getEntityCount();
++
++    /**
++     * @return The amount of Tile Entities in this world
++     */
++    int getTileEntityCount();
++
++    /**
++     * @return The amount of Tickable Tile Entities in this world
++     */
++    int getTickableTileEntityCount();
++
++    /**
++     * @return The amount of Chunks in this world
++     */
++    int getChunkCount();
++
++    /**
++     * @return The amount of Players in this world
++     */
++    int getPlayerCount();
++    // Paper end
++
+     /**
+      * Gets the {@link Block} at the given coordinates
+      *

patches/api/0051-Provide-E-TE-Chunk-count-stat-methods.patch

@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 7 Jan 2017 15:23:03 -0500
-Subject: [PATCH] Provide E/TE/Chunk count stat methods
-
-Provides counts without the ineffeciency of using .getEntities().size()
-which creates copy of the collections.
-
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 8a6a548314eef8d486be908e38e3a4562f26bdb4..749d3de7dad480965be536938733d72bdfc2995b 100644
---- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -45,6 +45,33 @@ import org.jetbrains.annotations.Nullable;
-  */
- public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient, Metadatable, PersistentDataHolder, Keyed, net.kyori.adventure.audience.ForwardingAudience { // Paper
- 
-+    // Paper start
-+    /**
-+     * @return The amount of Entities in this world
-+     */
-+    int getEntityCount();
-+
-+    /**
-+     * @return The amount of Tile Entities in this world
-+     */
-+    int getTileEntityCount();
-+
-+    /**
-+     * @return The amount of Tickable Tile Entities in this world
-+     */
-+    int getTickableTileEntityCount();
-+
-+    /**
-+     * @return The amount of Chunks in this world
-+     */
-+    int getChunkCount();
-+
-+    /**
-+     * @return The amount of Players in this world
-+     */
-+    int getPlayerCount();
-+    // Paper end
-+
-     /**
-      * Gets the {@link Block} at the given coordinates
-      *

patches/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -0,0 +1,60 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: kashike <kashike@vq.lc>
+Date: Fri, 9 Jun 2017 07:24:24 -0700
+Subject: [PATCH] Add configuration option to prevent player names from being
+ suggested
+
+
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index fe5f6494fb0610dd11e59793701b2182fa862419..05908e512b0f2c01124737cf68df79c6c04518ee 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -2141,6 +2141,16 @@ public final class Bukkit {
+     public static boolean reloadCommandAliases() {
+         return server.reloadCommandAliases();
+     }
++
++    /**
++     * Checks if player names should be suggested when a command returns {@code null} as
++     * their tab completion result.
++     *
++     * @return true if player names should be suggested
++     */
++    public static boolean suggestPlayerNamesWhenNullTabCompletions() {
++        return server.suggestPlayerNamesWhenNullTabCompletions();
++    }
+     // Paper end
+ 
+     @NotNull
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index 29e71b746adcec45657787bf38427027508b0043..f84c37ad591f4d0e4062889941791a3aeb7c5be5 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -1878,4 +1878,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+     void reloadPermissions(); // Paper
+ 
+     boolean reloadCommandAliases(); // Paper
++
++    // Paper start - allow preventing player name suggestions by default
++    /**
++     * Checks if player names should be suggested when a command returns {@code null} as
++     * their tab completion result.
++     *
++     * @return true if player names should be suggested
++     */
++    boolean suggestPlayerNamesWhenNullTabCompletions();
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
+index 6fd341482d5250ad814e870360e40b52427f799a..a26df5f6341d22ecd5e71da59b8f091848e627ad 100644
+--- a/src/main/java/org/bukkit/command/Command.java
++++ b/src/main/java/org/bukkit/command/Command.java
+@@ -99,7 +99,7 @@ public abstract class Command {
+         Preconditions.checkArgument(args != null, "Arguments cannot be null");
+         Preconditions.checkArgument(alias != null, "Alias cannot be null");
+ 
+-        if (args.length == 0) {
++        if (args.length == 0 || !sender.getServer().suggestPlayerNamesWhenNullTabCompletions()) { // Paper - allow preventing player name suggestions by default) {
+             return ImmutableList.of();
+         }
+ 

patches/api/0054-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -1,60 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Fri, 9 Jun 2017 07:24:24 -0700
-Subject: [PATCH] Add configuration option to prevent player names from being
- suggested
-
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a314ff1363cb527fa7e1b366f9191939e9c7ca6e..d3d8c5ac59cee2ec24e91223e0c994016a4f9752 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2143,6 +2143,16 @@ public final class Bukkit {
-     public static boolean reloadCommandAliases() {
-         return server.reloadCommandAliases();
-     }
-+
-+    /**
-+     * Checks if player names should be suggested when a command returns {@code null} as
-+     * their tab completion result.
-+     *
-+     * @return true if player names should be suggested
-+     */
-+    public static boolean suggestPlayerNamesWhenNullTabCompletions() {
-+        return server.suggestPlayerNamesWhenNullTabCompletions();
-+    }
-     // Paper end
- 
-     @NotNull
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 610475aff60b7f19c4bedb932985c736fb890684..a8d3addae5b0ed261d6a27052ad4e54970de597c 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1880,4 +1880,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     void reloadPermissions(); // Paper
- 
-     boolean reloadCommandAliases(); // Paper
-+
-+    // Paper start - allow preventing player name suggestions by default
-+    /**
-+     * Checks if player names should be suggested when a command returns {@code null} as
-+     * their tab completion result.
-+     *
-+     * @return true if player names should be suggested
-+     */
-+    boolean suggestPlayerNamesWhenNullTabCompletions();
-+    // Paper end
- }
-diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 6fd341482d5250ad814e870360e40b52427f799a..a26df5f6341d22ecd5e71da59b8f091848e627ad 100644
---- a/src/main/java/org/bukkit/command/Command.java
-+++ b/src/main/java/org/bukkit/command/Command.java
-@@ -99,7 +99,7 @@ public abstract class Command {
-         Preconditions.checkArgument(args != null, "Arguments cannot be null");
-         Preconditions.checkArgument(alias != null, "Alias cannot be null");
- 
--        if (args.length == 0) {
-+        if (args.length == 0 || !sender.getServer().suggestPlayerNamesWhenNullTabCompletions()) { // Paper - allow preventing player name suggestions by default) {
-             return ImmutableList.of();
-         }
- 

patches/api/0054-Fix-upstream-javadocs.patch

@@ -0,0 +1,448 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.com>
+Date: Sat, 10 Jun 2017 16:59:40 -0500
+Subject: [PATCH] Fix upstream javadocs
+
+Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
+
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index 05908e512b0f2c01124737cf68df79c6c04518ee..2ff65157d511108e2902838f37732742b186af6e 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -1332,6 +1332,8 @@ public final class Bukkit {
+ 
+     /**
+      * Gets every player that has ever played on this server.
++     * <p>
++     * <b>This method can be expensive as it loads all the player data files from the disk.</b>
+      *
+      * @return an array containing all previous players
+      */
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index f84c37ad591f4d0e4062889941791a3aeb7c5be5..d9566b18e6109db824cbc1732666771bf124adbf 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -510,13 +510,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+      * </ul>
+      * <p>
+      * <b>Note:</b> If set to 0, {@link SpawnCategory} mobs spawning will be disabled.
+-     * <p>
+-     * Minecraft default: 1.
+-     * <br>
+-     * <b>Note: </b> the {@link SpawnCategory#MISC} are not consider.
+      *
+      * @param spawnCategory the category of spawn
+      * @return the default ticks per {@link SpawnCategory} mobs spawn value
++     * @throws IllegalArgumentException if the category is {@link SpawnCategory#MISC}
+      */
+     public int getTicksPerSpawns(@NotNull SpawnCategory spawnCategory);
+ 
+@@ -1127,6 +1124,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+ 
+     /**
+      * Gets every player that has ever played on this server.
++     * <p>
++     * <b>This method can be expensive as it loads all the player data files from the disk.</b>
+      *
+      * @return an array containing all previous players
+      */
+diff --git a/src/main/java/org/bukkit/block/Bed.java b/src/main/java/org/bukkit/block/Bed.java
+index f9bd74f9ce6bd6650726e5a993f9b6e292cdc74d..f4c37ce1fe7aac3dde8485ee51fc8888ed56e79e 100644
+--- a/src/main/java/org/bukkit/block/Bed.java
++++ b/src/main/java/org/bukkit/block/Bed.java
+@@ -4,7 +4,22 @@ import org.bukkit.material.Colorable;
+ 
+ /**
+  * Represents a captured state of a bed.
+- * @deprecated does not provide useful information beyond the material itself
+  */
+-@Deprecated
+-public interface Bed extends TileState, Colorable { }
++// Paper start
++// @Deprecated
++public interface Bed extends TileState, Colorable {
++
++    @Override
++    @org.jetbrains.annotations.NotNull org.bukkit.DyeColor getColor();
++
++    /**
++     * <b>Unsupported</b>
++     *
++     * @throws UnsupportedOperationException not supported, set the block type
++     */
++    @Override
++    @org.jetbrains.annotations.Contract("_ -> fail")
++    @Deprecated(forRemoval = true)
++    void setColor(@org.bukkit.UndefinedNullability("not supported") org.bukkit.DyeColor color);
++// Paper end
++}
+diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
+index 91fc11dda99de506be83d40df8929bf7cd8e8d85..7dc631ebd009f5f5c3ac1699c3f3515c47609c05 100644
+--- a/src/main/java/org/bukkit/entity/ArmorStand.java
++++ b/src/main/java/org/bukkit/entity/ArmorStand.java
+@@ -360,5 +360,8 @@ public interface ArmorStand extends LivingEntity {
+      * @param move {@code true} if this armour stand can move, {@code false} otherwise
+      */
+     void setCanMove(boolean move);
++
++    @Override
++    org.bukkit.inventory.@NotNull EntityEquipment getEquipment();
+     // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
+index 652238659e0a6e0df11f2798773aea4fe7712360..9c57eda3b7af7026639afda9959bc5e5a720861a 100644
+--- a/src/main/java/org/bukkit/entity/HumanEntity.java
++++ b/src/main/java/org/bukkit/entity/HumanEntity.java
+@@ -22,6 +22,11 @@ import org.jetbrains.annotations.Nullable;
+  */
+ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder {
+ 
++    // Paper start
++    @Override
++    org.bukkit.inventory.@NotNull EntityEquipment getEquipment();
++    // Paper end
++
+     /**
+      * Returns the name of this player
+      *
+diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
+index 2926fa6071bc7640cc10280b5c3962b0ce7686f1..4f63988848443aff55619bc12ef12c925642a3f9 100644
+--- a/src/main/java/org/bukkit/entity/Mob.java
++++ b/src/main/java/org/bukkit/entity/Mob.java
+@@ -9,6 +9,10 @@ import org.jetbrains.annotations.Nullable;
+  */
+ public interface Mob extends LivingEntity, Lootable {
+ 
++    // Paper start
++    @Override
++    org.bukkit.inventory.@org.jetbrains.annotations.NotNull EntityEquipment getEquipment();
++    // Paper end
+     /**
+      * Instructs this Mob to set the specified LivingEntity as its target.
+      * <p>
+diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
+index 80910fcc46b62ee4974a659713a1a72b5b4c135b..50faa513411cdb611ae228f0c07a7dfe15807b85 100644
+--- a/src/main/java/org/bukkit/entity/Player.java
++++ b/src/main/java/org/bukkit/entity/Player.java
+@@ -312,15 +312,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ 
+     /**
+      * Saves the players current location, health, inventory, motion, and
+-     * other information into the username.dat file, in the world/player
+-     * folder
++     * other information into the &lt;uuid&gt;.dat file, in the
++     * &lt;level-name&gt;/playerdata/ folder.
+      */
+     public void saveData();
+ 
+     /**
+      * Loads the players current location, health, inventory, motion, and
+-     * other information from the username.dat file, in the world/player
+-     * folder.
++     * other information from the &lt;uuid&gt;.dat file, in the
++     * &lt;level-name&gt;/playerdata/ folder.
+      * <p>
+      * Note: This will overwrite the players current inventory, health,
+      * motion, etc, with the state from the saved dat file.
+@@ -798,7 +798,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      *
+      * Use supplied alternative character to the section symbol to represent legacy color codes.
+      *
+-     * @param alternateChar Alternate symbol such as '&'
++     * @param alternateChar Alternate symbol such as '&amp;'
+      * @param message The message to send
+      * @deprecated use {@link #sendActionBar(Component)}
+      */
+diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java
+index 1119e26e270bb45f517955b19d95a9ec3d113634..4631647c64c89ffdde2d9b63bdab974acfe6cb3d 100644
+--- a/src/main/java/org/bukkit/entity/Slime.java
++++ b/src/main/java/org/bukkit/entity/Slime.java
+@@ -11,6 +11,16 @@ public interface Slime extends Mob {
+     public int getSize();
+ 
+     /**
++     * Setting the size of the slime (regardless of previous size)
++     * will set the following attributes:
++     * <ul>
++     *     <li>{@link org.bukkit.attribute.Attribute#GENERIC_MAX_HEALTH}</li>
++     *     <li>{@link org.bukkit.attribute.Attribute#GENERIC_MOVEMENT_SPEED}</li>
++     *     <li>{@link org.bukkit.attribute.Attribute#GENERIC_ATTACK_DAMAGE}</li>
++     * </ul>
++     * to their per-size defaults and heal the
++     * slime to its max health (assuming it's alive).
++     *
+      * @param sz The new size of the slime.
+      */
+     public void setSize(int sz);
+diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
+index e9de00e9e434d36117a672fa9fbfc7c52f284b67..9a06487e0f76cd7765e6f900b7458a3cf0aa44e7 100644
+--- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
++++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
+@@ -158,7 +158,8 @@ public class CreatureSpawnEvent extends EntitySpawnEvent {
+          */
+         SHEARED,
+         /**
+-         * When eg an effect cloud is spawned as a result of a creeper exploding
++         * When an entity is spawned as a result of an explosion. Like an area effect cloud from
++         * a creeper or a dragon fireball.
+          */
+         EXPLOSION,
+         /**
+diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
+index d51d2ec1d04d9ea8a25a70d0d856f2355ebfcb4a..7ecff9fcee19fc94be784474fea620e5dd434731 100644
+--- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
++++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
+@@ -105,7 +105,7 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
+          */
+         SATIATED,
+         /**
+-         * When a player regains health from eating consumables
++         * When an animal regains health from eating consumables
+          */
+         EATING,
+         /**
+diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java
+index d5b50a4a954fed35d37f03f1a277cc173ca106df..a91fa5386afd7a1137adb921ad5adb798604772f 100644
+--- a/src/main/java/org/bukkit/inventory/EntityEquipment.java
++++ b/src/main/java/org/bukkit/inventory/EntityEquipment.java
+@@ -37,9 +37,23 @@ public interface EntityEquipment {
+     public ItemStack getItem(@NotNull EquipmentSlot slot);
+ 
+     /**
+-     * Gets a copy of the item the entity is currently holding
++     * Gets the item the entity is currently holding
+      * in their main hand.
+      *
++     * <p>
++     * This returns a copy if this equipment instance is from a non-player,
++     * or it's an empty stack (has AIR as its type).
++     * For non-empty stacks from players, this returns a live mirror. You can check if this
++     * will return a mirror with
++     * <pre>{@code
++     * EntityEquipment equipment = entity.getEquipment();
++     * if (equipment instanceof PlayerInventory) {
++     *     equipment.getItemInMainHand(); // will return a mirror
++     * } else {
++     *     equipment.getItemInMainHand(); // will return a copy
++     * }
++     * }</pre>
++     *
+      * @return the currently held item
+      */
+     @NotNull
+@@ -61,9 +75,23 @@ public interface EntityEquipment {
+     void setItemInMainHand(@Nullable ItemStack item, boolean silent);
+ 
+     /**
+-     * Gets a copy of the item the entity is currently holding
++     * Gets the item the entity is currently holding
+      * in their off hand.
+      *
++     * <p>
++     * This returns a copy if this equipment instance is from a non-player,
++     * or it's an empty stack (has AIR as its type).
++     * For non-empty stacks from players, this returns a live mirror. You can check if this
++     * will return a mirror with
++     * <pre>{@code
++     * EntityEquipment equipment = entity.getEquipment();
++     * if (equipment instanceof PlayerInventory) {
++     *     equipment.getItemInOffHand(); // will return a mirror
++     * } else {
++     *     equipment.getItemInOffHand(); // will return a copy
++     * }
++     * }</pre>
++     *
+      * @return the currently held item
+      */
+     @NotNull
+@@ -85,7 +113,21 @@ public interface EntityEquipment {
+     void setItemInOffHand(@Nullable ItemStack item, boolean silent);
+ 
+     /**
+-     * Gets a copy of the item the entity is currently holding
++     * Gets the item the entity is currently holding
++     *
++     * <p>
++     * This returns a copy if this equipment instance is from a non-player,
++     * or it's an empty stack (has AIR as its type).
++     * For non-empty stacks from players, this returns a live mirror. You can check if this
++     * will return a mirror with
++     * <pre>{@code
++     * EntityEquipment equipment = entity.getEquipment();
++     * if (equipment instanceof PlayerInventory) {
++     *     equipment.getItemInHand(); // will return a mirror
++     * } else {
++     *     equipment.getItemInHand(); // will return a copy
++     * }
++     * }</pre>
+      *
+      * @return the currently held item
+      * @see #getItemInMainHand()
+@@ -110,11 +152,24 @@ public interface EntityEquipment {
+     void setItemInHand(@Nullable ItemStack stack);
+ 
+     /**
+-     * Gets a copy of the helmet currently being worn by the entity
++     * Gets the helmet currently being worn by the entity
++     *
++     * <p>
++     * This returns a copy if this equipment instance is from a non-player.
++     * For stacks from players, this returns a live mirror (or null). You can check if this
++     * will return a mirror with
++     * <pre>{@code
++     * EntityEquipment equipment = entity.getEquipment();
++     * if (equipment instanceof PlayerInventory) {
++     *     equipment.getItemInHand(); // will return a mirror
++     * } else {
++     *     equipment.getItemInHand(); // will return a copy
++     * }
++     * }</pre>
+      *
+      * @return The helmet being worn
+      */
+-    @Nullable
++    @org.bukkit.UndefinedNullability("not null for entities, nullable for players") // Paper
+     ItemStack getHelmet();
+ 
+     /**
+@@ -133,11 +188,24 @@ public interface EntityEquipment {
+     void setHelmet(@Nullable ItemStack helmet, boolean silent);
+ 
+     /**
+-     * Gets a copy of the chest plate currently being worn by the entity
++     * Gets the chest plate currently being worn by the entity
++     *
++     * <p>
++     * This returns a copy if this equipment instance is from a non-player.
++     * For stacks from players, this returns a live mirror (or null). You can check if this
++     * will return a mirror with
++     * <pre>{@code
++     * EntityEquipment equipment = entity.getEquipment();
++     * if (equipment instanceof PlayerInventory) {
++     *     equipment.getChestplate(); // will return a mirror
++     * } else {
++     *     equipment.getChestplate(); // will return a copy
++     * }
++     * }</pre>
+      *
+      * @return The chest plate being worn
+      */
+-    @Nullable
++    @org.bukkit.UndefinedNullability("not null for entities, nullable for players") // Paper
+     ItemStack getChestplate();
+ 
+     /**
+@@ -156,11 +224,24 @@ public interface EntityEquipment {
+     void setChestplate(@Nullable ItemStack chestplate, boolean silent);
+ 
+     /**
+-     * Gets a copy of the leggings currently being worn by the entity
++     * Gets the leggings currently being worn by the entity
++     *
++     * <p>
++     * This returns a copy if this equipment instance is from a non-player.
++     * For stacks from players, this returns a live mirror (or null). You can check if this
++     * will return a mirror with
++     * <pre>{@code
++     * EntityEquipment equipment = entity.getEquipment();
++     * if (equipment instanceof PlayerInventory) {
++     *     equipment.getLeggings(); // will return a mirror
++     * } else {
++     *     equipment.getLeggings(); // will return a copy
++     * }
++     * }</pre>
+      *
+      * @return The leggings being worn
+      */
+-    @Nullable
++    @org.bukkit.UndefinedNullability("not null for entities, nullable for players") // Paper
+     ItemStack getLeggings();
+ 
+     /**
+@@ -179,11 +260,24 @@ public interface EntityEquipment {
+     void setLeggings(@Nullable ItemStack leggings, boolean silent);
+ 
+     /**
+-     * Gets a copy of the boots currently being worn by the entity
++     * Gets the boots currently being worn by the entity
++     *
++     * <p>
++     * This returns a copy if this equipment instance is from a non-player.
++     * For stacks from players, this returns a live mirror (or null). You can check if this
++     * will return a mirror with
++     * <pre>{@code
++     * EntityEquipment equipment = entity.getEquipment();
++     * if (equipment instanceof PlayerInventory) {
++     *     equipment.getBoots(); // will return a mirror
++     * } else {
++     *     equipment.getBoots(); // will return a copy
++     * }
++     * }</pre>
+      *
+      * @return The boots being worn
+      */
+-    @Nullable
++    @org.bukkit.UndefinedNullability("not null for entities, nullable for players") // Paper
+     ItemStack getBoots();
+ 
+     /**
+@@ -202,12 +296,25 @@ public interface EntityEquipment {
+     void setBoots(@Nullable ItemStack boots, boolean silent);
+ 
+     /**
+-     * Gets a copy of all worn armor
++     * Gets all worn armor
++     *
++     * <p>
++     * This returns a copy if this equipment instance is from a non-player,
++     * or it's an empty stack (has AIR as its type).
++     * For non-empty stacks from players, this returns a live mirror. You can check if this
++     * will return a mirror with
++     * <pre>{@code
++     * EntityEquipment equipment = entity.getEquipment();
++     * if (equipment instanceof PlayerInventory) {
++     *     equipment.getArmorContents(); // will return an array of mirror
++     * } else {
++     *     equipment.getArmorContents(); // will return an array of copies
++     * }
++     * }</pre>
+      *
+      * @return The array of worn armor. Individual items may be null.
+      */
+-    @NotNull
+-    ItemStack[] getArmorContents();
++    @org.bukkit.UndefinedNullability("not null elements for entities, nullable elements for players") ItemStack @NotNull [] getArmorContents(); // Paper
+ 
+     /**
+      * Sets the entities armor to the provided array of ItemStacks
+diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
+index 62fbd7f6d8195bebcab7f704a0a485a1bbeca26c..5461f7fa75f5a065bb333b4a113640b5fe1e3825 100644
+--- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
++++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
+@@ -158,7 +158,7 @@ public interface PlayerInventory extends Inventory {
+     public void setBoots(@Nullable ItemStack boots);
+ 
+     /**
+-     * Gets a copy of the item the player is currently holding
++     * Gets the item the player is currently holding
+      * in their main hand.
+      *
+      * @return the currently held item
+@@ -174,7 +174,7 @@ public interface PlayerInventory extends Inventory {
+     void setItemInMainHand(@Nullable ItemStack item);
+ 
+     /**
+-     * Gets a copy of the item the player is currently holding
++     * Gets the item the player is currently holding
+      * in their off hand.
+      *
+      * @return the currently held item
+@@ -190,7 +190,7 @@ public interface PlayerInventory extends Inventory {
+     void setItemInOffHand(@Nullable ItemStack item);
+ 
+     /**
+-     * Gets a copy of the item the player is currently holding
++     * Gets the item the player is currently holding
+      *
+      * @return the currently held item
+      * @see #getItemInMainHand()

patches/api/0055-Fix-upstream-javadocs.patch

@@ -1,488 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Sat, 10 Jun 2017 16:59:40 -0500
-Subject: [PATCH] Fix upstream javadocs
-
-Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d3d8c5ac59cee2ec24e91223e0c994016a4f9752..82757d3013e01a6bfbb685929955d3e7dad8508c 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1334,6 +1334,8 @@ public final class Bukkit {
- 
-     /**
-      * Gets every player that has ever played on this server.
-+     * <p>
-+     * <b>This method can be expensive as it loads all the player data files from the disk.</b>
-      *
-      * @return an array containing all previous players
-      */
-diff --git a/src/main/java/org/bukkit/ChunkSnapshot.java b/src/main/java/org/bukkit/ChunkSnapshot.java
-index 0cf808356a1a5c6fc4bcf97a694ed9beb80a776a..dc765dea47a9a1c1520fb16ddb24f81413ed0dd1 100644
---- a/src/main/java/org/bukkit/ChunkSnapshot.java
-+++ b/src/main/java/org/bukkit/ChunkSnapshot.java
-@@ -136,7 +136,7 @@ public interface ChunkSnapshot {
-      * Get raw biome temperature at given coordinates
-      *
-      * @param x X-coordinate (0-15)
--     * @param y Y-coordinate (0-15)
-+     * @param y Y-coordinate (world minHeight (inclusive) - world maxHeight (exclusive))
-      * @param z Z-coordinate (0-15)
-      * @return temperature at given coordinate
-      */
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a8d3addae5b0ed261d6a27052ad4e54970de597c..3485db7548e93242f99977a236eb3bcebedfb964 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -510,13 +510,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-      * </ul>
-      * <p>
-      * <b>Note:</b> If set to 0, {@link SpawnCategory} mobs spawning will be disabled.
--     * <p>
--     * Minecraft default: 1.
--     * <br>
--     * <b>Note: </b> the {@link SpawnCategory#MISC} are not consider.
-      *
-      * @param spawnCategory the category of spawn
-      * @return the default ticks per {@link SpawnCategory} mobs spawn value
-+     * @throws IllegalArgumentException if the category is {@link SpawnCategory#MISC}
-      */
-     public int getTicksPerSpawns(@NotNull SpawnCategory spawnCategory);
- 
-@@ -1129,6 +1126,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
- 
-     /**
-      * Gets every player that has ever played on this server.
-+     * <p>
-+     * <b>This method can be expensive as it loads all the player data files from the disk.</b>
-      *
-      * @return an array containing all previous players
-      */
-diff --git a/src/main/java/org/bukkit/block/Bed.java b/src/main/java/org/bukkit/block/Bed.java
-index f9bd74f9ce6bd6650726e5a993f9b6e292cdc74d..f4c37ce1fe7aac3dde8485ee51fc8888ed56e79e 100644
---- a/src/main/java/org/bukkit/block/Bed.java
-+++ b/src/main/java/org/bukkit/block/Bed.java
-@@ -4,7 +4,22 @@ import org.bukkit.material.Colorable;
- 
- /**
-  * Represents a captured state of a bed.
-- * @deprecated does not provide useful information beyond the material itself
-  */
--@Deprecated
--public interface Bed extends TileState, Colorable { }
-+// Paper start
-+// @Deprecated
-+public interface Bed extends TileState, Colorable {
-+
-+    @Override
-+    @org.jetbrains.annotations.NotNull org.bukkit.DyeColor getColor();
-+
-+    /**
-+     * <b>Unsupported</b>
-+     *
-+     * @throws UnsupportedOperationException not supported, set the block type
-+     */
-+    @Override
-+    @org.jetbrains.annotations.Contract("_ -> fail")
-+    @Deprecated(forRemoval = true)
-+    void setColor(@org.bukkit.UndefinedNullability("not supported") org.bukkit.DyeColor color);
-+// Paper end
-+}
-diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 91fc11dda99de506be83d40df8929bf7cd8e8d85..7dc631ebd009f5f5c3ac1699c3f3515c47609c05 100644
---- a/src/main/java/org/bukkit/entity/ArmorStand.java
-+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
-@@ -360,5 +360,8 @@ public interface ArmorStand extends LivingEntity {
-      * @param move {@code true} if this armour stand can move, {@code false} otherwise
-      */
-     void setCanMove(boolean move);
-+
-+    @Override
-+    org.bukkit.inventory.@NotNull EntityEquipment getEquipment();
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 09936f3a2376a46721bbc8365c989581c2a789ef..3845a726adbd0e75d7bf2aeeb6da8cb571d51a8f 100644
---- a/src/main/java/org/bukkit/entity/HumanEntity.java
-+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -22,6 +22,11 @@ import org.jetbrains.annotations.Nullable;
-  */
- public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder {
- 
-+    // Paper start
-+    @Override
-+    org.bukkit.inventory.@NotNull EntityEquipment getEquipment();
-+    // Paper end
-+
-     /**
-      * Returns the name of this player
-      *
-diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
-index 2926fa6071bc7640cc10280b5c3962b0ce7686f1..4f63988848443aff55619bc12ef12c925642a3f9 100644
---- a/src/main/java/org/bukkit/entity/Mob.java
-+++ b/src/main/java/org/bukkit/entity/Mob.java
-@@ -9,6 +9,10 @@ import org.jetbrains.annotations.Nullable;
-  */
- public interface Mob extends LivingEntity, Lootable {
- 
-+    // Paper start
-+    @Override
-+    org.bukkit.inventory.@org.jetbrains.annotations.NotNull EntityEquipment getEquipment();
-+    // Paper end
-     /**
-      * Instructs this Mob to set the specified LivingEntity as its target.
-      * <p>
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0fdaf416960ace84fbe9b9c461641efbb8b631a4..1017db005f8c7a095911f5dd0dbe37d9fc239c95 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -310,15 +310,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
- 
-     /**
-      * Saves the players current location, health, inventory, motion, and
--     * other information into the username.dat file, in the world/player
--     * folder
-+     * other information into the &lt;uuid&gt;.dat file, in the
-+     * &lt;level-name&gt;/playerdata/ folder.
-      */
-     public void saveData();
- 
-     /**
-      * Loads the players current location, health, inventory, motion, and
--     * other information from the username.dat file, in the world/player
--     * folder.
-+     * other information from the &lt;uuid&gt;.dat file, in the
-+     * &lt;level-name&gt;/playerdata/ folder.
-      * <p>
-      * Note: This will overwrite the players current inventory, health,
-      * motion, etc, with the state from the saved dat file.
-@@ -831,7 +831,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      *
-      * Use supplied alternative character to the section symbol to represent legacy color codes.
-      *
--     * @param alternateChar Alternate symbol such as '&'
-+     * @param alternateChar Alternate symbol such as '&amp;'
-      * @param message The message to send
-      * @deprecated use {@link #sendActionBar(net.kyori.adventure.text.Component)}
-      */
-diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java
-index a5ad3250cebfeb302c58e0bfd6db1295913c927e..bfac874840cf1f36afba16ae4d176c5821a68cfb 100644
---- a/src/main/java/org/bukkit/entity/Slime.java
-+++ b/src/main/java/org/bukkit/entity/Slime.java
-@@ -11,6 +11,16 @@ public interface Slime extends Mob, Enemy {
-     public int getSize();
- 
-     /**
-+     * Setting the size of the slime (regardless of previous size)
-+     * will set the following attributes:
-+     * <ul>
-+     *     <li>{@link org.bukkit.attribute.Attribute#GENERIC_MAX_HEALTH}</li>
-+     *     <li>{@link org.bukkit.attribute.Attribute#GENERIC_MOVEMENT_SPEED}</li>
-+     *     <li>{@link org.bukkit.attribute.Attribute#GENERIC_ATTACK_DAMAGE}</li>
-+     * </ul>
-+     * to their per-size defaults and heal the
-+     * slime to its max health (assuming it's alive).
-+     *
-      * @param sz The new size of the slime.
-      */
-     public void setSize(int sz);
-diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
-index e9de00e9e434d36117a672fa9fbfc7c52f284b67..9a06487e0f76cd7765e6f900b7458a3cf0aa44e7 100644
---- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
-@@ -158,7 +158,8 @@ public class CreatureSpawnEvent extends EntitySpawnEvent {
-          */
-         SHEARED,
-         /**
--         * When eg an effect cloud is spawned as a result of a creeper exploding
-+         * When an entity is spawned as a result of an explosion. Like an area effect cloud from
-+         * a creeper or a dragon fireball.
-          */
-         EXPLOSION,
-         /**
-diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
-index d51d2ec1d04d9ea8a25a70d0d856f2355ebfcb4a..7ecff9fcee19fc94be784474fea620e5dd434731 100644
---- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
-@@ -105,7 +105,7 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
-          */
-         SATIATED,
-         /**
--         * When a player regains health from eating consumables
-+         * When an animal regains health from eating consumables
-          */
-         EATING,
-         /**
-diff --git a/src/main/java/org/bukkit/event/entity/PiglinBarterEvent.java b/src/main/java/org/bukkit/event/entity/PiglinBarterEvent.java
-index c17ff41a688b2cbd877cda25d4ec033ac8ef5524..bd67b7cba78b9bbdd82a5a40048e658a979e3108 100644
---- a/src/main/java/org/bukkit/event/entity/PiglinBarterEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/PiglinBarterEvent.java
-@@ -10,8 +10,7 @@ import org.jetbrains.annotations.NotNull;
- /**
-  * Stores all data related to the bartering interaction with a piglin.
-  *
-- * This event can be triggered by a piglin picking up an item that's on its
-- * bartering list.
-+ * Called when a piglin completes a barter.
-  */
- public class PiglinBarterEvent extends EntityEvent implements Cancellable {
- 
-diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java
-index d5b50a4a954fed35d37f03f1a277cc173ca106df..a91fa5386afd7a1137adb921ad5adb798604772f 100644
---- a/src/main/java/org/bukkit/inventory/EntityEquipment.java
-+++ b/src/main/java/org/bukkit/inventory/EntityEquipment.java
-@@ -37,9 +37,23 @@ public interface EntityEquipment {
-     public ItemStack getItem(@NotNull EquipmentSlot slot);
- 
-     /**
--     * Gets a copy of the item the entity is currently holding
-+     * Gets the item the entity is currently holding
-      * in their main hand.
-      *
-+     * <p>
-+     * This returns a copy if this equipment instance is from a non-player,
-+     * or it's an empty stack (has AIR as its type).
-+     * For non-empty stacks from players, this returns a live mirror. You can check if this
-+     * will return a mirror with
-+     * <pre>{@code
-+     * EntityEquipment equipment = entity.getEquipment();
-+     * if (equipment instanceof PlayerInventory) {
-+     *     equipment.getItemInMainHand(); // will return a mirror
-+     * } else {
-+     *     equipment.getItemInMainHand(); // will return a copy
-+     * }
-+     * }</pre>
-+     *
-      * @return the currently held item
-      */
-     @NotNull
-@@ -61,9 +75,23 @@ public interface EntityEquipment {
-     void setItemInMainHand(@Nullable ItemStack item, boolean silent);
- 
-     /**
--     * Gets a copy of the item the entity is currently holding
-+     * Gets the item the entity is currently holding
-      * in their off hand.
-      *
-+     * <p>
-+     * This returns a copy if this equipment instance is from a non-player,
-+     * or it's an empty stack (has AIR as its type).
-+     * For non-empty stacks from players, this returns a live mirror. You can check if this
-+     * will return a mirror with
-+     * <pre>{@code
-+     * EntityEquipment equipment = entity.getEquipment();
-+     * if (equipment instanceof PlayerInventory) {
-+     *     equipment.getItemInOffHand(); // will return a mirror
-+     * } else {
-+     *     equipment.getItemInOffHand(); // will return a copy
-+     * }
-+     * }</pre>
-+     *
-      * @return the currently held item
-      */
-     @NotNull
-@@ -85,7 +113,21 @@ public interface EntityEquipment {
-     void setItemInOffHand(@Nullable ItemStack item, boolean silent);
- 
-     /**
--     * Gets a copy of the item the entity is currently holding
-+     * Gets the item the entity is currently holding
-+     *
-+     * <p>
-+     * This returns a copy if this equipment instance is from a non-player,
-+     * or it's an empty stack (has AIR as its type).
-+     * For non-empty stacks from players, this returns a live mirror. You can check if this
-+     * will return a mirror with
-+     * <pre>{@code
-+     * EntityEquipment equipment = entity.getEquipment();
-+     * if (equipment instanceof PlayerInventory) {
-+     *     equipment.getItemInHand(); // will return a mirror
-+     * } else {
-+     *     equipment.getItemInHand(); // will return a copy
-+     * }
-+     * }</pre>
-      *
-      * @return the currently held item
-      * @see #getItemInMainHand()
-@@ -110,11 +152,24 @@ public interface EntityEquipment {
-     void setItemInHand(@Nullable ItemStack stack);
- 
-     /**
--     * Gets a copy of the helmet currently being worn by the entity
-+     * Gets the helmet currently being worn by the entity
-+     *
-+     * <p>
-+     * This returns a copy if this equipment instance is from a non-player.
-+     * For stacks from players, this returns a live mirror (or null). You can check if this
-+     * will return a mirror with
-+     * <pre>{@code
-+     * EntityEquipment equipment = entity.getEquipment();
-+     * if (equipment instanceof PlayerInventory) {
-+     *     equipment.getItemInHand(); // will return a mirror
-+     * } else {
-+     *     equipment.getItemInHand(); // will return a copy
-+     * }
-+     * }</pre>
-      *
-      * @return The helmet being worn
-      */
--    @Nullable
-+    @org.bukkit.UndefinedNullability("not null for entities, nullable for players") // Paper
-     ItemStack getHelmet();
- 
-     /**
-@@ -133,11 +188,24 @@ public interface EntityEquipment {
-     void setHelmet(@Nullable ItemStack helmet, boolean silent);
- 
-     /**
--     * Gets a copy of the chest plate currently being worn by the entity
-+     * Gets the chest plate currently being worn by the entity
-+     *
-+     * <p>
-+     * This returns a copy if this equipment instance is from a non-player.
-+     * For stacks from players, this returns a live mirror (or null). You can check if this
-+     * will return a mirror with
-+     * <pre>{@code
-+     * EntityEquipment equipment = entity.getEquipment();
-+     * if (equipment instanceof PlayerInventory) {
-+     *     equipment.getChestplate(); // will return a mirror
-+     * } else {
-+     *     equipment.getChestplate(); // will return a copy
-+     * }
-+     * }</pre>
-      *
-      * @return The chest plate being worn
-      */
--    @Nullable
-+    @org.bukkit.UndefinedNullability("not null for entities, nullable for players") // Paper
-     ItemStack getChestplate();
- 
-     /**
-@@ -156,11 +224,24 @@ public interface EntityEquipment {
-     void setChestplate(@Nullable ItemStack chestplate, boolean silent);
- 
-     /**
--     * Gets a copy of the leggings currently being worn by the entity
-+     * Gets the leggings currently being worn by the entity
-+     *
-+     * <p>
-+     * This returns a copy if this equipment instance is from a non-player.
-+     * For stacks from players, this returns a live mirror (or null). You can check if this
-+     * will return a mirror with
-+     * <pre>{@code
-+     * EntityEquipment equipment = entity.getEquipment();
-+     * if (equipment instanceof PlayerInventory) {
-+     *     equipment.getLeggings(); // will return a mirror
-+     * } else {
-+     *     equipment.getLeggings(); // will return a copy
-+     * }
-+     * }</pre>
-      *
-      * @return The leggings being worn
-      */
--    @Nullable
-+    @org.bukkit.UndefinedNullability("not null for entities, nullable for players") // Paper
-     ItemStack getLeggings();
- 
-     /**
-@@ -179,11 +260,24 @@ public interface EntityEquipment {
-     void setLeggings(@Nullable ItemStack leggings, boolean silent);
- 
-     /**
--     * Gets a copy of the boots currently being worn by the entity
-+     * Gets the boots currently being worn by the entity
-+     *
-+     * <p>
-+     * This returns a copy if this equipment instance is from a non-player.
-+     * For stacks from players, this returns a live mirror (or null). You can check if this
-+     * will return a mirror with
-+     * <pre>{@code
-+     * EntityEquipment equipment = entity.getEquipment();
-+     * if (equipment instanceof PlayerInventory) {
-+     *     equipment.getBoots(); // will return a mirror
-+     * } else {
-+     *     equipment.getBoots(); // will return a copy
-+     * }
-+     * }</pre>
-      *
-      * @return The boots being worn
-      */
--    @Nullable
-+    @org.bukkit.UndefinedNullability("not null for entities, nullable for players") // Paper
-     ItemStack getBoots();
- 
-     /**
-@@ -202,12 +296,25 @@ public interface EntityEquipment {
-     void setBoots(@Nullable ItemStack boots, boolean silent);
- 
-     /**
--     * Gets a copy of all worn armor
-+     * Gets all worn armor
-+     *
-+     * <p>
-+     * This returns a copy if this equipment instance is from a non-player,
-+     * or it's an empty stack (has AIR as its type).
-+     * For non-empty stacks from players, this returns a live mirror. You can check if this
-+     * will return a mirror with
-+     * <pre>{@code
-+     * EntityEquipment equipment = entity.getEquipment();
-+     * if (equipment instanceof PlayerInventory) {
-+     *     equipment.getArmorContents(); // will return an array of mirror
-+     * } else {
-+     *     equipment.getArmorContents(); // will return an array of copies
-+     * }
-+     * }</pre>
-      *
-      * @return The array of worn armor. Individual items may be null.
-      */
--    @NotNull
--    ItemStack[] getArmorContents();
-+    @org.bukkit.UndefinedNullability("not null elements for entities, nullable elements for players") ItemStack @NotNull [] getArmorContents(); // Paper
- 
-     /**
-      * Sets the entities armor to the provided array of ItemStacks
-diff --git a/src/main/java/org/bukkit/inventory/ItemFlag.java b/src/main/java/org/bukkit/inventory/ItemFlag.java
-index 42fcc31147934fd4ed6484b0729e938e7ae2f8e2..4e637420b9a39b822be19367a16da93f236549b3 100644
---- a/src/main/java/org/bukkit/inventory/ItemFlag.java
-+++ b/src/main/java/org/bukkit/inventory/ItemFlag.java
-@@ -35,7 +35,7 @@ public enum ItemFlag {
-      */
-     HIDE_DYE,
-     /**
--     * Setting to show/hide armor trim from leather armor.
-+     * Setting to show/hide armor trim from armor.
-      */
-     HIDE_ARMOR_TRIM;
- }
-diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-index 62fbd7f6d8195bebcab7f704a0a485a1bbeca26c..5461f7fa75f5a065bb333b4a113640b5fe1e3825 100644
---- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
-+++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-@@ -158,7 +158,7 @@ public interface PlayerInventory extends Inventory {
-     public void setBoots(@Nullable ItemStack boots);
- 
-     /**
--     * Gets a copy of the item the player is currently holding
-+     * Gets the item the player is currently holding
-      * in their main hand.
-      *
-      * @return the currently held item
-@@ -174,7 +174,7 @@ public interface PlayerInventory extends Inventory {
-     void setItemInMainHand(@Nullable ItemStack item);
- 
-     /**
--     * Gets a copy of the item the player is currently holding
-+     * Gets the item the player is currently holding
-      * in their off hand.
-      *
-      * @return the currently held item
-@@ -190,7 +190,7 @@ public interface PlayerInventory extends Inventory {
-     void setItemInOffHand(@Nullable ItemStack item);
- 
-     /**
--     * Gets a copy of the item the player is currently holding
-+     * Gets the item the player is currently holding
-      *
-      * @return the currently held item
-      * @see #getItemInMainHand()

patches/api/0057-Add-UnknownCommandEvent.patch

@@ -0,0 +1,125 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Sweepyoface <github@sweepy.pw>
+Date: Sat, 17 Jun 2017 18:48:06 -0400
+Subject: [PATCH] Add UnknownCommandEvent
+
+
+diff --git a/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..57128c780bc73e39d2733cceeb21dc06c2422c3c
+--- /dev/null
++++ b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
+@@ -0,0 +1,113 @@
++package org.bukkit.event.command;
++
++import net.kyori.adventure.text.Component;
++import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
++import org.bukkit.command.CommandSender;
++import org.bukkit.event.Event;
++import org.bukkit.event.HandlerList;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
++/**
++ * Thrown when a player executes a command that is not defined
++ */
++public class UnknownCommandEvent extends Event {
++    private static final HandlerList handlers = new HandlerList();
++    @NotNull private CommandSender sender;
++    @NotNull private String commandLine;
++    @Nullable private Component message;
++
++    @Deprecated
++    public UnknownCommandEvent(@NotNull final CommandSender sender, @NotNull final String commandLine, @Nullable final String message) {
++        this(sender, commandLine, message == null ? null : LegacyComponentSerializer.legacySection().deserialize(message));
++    }
++
++    public UnknownCommandEvent(@NotNull final CommandSender sender, @NotNull final String commandLine, @Nullable final Component message) {
++        super(false);
++        this.sender = sender;
++        this.commandLine = commandLine;
++        this.message = message;
++    }
++
++    /**
++     * Gets the CommandSender or ConsoleCommandSender
++     * <p>
++     *
++     * @return Sender of the command
++     */
++    @NotNull
++    public CommandSender getSender() {
++        return sender;
++    }
++
++    /**
++     * Gets the command that was send
++     * <p>
++     *
++     * @return Command sent
++     */
++    @NotNull
++    public String getCommandLine() {
++        return commandLine;
++    }
++
++    /**
++     * Gets message that will be returned
++     * <p>
++     *
++     * @return Unknown command message
++     * @deprecated use {@link #message()}
++     */
++    @Nullable
++    @Deprecated
++    public String getMessage() {
++        return this.message == null ? null : LegacyComponentSerializer.legacySection().serialize(this.message);
++    }
++
++    /**
++     * Sets message that will be returned
++     * <p>
++     * Set to null to avoid any message being sent
++     *
++     * @param message the message to be returned, or null
++     * @deprecated use {@link #message(Component)}
++     */
++    @Deprecated
++    public void setMessage(@Nullable String message) {
++        this.message(message == null ? null : LegacyComponentSerializer.legacySection().deserialize(message));
++    }
++
++    /**
++     * Gets message that will be returned
++     * <p>
++     *
++     * @return Unknown command message
++     */
++    @Nullable
++    public Component message() {
++        return this.message;
++    }
++
++    /**
++     * Sets message that will be returned
++     * <p>
++     * Set to null to avoid any message being sent
++     *
++     * @param message the message to be returned, or null
++     */
++    public void message(@Nullable Component message) {
++        this.message = message;
++    }
++
++    @NotNull
++    @Override
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    @NotNull
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++}
++

patches/api/0058-Add-UnknownCommandEvent.patch

@@ -1,122 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sweepyoface <github@sweepy.pw>
-Date: Sat, 17 Jun 2017 18:48:06 -0400
-Subject: [PATCH] Add UnknownCommandEvent
-
-
-diff --git a/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..e4f8a0d14ae66468bbb0a5d6bf9c1ee417dc866c
---- /dev/null
-+++ b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
-@@ -0,0 +1,110 @@
-+package org.bukkit.event.command;
-+
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.HandlerList;
-+import org.jetbrains.annotations.Contract;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * Thrown when a player executes a command that is not defined
-+ */
-+public class UnknownCommandEvent extends Event {
-+    private static final HandlerList handlers = new HandlerList();
-+    @NotNull private CommandSender sender;
-+    @NotNull private String commandLine;
-+    @Nullable private Component message;
-+
-+    public UnknownCommandEvent(@NotNull final CommandSender sender, @NotNull final String commandLine, @Nullable final Component message) {
-+        super(false);
-+        this.sender = sender;
-+        this.commandLine = commandLine;
-+        this.message = message;
-+    }
-+
-+    /**
-+     * Gets the CommandSender or ConsoleCommandSender
-+     * <p>
-+     *
-+     * @return Sender of the command
-+     */
-+    @NotNull
-+    public CommandSender getSender() {
-+        return sender;
-+    }
-+
-+    /**
-+     * Gets the command that was send
-+     * <p>
-+     *
-+     * @return Command sent
-+     */
-+    @NotNull
-+    public String getCommandLine() {
-+        return commandLine;
-+    }
-+
-+    /**
-+     * Gets message that will be returned
-+     * <p>
-+     *
-+     * @return Unknown command message
-+     * @deprecated use {@link #message()}
-+     */
-+    @Nullable
-+    @Deprecated
-+    public String getMessage() {
-+        return this.message == null ? null : LegacyComponentSerializer.legacySection().serialize(this.message);
-+    }
-+
-+    /**
-+     * Sets message that will be returned
-+     * <p>
-+     * Set to null to avoid any message being sent
-+     *
-+     * @param message the message to be returned, or null
-+     * @deprecated use {@link #message(Component)}
-+     */
-+    @Deprecated
-+    public void setMessage(@Nullable String message) {
-+        this.message(message == null ? null : LegacyComponentSerializer.legacySection().deserialize(message));
-+    }
-+
-+    /**
-+     * Gets message that will be returned
-+     * <p>
-+     *
-+     * @return Unknown command message
-+     */
-+    @Nullable
-+    @Contract(pure = true)
-+    public Component message() {
-+        return this.message;
-+    }
-+
-+    /**
-+     * Sets message that will be returned
-+     * <p>
-+     * Set to null to avoid any message being sent
-+     *
-+     * @param message the message to be returned, or null
-+     */
-+    public void message(@Nullable Component message) {
-+        this.message = message;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
-+

patches/api/0058-Basic-PlayerProfile-API.patch

@@ -0,0 +1,502 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Mon, 15 Jan 2018 21:46:46 -0500
+Subject: [PATCH] Basic PlayerProfile API
+
+Provides basic elements of a PlayerProfile to be used by future API/events
+
+diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..b76f13a0266806544bde13952476d4867caaf25b
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
+@@ -0,0 +1,231 @@
++package com.destroystokyo.paper.profile;
++
++import java.util.Collection;
++import java.util.Set;
++import java.util.UUID;
++
++import java.util.concurrent.CompletableFuture;
++import org.bukkit.profile.PlayerTextures;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
++/**
++ * Represents a players profile for the game, such as UUID, Name, and textures.
++ */
++public interface PlayerProfile extends org.bukkit.profile.PlayerProfile {
++
++    /**
++     * @return The players name, if set
++     */
++    @Nullable
++    String getName();
++
++    /**
++     * Sets this profiles Name
++     *
++     * @param name The new Name
++     * @return The previous Name
++     */
++    @NotNull
++    @Deprecated(forRemoval = true)
++    String setName(@Nullable String name);
++
++    /**
++     * @return The players unique identifier, if set
++     */
++    @Nullable UUID getId();
++
++    /**
++     * Sets this profiles UUID
++     *
++     * @param uuid The new UUID
++     * @return The previous UUID
++     */
++    @Nullable
++    @Deprecated(forRemoval = true)
++    UUID setId(@Nullable UUID uuid);
++
++    /**
++     * Gets the {@link PlayerTextures} of this profile.
++     * This will build a snapshot of the current texture data once
++     * requested inside PlayerTextures.
++     *
++     * @return the textures, not <code>null</code>
++     */
++    @NotNull
++    PlayerTextures getTextures();
++
++    /**
++     * Copies the given textures.
++     *
++     * @param textures the textures to copy, or <code>null</code> to clear the
++     * textures
++     */
++    void setTextures(@Nullable PlayerTextures textures);
++
++    /**
++     * @return A Mutable set of this players properties, such as textures.
++     * Values specified here are subject to implementation details.
++     */
++    @NotNull Set<ProfileProperty> getProperties();
++
++    /**
++     * Check if the Profile has the specified property
++     * @param property Property name to check
++     * @return If the property is set
++     */
++    boolean hasProperty(@Nullable String property);
++
++    /**
++     * Sets a property. If the property already exists, the previous one will be replaced
++     * @param property Property to set.
++     */
++    void setProperty(@NotNull ProfileProperty property);
++
++    /**
++     * Sets multiple properties. If any of the set properties already exist, it will be replaced
++     * @param properties The properties to set
++     */
++    void setProperties(@NotNull Collection<ProfileProperty> properties);
++
++    /**
++     * Removes a specific property from this profile
++     * @param property The property to remove
++     * @return If a property was removed
++     */
++    boolean removeProperty(@Nullable String property);
++
++    /**
++     * Removes a specific property from this profile
++     * @param property The property to remove
++     * @return If a property was removed
++     */
++    default boolean removeProperty(@NotNull ProfileProperty property) {
++        return removeProperty(property.getName());
++    }
++
++    /**
++     * Removes all properties in the collection
++     * @param properties The properties to remove
++     * @return If any property was removed
++     */
++    default boolean removeProperties(@NotNull Collection<ProfileProperty> properties) {
++        boolean removed = false;
++        for (ProfileProperty property : properties) {
++            if (removeProperty(property)) {
++                removed = true;
++            }
++        }
++        return removed;
++    }
++
++    /**
++     * Clears all properties on this profile
++     */
++    void clearProperties();
++
++    /**
++     * @return If the profile is now complete (has UUID and Name)
++     */
++    boolean isComplete();
++
++    /**
++     * Like {@link #complete(boolean)} but will try only from cache, and not make network calls
++     * Does not account for textures.
++     *
++     * @return If the profile is now complete (has UUID and Name)
++     */
++    boolean completeFromCache();
++
++    /**
++     * Like {@link #complete(boolean)} but will try only from cache, and not make network calls
++     * Does not account for textures.
++     *
++     * @param onlineMode Treat this as online mode or not
++     * @return If the profile is now complete (has UUID and Name)
++     */
++    boolean completeFromCache(boolean onlineMode);
++
++    /**
++     * Like {@link #complete(boolean)} but will try only from cache, and not make network calls
++     * Does not account for textures.
++     *
++     * @param lookupUUID If only name is supplied, should we do a UUID lookup
++     * @param onlineMode Treat this as online mode or not
++     * @return If the profile is now complete (has UUID and Name)
++     */
++    boolean completeFromCache(boolean lookupUUID, boolean onlineMode);
++
++    /**
++     * If this profile is not complete, then make the API call to complete it.
++     * This is a blocking operation and should be done asynchronously.
++     *
++     * This will also complete textures. If you do not want to load textures, use {{@link #complete(boolean)}}
++     * @return If the profile is now complete (has UUID and Name) (if you get rate limited, this operation may fail)
++     */
++    default boolean complete() {
++        return complete(true);
++    }
++
++    /**
++     * If this profile is not complete, then make the API call to complete it.
++     * This is a blocking operation and should be done asynchronously.
++     *
++     * Optionally will also fill textures.
++     *
++     * Online mode will be automatically determined
++     * @param textures controls if we should fill the profile with texture properties
++     * @return If the profile is now complete (has UUID and Name) (if you get rate limited, this operation may fail)
++     */
++    boolean complete(boolean textures);
++
++    /**
++     * If this profile is not complete, then make the API call to complete it.
++     * This is a blocking operation and should be done asynchronously.
++     *
++     * Optionally will also fill textures.
++     * @param textures controls if we should fill the profile with texture properties
++     * @param onlineMode Treat this server as online mode or not
++     * @return If the profile is now complete (has UUID and Name) (if you get rate limited, this operation may fail)
++     */
++    boolean complete(boolean textures, boolean onlineMode);
++
++    /**
++     * Produces an updated player profile based on this profile.
++     * <p>
++     * This tries to produce a completed profile by filling in missing
++     * properties (name, unique id, textures, etc.), and updates existing
++     * properties (e.g. name, textures, etc.) to their official and up-to-date
++     * values. This operation does not alter the current profile, but produces a
++     * new updated {@link PlayerProfile}.
++     * <p>
++     * If no player exists for the unique id or name of this profile, this
++     * operation yields a profile that is equal to the current profile, which
++     * might not be complete.
++     * <p>
++     * This is an asynchronous operation: Updating the profile can result in an
++     * outgoing connection in another thread in order to fetch the latest
++     * profile properties. The returned {@link CompletableFuture} will be
++     * completed once the updated profile is available. In order to not block
++     * the server's main thread, you should not wait for the result of the
++     * returned CompletableFuture on the server's main thread. Instead, if you
++     * want to do something with the updated player profile on the server's main
++     * thread once it is available, you could do something like this:
++     * <pre>
++     * profile.update().thenAcceptAsync(updatedProfile -> {
++     *     // Do something with the updated profile:
++     *     // ...
++     * }, runnable -> Bukkit.getScheduler().runTask(plugin, runnable));
++     * </pre>
++     */
++    @Override
++    @NotNull CompletableFuture<PlayerProfile> update();
++
++    /**
++     * Whether this Profile has textures associated to it
++     * @return If it has a textures property
++     */
++    default boolean hasTextures() {
++        return hasProperty("textures");
++    }
++}
+diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6b0e0faee
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
+@@ -0,0 +1,72 @@
++package com.destroystokyo.paper.profile;
++
++import com.google.common.base.Preconditions;
++
++import java.util.Objects;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
++
++/**
++ * Represents a property on a {@link PlayerProfile}
++ */
++public class ProfileProperty {
++    private final String name;
++    private final String value;
++    private final String signature;
++
++    public ProfileProperty(@NotNull String name, @NotNull String value) {
++        this(name, value, null);
++    }
++
++    public ProfileProperty(@NotNull String name, @NotNull String value, @Nullable String signature) {
++        this.name = Preconditions.checkNotNull(name, "ProfileProperty name can not be null");
++        this.value = Preconditions.checkNotNull(value, "ProfileProperty value can not be null");
++        this.signature = signature;
++    }
++
++    /**
++     * @return The property name, ie "textures"
++     */
++    @NotNull
++    public String getName() {
++        return name;
++    }
++
++    /**
++     * @return The property value, likely to be base64 encoded
++     */
++    @NotNull
++    public String getValue() {
++        return value;
++    }
++
++    /**
++     * @return A signature from Mojang for signed properties
++     */
++    @Nullable
++    public String getSignature() {
++        return signature;
++    }
++
++    /**
++     * @return If this property has a signature or not
++     */
++    public boolean isSigned() {
++        return this.signature != null;
++    }
++
++    @Override
++    public boolean equals(Object o) {
++        if (this == o) return true;
++        if (o == null || getClass() != o.getClass()) return false;
++        ProfileProperty that = (ProfileProperty) o;
++        return Objects.equals(name, that.name) &&
++                Objects.equals(value, that.value) &&
++                Objects.equals(signature, that.signature);
++    }
++
++    @Override
++    public int hashCode() {
++        return Objects.hash(name);
++    }
++}
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index 2ff65157d511108e2902838f37732742b186af6e..d5fd584c109c0a84a4259b10e7b43fae3a1da1ae 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -2153,6 +2153,83 @@ public final class Bukkit {
+     public static boolean suggestPlayerNamesWhenNullTabCompletions() {
+         return server.suggestPlayerNamesWhenNullTabCompletions();
+     }
++
++    /**
++     * Creates a PlayerProfile for the specified uuid, with name as null.
++     *
++     * If a player with the passed uuid exists on the server at the time of creation, the returned player profile will
++     * be populated with the properties of said player (including their uuid and name).
++     *
++     * @param uuid UUID to create profile for
++     * @return A PlayerProfile object
++     */
++    @NotNull
++    public static com.destroystokyo.paper.profile.PlayerProfile createProfile(@NotNull UUID uuid) {
++        return server.createProfile(uuid);
++    }
++
++    /**
++     * Creates a PlayerProfile for the specified name, with UUID as null.
++     *
++     * If a player with the passed name exists on the server at the time of creation, the returned player profile will
++     * be populated with the properties of said player (including their uuid and name).
++     * <p>
++     * E.g. if the player 'jeb_' is currently playing on the server, calling {@code createProfile("JEB_")} will
++     * yield a profile with the name 'jeb_', their uuid and their textures.
++     * To bypass this pre-population on a case-insensitive name match, see {@link #createProfileExact(UUID, String)}.
++     * <p>
++     *
++     * @param name Name to create profile for
++     * @return A PlayerProfile object
++     */
++    @NotNull
++    public static com.destroystokyo.paper.profile.PlayerProfile createProfile(@NotNull String name) {
++        return server.createProfile(name);
++    }
++
++    /**
++     * Creates a PlayerProfile for the specified name/uuid
++     *
++     * Both UUID and Name can not be null at same time. One must be supplied.
++     * If a player with the passed uuid or name exists on the server at the time of creation, the returned player
++     * profile will be populated with the properties of said player (including their uuid and name).
++     * <p>
++     * E.g. if the player 'jeb_' is currently playing on the server, calling {@code createProfile(null, "JEB_")} will
++     * yield a profile with the name 'jeb_', their uuid and their textures.
++     * To bypass this pre-population on an case-insensitive name match, see {@link #createProfileExact(UUID, String)}.
++     * <p>
++     *
++     * The name comparison will compare the {@link String#toLowerCase()} version of both the passed name parameter and
++     * a players name to honour the case-insensitive nature of a mojang profile lookup.
++     *
++     * @param uuid UUID to create profile for
++     * @param name Name to create profile for
++     * @return A PlayerProfile object
++     */
++    @NotNull
++    public static com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name) {
++        return server.createProfile(uuid, name);
++    }
++
++    /**
++     * Creates an exact PlayerProfile for the specified name/uuid
++     *
++     * Both UUID and Name can not be null at same time. One must be supplied.
++     * If a player with the passed uuid or name exists on the server at the time of creation, the returned player
++     * profile will be populated with the properties of said player.
++     * <p>
++     * Compared to {@link #createProfile(UUID, String)}, this method will never mutate the passed uuid or name.
++     * If a player with either the same uuid or a matching name (case-insensitive) is found on the server, their
++     * properties, such as textures, will be pre-populated in the profile, however the passed uuid and name stay intact.
++     *
++     * @param uuid UUID to create profile for
++     * @param name Name to create profile for
++     * @return A PlayerProfile object
++     */
++    @NotNull
++    public static com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name) {
++        return server.createProfileExact(uuid, name);
++    }
+     // Paper end
+ 
+     @NotNull
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index d9566b18e6109db824cbc1732666771bf124adbf..fab39e4fc595c022da27e87e27bd168939e54381 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -1886,5 +1886,74 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+      * @return true if player names should be suggested
+      */
+     boolean suggestPlayerNamesWhenNullTabCompletions();
++
++    /**
++     * Creates a PlayerProfile for the specified uuid, with name as null.
++     *
++     * If a player with the passed uuid exists on the server at the time of creation, the returned player profile will
++     * be populated with the properties of said player (including their uuid and name).
++     *
++     * @param uuid UUID to create profile for
++     * @return A PlayerProfile object
++     */
++    @NotNull
++    com.destroystokyo.paper.profile.PlayerProfile createProfile(@NotNull UUID uuid);
++
++    /**
++     * Creates a PlayerProfile for the specified name, with UUID as null.
++     *
++     * If a player with the passed name exists on the server at the time of creation, the returned player profile will
++     * be populated with the properties of said player (including their uuid and name).
++     * <p>
++     * E.g. if the player 'jeb_' is currently playing on the server, calling {@code createProfile("JEB_")} will
++     * yield a profile with the name 'jeb_', their uuid and their textures.
++     * To bypass this pre-population on a case-insensitive name match, see {@link #createProfileExact(UUID, String)}.
++     * <p>
++     *
++     * @param name Name to create profile for
++     * @return A PlayerProfile object
++     */
++    @NotNull
++    com.destroystokyo.paper.profile.PlayerProfile createProfile(@NotNull String name);
++
++    /**
++     * Creates a PlayerProfile for the specified name/uuid
++     *
++     * Both UUID and Name can not be null at same time. One must be supplied.
++     * If a player with the passed uuid or name exists on the server at the time of creation, the returned player
++     * profile will be populated with the properties of said player (including their uuid and name).
++     * <p>
++     * E.g. if the player 'jeb_' is currently playing on the server, calling {@code createProfile(null, "JEB_")} will
++     * yield a profile with the name 'jeb_', their uuid and their textures.
++     * To bypass this pre-population on an case-insensitive name match, see {@link #createProfileExact(UUID, String)}.
++     * <p>
++     *
++     * The name comparison will compare the {@link String#toLowerCase()} version of both the passed name parameter and
++     * a players name to honour the case-insensitive nature of a mojang profile lookup.
++     *
++     * @param uuid UUID to create profile for
++     * @param name Name to create profile for
++     * @return A PlayerProfile object
++     */
++    @NotNull
++    com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name);
++
++    /**
++     * Creates an exact PlayerProfile for the specified name/uuid
++     *
++     * Both UUID and Name can not be null at same time. One must be supplied.
++     * If a player with the passed uuid or name exists on the server at the time of creation, the returned player
++     * profile will be populated with the properties of said player.
++     * <p>
++     * Compared to {@link #createProfile(UUID, String)}, this method will never mutate the passed uuid or name.
++     * If a player with either the same uuid or a matching name (case-insensitive) is found on the server, their
++     * properties, such as textures, will be pre-populated in the profile, however the passed uuid and name stay intact.
++     *
++     * @param uuid UUID to create profile for
++     * @param name Name to create profile for
++     * @return A PlayerProfile object
++     */
++    @NotNull
++    com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name);
+     // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/profile/PlayerProfile.java b/src/main/java/org/bukkit/profile/PlayerProfile.java
+index 16ae1282f3178e8873483a25a5d5cce16b2c21a9..fc46add38bf59dc1a04ea566fd230dcd8ae2708c 100644
+--- a/src/main/java/org/bukkit/profile/PlayerProfile.java
++++ b/src/main/java/org/bukkit/profile/PlayerProfile.java
+@@ -93,7 +93,7 @@ public interface PlayerProfile extends Cloneable, ConfigurationSerializable {
+      * PlayerProfile once it is available
+      */
+     @NotNull
+-    CompletableFuture<PlayerProfile> update();
++    CompletableFuture<? extends PlayerProfile> update(); // Paper
+ 
+     @NotNull
+     PlayerProfile clone();