Updated Upstream (Bukkit/CraftBukkit) (#8240 )

Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: caa7c486 SPIGOT-7109: Add WorldBorder#setSize using TimeUnit CraftBukkit Changes: 1e3bf58cd SPIGOT-7109: Add WorldBorder#setSize using TimeUnit
Remove RAW_COPPER and add COPPER_BLOCK in MaterialTags.UNWAXED_COPPER_BLOCKS and MaterialTags.COPPER_BLOCKS (#8237 )
2022-08-05 16:10:44 +02:00 · 2022-08-05 11:57:21 +02:00 · 2022-08-03 23:14:04 +02:00 · 2022-08-03 22:51:37 +02:00 · 2022-08-03 22:47:15 +02:00 · 2022-08-03 22:46:33 +02:00
2469 changed files with 182006 additions and 115514 deletions
@@ -1,6 +1,18 @@
-[*.java]
+[*]
 charset=utf-8
 end_of_line=lf
 insert_final_newline=true
 indent_style=space
 indent_size=4
+
+[*.tiny]
+indent_style=tab
+
+[*.bat]
+end_of_line=crlf
+
+[*.yml]
+indent_size=2
+
+[*.patch]
+trim_trailing_whitespace=false
@@ -0,0 +1,7 @@
+* text=auto
+
+*.sh text eol=lf
+gradlew text eol=lf
+*.bat text eol=crlf
+
+*.jar binary
@@ -1,2 +1,2 @@
-* @PaperMC/core-team @PaperMC/maintainers
+* @PaperMC/paper-maintainers
 /.github/CODEOWNERS @PaperMC/core-team
@@ -1,36 +1,37 @@
 name: Behavior Bug or Plugin Incompatibility
 description: Report issues with plugin incompatbility or other behavior related issues.
+labels: [ "status: needs triage", "type: bug" ]
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Before reporting a crash here, please make sure you are on the latest version of Paper.
-        Forks of Paper receive no support here. If you are using a fork, please make sure that this issue also happens when using Paper.
-
  - type: textarea
    attributes:
      label: Expected behavior
      description: What you expected to see.
    validations:
      required: true
+
  - type: textarea
    attributes:
      label: Observed/Actual behavior
      description: What you actually saw.
    validations:
      required: true
+
  - type: textarea
    attributes:
      label: Steps/models to reproduce
      description: This may include a build schematic, a video, or detailed instructions to help reconstruct the issue.
    validations:
      required: true
+
  - type: textarea
    attributes:
-      label: Plugin list
-      description: All plugins running on the server.
+      label: Plugin and Datapack List
+      description: |
+        All plugins and datapacks running on your server.
+        To list plugins, run `/plugins`. For datapacks, run `/datapack list`.
    validations:
      required: true
+
  - type: textarea
    attributes:
      label: Paper version
@@ -51,19 +52,7 @@ body:

        </details>
    validations:
-      required: false
-
-  - type: checkboxes
-    attributes:
-      label: Agreements
-      description: Please agree to the following.
-      options:
-        - label: I am running the latest version of Paper available from https://papermc.io/downloads.
-          required: true
-        - label: I have searched for and ensured there isn't already an open issue regarding this.
-          required: true
-        - label: My version of Minecraft is supported by Paper.
-          required: true
+      required: true

  - type: textarea
    attributes:
@@ -74,3 +63,15 @@ body:
    validations:
      required: false

+  - type: markdown
+    attributes:
+      value: |
+        Before submitting this issue, please ensure the following:
+
+        1. You are running the latest version of Paper from [our downloads page](https://papermc.io/downloads).
+        2. You searched for and ensured there isn't already an open issue regarding this.
+        3. Your version of Minecraft is supported by Paper.
+
+        If you think you have a bug but are not sure, feel free to ask the `#paper-help` channel of our
+        [Discord](https://discord.gg/papermc).
+
@@ -3,3 +3,8 @@ contact_links:
  - name: PaperMC Discord
    url: https://discord.gg/papermc
    about: If you are having issues with timings or have other minor issues, come ask us on our Discord server!
+  - name: Exploit Report
+    url: https://discord.gg/papermc
+    about: |
+      Due to GitHub not currently allowing private issues, exploit reports are currently handled via our Discord.
+      To report an exploit, see the #paper-exploit-report channel.
@@ -1,5 +1,6 @@
 name: Feature Request
 description: Suggest an idea for Paper
+labels: [ "status: needs triage", "type: feature" ]
 body:
  - type: markdown
    attributes:
@@ -14,12 +15,14 @@ body:
      description: Please give some context for this request. Why do you want it added?
    validations:
      required: true
+
  - type: textarea
    attributes:
      label: Describe the solution you'd like.
      description: A clear and concise description of what you want.
    validations:
      required: true
+
  - type: textarea
    attributes:
      label: Describe alternatives you've considered.
@@ -27,19 +30,15 @@ body:
    validations:
      required: true

-  - type: checkboxes
-    attributes:
-      label: Agreements
-      description: Please agree to the following.
-      options:
-        - label: I have searched for and ensured there isn't already an open issue regarding this.
-          required: true
-        - label: I have ensured the feature I'm requesting isn't already in the latest supported Paper build.
-          required: true
-
  - type: textarea
    attributes:
      label: Other
      description: Add any other context or screenshots about the feature request below.
    validations:
      required: false
+
+  - type: markdown
+    attributes:
+      value: |
+        Before submitting this feature request, please search our issue tracker to ensure your feature has not
+        already been requested.
@@ -1,11 +1,13 @@
 name: Performance Problem
 description: Report performance related problems or other areas of concern
+labels: [ "status: needs triage", "type: performance" ]
 body:
  - type: markdown
    attributes:
      value: |
-        Before reporting performance problems here, please make sure you are on the latest version of Paper.
-        Forks of Paper receive no support here. If you are using a fork, please make sure that this problem also affects Paper.
+        Before creating an issue regarding server performance, please consider reaching out for support in the
+        `#paper-help` channel of [our Discord](https://discord.gg/papermc)!
+
  - type: input
    attributes:
      label: Timings or Profile link
@@ -13,22 +15,27 @@ body:
      placeholder: "Example: https://timings.aikar.co/?id=6b48586fbbdd48e585ca0ebb07c59dd0"
    validations:
      required: true
+
  - type: textarea
    attributes:
      label: Description of issue
      description: If applicable, please describe your issue.
    validations:
      required: false
+
  - type: textarea
    attributes:
-      label: Plugin list
-      description: All plugins running on the server.
+      label: Plugin and Datapack List
+      description: |
+        All plugins and datapacks running on your server.
+        To list plugins, run `/plugins`. For datapacks, run `/datapack list`.
    validations:
      required: true
+
  - type: textarea
    attributes:
      label: Server config files
-      description: We need bukkit.yml, spigot.yml, paper.yml, and server.properties. You can paste it below or use a paste site like https://paste.gg.
+      description: We need bukkit.yml, spigot.yml, paper-global.yml, paper-world-defaults.yml and server.properties. If you use per-world Paper configs, make sure to include them. You can paste it below or use a paste site like https://paste.gg.
      value: |
        ```
        Paste configs or paste.gg link here!
@@ -36,6 +43,7 @@ body:
      placeholder: Please don't remove the backticks; it makes your issue a lot harder to read!
    validations:
      required: true
+
  - type: textarea
    attributes:
      label: Paper version
@@ -56,19 +64,7 @@ body:

        </details>
    validations:
-      required: false
-
-  - type: checkboxes
-    attributes:
-      label: Agreements
-      description: Please agree to the following.
-      options:
-        - label: I am running the latest version of Paper available from https://papermc.io/downloads.
-          required: true
-        - label: I have searched for and ensured there isn't already an open issue regarding this.
-          required: true
-        - label: My version of Minecraft is supported by Paper.
-          required: true
+      required: true

  - type: textarea
    attributes:
@@ -78,3 +74,11 @@ body:
        The more information we receive, the quicker and more effective we can be at finding the solution to the issue.
    validations:
      required: false
+  - type: markdown
+    attributes:
+      value: |
+        Before submitting this issue, please ensure the following:
+
+        1. You are running the latest version of Paper from [our downloads page](https://papermc.io/downloads).
+        2. You searched for and ensured there isn't already an open issue regarding this.
+        3. Your version of Minecraft is supported by Paper.
@@ -1,13 +1,7 @@
 name: Server crash or Stacktrace
 description: Report server crashes or scary stacktraces
+labels: [ "status: needs triage" ]
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Before reporting a crash here, please make sure you are on the latest version of Paper.
-        Forks of Paper receive no support here. If you are using a fork, please make sure that this crash also happens when using Paper.
-        Please do not make reports when the report says "DO NOT REPORT THIS TO PAPER". These are simply messages informing you of lag, to find what is causing it. Ask for tips on Discord or IRC instead.
-
  - type: textarea
    attributes:
      label: Stack trace
@@ -21,18 +15,23 @@ body:
      placeholder: Please don't remove the backticks; it makes your issue a lot harder to read!
    validations:
      required: true
+
  - type: textarea
    attributes:
-      label: Plugin list
-      description: All plugins running on the server.
+      label: Plugin and Datapack List
+      description: |
+        All plugins and datapacks running on your server.
+        To list plugins, run `/plugins`. For datapacks, run `/datapack list`.
    validations:
      required: true
+
  - type: textarea
    attributes:
      label: Actions to reproduce (if known)
      description: This may include a build schematic, a video, or detailed instructions to help reconstruct the issue. Anything helps!
    validations:
      required: false
+
  - type: textarea
    attributes:
      label: Paper version
@@ -53,19 +52,7 @@ body:

        </details>
    validations:
-      required: false
-
-  - type: checkboxes
-    attributes:
-      label: Agreements
-      description: Please agree to the following.
-      options:
-        - label: I am running the latest version of Paper available from https://papermc.io/downloads.
-          required: true
-        - label: I have searched for and ensured there isn't already an open issue regarding this.
-          required: true
-        - label: My version of Minecraft is supported by Paper.
-          required: true
+      required: true

  - type: textarea
    attributes:
@@ -75,3 +62,15 @@ body:
        The more information we receive, the quicker and more effective we can be at finding the solution to the issue.
    validations:
      required: false
+
+  - type: markdown
+    attributes:
+      value: |
+        Before submitting this issue, please ensure the following:
+
+        1. You are running the latest version of Paper from [our downloads page](https://papermc.io/downloads).
+        2. Your version of Minecraft is supported by Paper.
+
+        If your server crash log contains `DO NOT REPORT THIS TO PAPER`, please ask in our
+        [Discord](https://discord.gg/papermc) before opening this issue. These messages are informing you of server
+        lag and providing debug information.
@@ -1,18 +0,0 @@
-daysUntilStale: 60
-daysUntilClose: 7
-exemptLabels:
-  - "for: future"
-  - "type: bug"
-  - "status: accepted"
-  - "status: blocked"
-  - "status: in progress"
-  - "status: rebase required"
-staleLabel: "resolution: stale"
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-closeComment: >
-  This issue has been automatically closed because it has not had activity in
-  a long time. If the issue still applies to the most recent supported
-  version, please open a new issue referencing this original issue.
@@ -10,30 +10,24 @@ on: [push, pull_request]

 jobs:
    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: [16, 8]
+                java: [17]
            fail-fast: true
        steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v2.4.0
            - name: JDK ${{ matrix.java }}
-              uses: actions/setup-java@v2
+              uses: actions/setup-java@v3.1.0
              with:
                  java-version: ${{ matrix.java }}
-                  distribution: 'adopt'
-            - name: Cache maven
-              uses: actions/cache@v2
-              with:
-                  path: |
-                      ~/.m2/repository/
-                      work/Minecraft
-                  key: ${{ runner.os }}-paper-2-${{ hashFiles('**/pom.xml') }}
-                  restore-keys: ${{ runner.os }}-paper-2
+                  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"
-                  ./paper build
-            - name: Build javadocs
-              run: mvn -pl Paper-API,Paper-MojangAPI -am javadoc:javadoc
+                  ./gradlew applyPatches --stacktrace
+                  ./gradlew build --stacktrace
@@ -1,3 +1,6 @@
+.gradle/
+build/
+
 # Eclipse stuff
 .classpath
 .project
@@ -21,7 +24,6 @@ dependency-reduced-pom.xml
 .*.sw[a-p]

 # various other potential build files
-build/
 bin/
 dist/
 manifest.mf
@@ -63,3 +65,7 @@ Paperclip.jar
 paperclip.jar
 paperclip-*.jar
 paperclip.properties
+
+!gradle/wrapper/gradle-wrapper.jar
+
+test-plugin.settings.gradle.kts
@@ -10,6 +10,3 @@
 [submodule "work/Spigot"]
 	path = work/Spigot
 	url = https://hub.spigotmc.org/stash/scm/spigot/spigot.git
-[submodule "work/Paperclip"]
-	path = work/Paperclip
-	url = https://github.com/PaperMC/Paperclip.git
@@ -4,39 +4,6 @@ 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.

-**Table of contents:**
-<!-- Please don't remove the following comments.
-To generate and update the TOC: https://github.com/mzlogin/vim-markdown-toc -->
-<!-- vim-markdown-toc GFM -->
-
-* [Use a Personal Fork and not Organization](#use-a-personal-fork-and-not-organization)
-* [Requirements](#requirements)
-* [Understanding Patches](#understanding-patches)
-* [Adding Patches](#adding-patches)
-* [Modifying Patches](#modifying-patches)
-  * [Method 1](#method-1)
-    * [Using the Paper tool](#using-the-paper-tool)
-    * [Manual method: Stashing](#manual-method-stashing)
-  * [Method 2 - Fixup commits](#method-2---fixup-commits)
-    * [Manual method](#manual-method)
-    * [Automatic method](#automatic-method)
-* [PR Policy](#pr-policy)
-* [Rebasing PRs](#rebasing-prs)
-* [Formatting](#formatting)
-* [Patch Notes](#patch-notes)
-* [Obfuscation Helpers](#obfuscation-helpers)
-* [Configuration files](#configuration-files)
-  * [PaperConfig example](#paperconfig-example)
-  * [PaperWorldConfig example](#paperworldconfig-example)
-* [Frequently Asked Questions](#frequently-asked-questions)
-  * [I can't find the NMS file I need!](#i-cant-find-the-nms-file-i-need)
-  * [Where can I learn how to name method/field?](#where-can-i-learn-how-to-name-methodfield)
-  * [My commit doesn't need a build, what do I do?](#my-commit-doesnt-need-a-build-what-do-i-do)
-  * [Patching and building is *really* slow, what can I do?](#patching-and-building-is-really-slow-what-can-i-do)
-  * [I wrote some API, how do I use it in Paper-Server?](#i-wrote-some-api-how-do-i-use-it-in-paper-server)
-
-<!-- vim-markdown-toc -->
-
 ## Use a Personal Fork and not Organization

 Paper will routinely modify your PR, whether it's a quick rebase or to take care
@@ -60,25 +27,26 @@ which can be obtained in (most) package managers such as `apt` (Debian / Ubuntu;
 you will most likely use this for WSL), `homebrew` (macOS / Linux), and more:

 - `git` (package `git` everywhere);
- `patch` (often package `patch`);
- A Java 8 or later JDK (packages vary, use Google/DuckDuckGo/etc.).  
-If you need one, you can find them on [AdoptOpenJDK](https://adoptopenjdk.net/).
- `maven` (often package `maven`; can be found on
-[Apache's site](https://maven.apache.org/download.cgi) too);
- `curl` (package `curl` 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
+    [Toolchains](https://docs.gradle.org/current/userguide/toolchains.html)
+    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).

 If you're on Windows, check
 [the section on WSL](#patching-and-building-is-really-slow-what-can-i-do).

-If you're compiling with Docker, you can use the
-[`adoptopenjdk`](https://hub.docker.com/_/adoptopenjdk/) images like so:
+If you're compiling with Docker, you can use Adoptium's
+[`eclipse-temurin`](https://hub.docker.com/_/eclipse-temurin/) images like so:

 ```console
-# docker run -it -v "$(pwd)":/data --rm adoptopenjdk:8-jdk-hotspot bash
+# docker run -it -v "$(pwd)":/data --rm eclipse-temurin:17.0.1_12-jdk bash
 Pulling image...

 root@abcdefg1234:/# javac -version
-javac 1.8.0_252
+javac 17.0.1
 ```

 ## Understanding Patches
@@ -88,8 +56,7 @@ split into different directories which target certain parts of the code. These
 directories are:

 - `Paper-API` - Modifications to `Spigot-API`/`Bukkit`;
- `Paper-MojangAPI` - An API for
-[Mojang's Brigadier](https://github.com/Mojang/brigadier);
+- `Paper-MojangAPI` - An API for [Mojang's Brigadier](https://github.com/Mojang/brigadier);
 - `Paper-Server` - Modifications to `Spigot`/`CraftBukkit`.

 Because the entire structure is based on patches and git, a basic understanding
@@ -99,24 +66,18 @@ of how to use git is required. A basic tutorial can be found here:
 Assuming you have already forked the repository:

 1. Clone your fork to your local machine;
-1. Type `./paper patch` in a terminal to apply the changes from upstream;
-1. cd into `Paper-Server` for server changes, and `Paper-API` for API changes.  
-You can also run `./paper server` or `./paper api` for these same directories
+2. Type `./gradlew applyPatches` in a terminal to apply the changes from upstream.
+On Windows, leave out the `./` at the beginning for all `gradlew` commands;
+3. cd into `Paper-Server` for server changes, and `Paper-API` for API changes.  
+<!--You can also run `./paper server` or `./paper api` for these same directories
 respectively.
 1. You can also run `./paper setup`, which allows you to type `paper <command>`
-from anywhere in the Paper structure in most cases.
+from anywhere in the Paper structure in most cases.-->

 `Paper-Server` and `Paper-API` aren't git repositories in the traditional sense:

- Every single commit in `Paper-Server`/`Paper-API` is a patch;
- `origin/master` points to a directory similar to `Paper-Server`/`Paper-API`
-but for Paper;
- Typing `git status` should show that we are 10 or 11 commits ahead of master,
-meaning we have 10 or 11 patches Spigot and CraftBukkit don't.
-   - If it says something like `212 commits ahead, 207 commits behind`,
-   cd into the root directory of the cloned repository and type `git fetch` to
-   update your upstream. Setting up a remote for the upstream Paper repository
-   might be necessary.
+- `base` points to the unmodified source before Paper patches have been applied.
+- Each commit after `base` is a patch.

 ## Adding Patches

@@ -125,7 +86,7 @@ Adding patches to Paper is very simple:
 1. Modify `Paper-Server` and/or `Paper-API` with the appropriate changes;
 1. Type `git add .` inside these directories to add your changes;
 1. Run `git commit` with the desired patch message;
-1. Run `./paper rebuild` in the main directory to convert your commit into a new
+1. Run `./gradlew rebuildPatches` in the main directory to convert your commit into a new
 patch;
 1. PR the generated patch file(s) back to this repository.

@@ -146,38 +107,13 @@ edit it using `git rebase`.
 > ❗ While in the middle of an edit, you will not be able to compile unless you
 > *also* reset the opposing module(s) to a related commit. In the API's case,
 > you must reset the Server, and reset the API if you're editing the Server.
-
-#### Using the Paper tool
-
-The PaperMC build tool provides a handy command to automatically do this type of
-patch modification.
-
-1. Type `./paper edit server` or `./paper edit api` depending on which project
-you want to edit;
-   - It should show something like
-   [this](https://gist.github.com/zachbr/21e92993cb99f62ffd7905d7b02f3159) in
-   the text editor you get.
-   - If your editor does not have a "menu" at the bottom, you're using `vim`.  
-   If you don't know how to use `vim` and don't want to
-   learn, enter `:q!` and press enter. Before redoing this step, do
-   `export EDITOR=nano` for an easier editor to use.
-1. Replace `pick` with `edit` for the commit/patch you want to modify, and
-"save" the changes;
-   - Only do this for **one** commit at a time.
-1. Make the changes you want to make to the patch;
-1. Type `./paper edit continue` in the root directory to finish and rebuild
-patches;
-1. PR your modified patch file(s) back to this repository.
-
-#### Manual method: Stashing
-
-In case you need something more complex or want more control, these step-by-step
-instruction do exactly what the above slightly automated system above does.
+> Note also that either module _may_ not compile when doing so. This is not
+> ideal nor intentional, but it happens. Feel free to fix this in a PR to us!

 1. If you have changes you are working on, type `git stash` to store them for
 later;
   - You can type `git stash pop` to get them back at any point.
-1. Type `git rebase -i upstream/upstream`;
+1. Type `git rebase -i base`;
   - It should show something like
   [this](https://gist.github.com/zachbr/21e92993cb99f62ffd7905d7b02f3159) in
   the text editor you get.
@@ -194,7 +130,7 @@ later;
   - **Make sure to add `--amend`** or else a new patch will be created.
   - You can also modify the commit message and author here.
 1. Type `git rebase --continue` to finish rebasing;
-1. Type `./paper rebuild` in the root directory;
+1. Type `./gradlew rebuildPatches` in the root directory;
   - This will modify the appropriate patches based on your commits.
 1. PR your modified patch file(s) back to this repository.

@@ -211,14 +147,14 @@ messing with your HEADs.

 1. Make your change while at HEAD;
 1. Make a temporary commit. You don't need to make a message for this;
-1. Type `git rebase -i upstream/upstream`, move (cut) your temporary commit and
+1. Type `git rebase -i base`, move (cut) your temporary commit and
 move it under the line of the patch you wish to modify;
 1. Change the `pick` to the appropriate action:
   1. `f`/`fixup`: Merge your changes into the patch without touching the
  message.
   1. `s`/`squash`: Merge your changes into the patch and use your commit message
  and subject.
-1. Type `./paper rebuild` in the root directory;
+1. Type `./gradlew rebuildPatches` in the root directory;
   - This will modify the appropriate patches based on your commits.
 1. PR your modified patch file(s) back to this repository.

@@ -232,10 +168,10 @@ move it under the line of the patch you wish to modify;
  assist you too.
   - Alternatively, if you only know the name of the patch, you can do
  `git commit -a --fixup "Subject of Patch name"`.
-1. Rebase with autosquash: `git rebase --autosquash -i upstream/upstream`.
+1. Rebase with autosquash: `git rebase -i --autosquash base`.
 This will automatically move your fixup commit to the right place, and you just
 need to "save" the changes.
-1. Type `./paper rebuild` in the root directory;
+1. Type `./gradlew rebuildPatches` in the root directory;
   - This will modify the appropriate patches based on your commits.
 1. PR your modified patch file(s) back to this repository.

@@ -244,14 +180,15 @@ need to "save" the changes.
 Steps to rebase a PR to include the latest changes from `master`.  
 These steps assume the `origin` remote is your fork of this repository and `upstream` is the official PaperMC repository.

-1. Pull latest changes from upstream's master: `git checkout master && git pull upstream master`.
+1. Pull the latest changes from upstreams master: `git checkout master && git pull upstream master`.
 1. Checkout feature/fix branch and rebase on master: `git checkout patch-branch && git rebase master`.
-1. Apply updated patches: `./paper patch`.
+1. Apply updated patches: `./gradlew applyPatches`.
 1. If there are conflicts, fix them.
 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)
-    * Run `git rebase --interactive upstream/upstream` and move the commits to the end.
-1. Rebuild patches: `./paper rebuild`.
+    * 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`.
+1. Commit modified patches.
 1. Force push changes: `git push --force`.

 ## PR Policy
@@ -352,31 +289,18 @@ index a92bf8967..d0ab87d0f 100644

 ## Obfuscation Helpers

-In an effort to make future updates easier on ourselves, Paper tries to use
-obfuscation helpers whenever possible. The purpose of these helpers is to make
-the code more readable and maintainable. These helpers should be be made as easy
-to inline as possible by the JVM whenever possible.
-
-An obfuscation helper to access an obfuscated item may be as simple as something
-like this:
+While rarely needed, obfuscation helpers are sometimes useful when it comes
+to unmapped local variables, or poorly named method parameters. In an effort
+to make future updates easier on ourselves, Paper tries to use obfuscation
+helpers wherever it makes sense. The purpose of these helpers is to make the
+code more readable and maintainable. These helpers should be made easy to
+inline by the JVM wherever possible.

+An example of an obfuscation helper for a local variable:
 ```java
-public final int getStuckArrows() { return this.bY(); } // Paper - OBFHELPER
-```
-
-Or it may be as complex as forwarding an entire method so that it can be
-overridden later:
-
-```java
-public boolean be() {
-    // Paper start - OBFHELPER
-    return this.pushedByWater();
-}
-
-public boolean pushedByWater() {
-    // Paper end
-    return true;
-}
+double d0 = entity.getX(); final double fromX = d0; // Paper - OBFHELPER
+// ...   
+this.someMethod(fromX); // Paper
 ```

 While they may not always be done in exactly the same way, the general goal is
@@ -385,56 +309,83 @@ what fits best in your situation.

 ## Configuration files

-To use a configurable value in your patch, add a new entry in either the
-`PaperConfig` or `PaperWorldConfig` classes. Use `PaperConfig` if a value
+To use a configurable value in your patch, add a new field in either the
+`GlobalConfiguration` or `WorldConfiguration` classes (inside the 
+`io.papermc.paper.configuration` package). Use `GlobalConfiguration` if a value
 must remain the same throughout all worlds, or the latter if it can change
 between worlds. World-specific configuration options are preferred whenever
 possible.

-### PaperConfig example
-
+### Example
+This is adding a new miscellaneous setting that doesn't seem to fit in other categories.
+Try to check and see if an existing category (inner class) exists that matches
+whatever configuration option you are adding.
 ```java
-public static boolean saveEmptyScoreboardTeams = false;
-private static void saveEmptyScoreboardTeams() {
-    // This is called automatically!
-    // The name also doesn't matter.
-    saveEmptyScoreboardTeams = getBoolean("settings.save-empty-scoreboard-teams", false);
+public class GlobalConfiguration {
+    // other sections
+    public class Misc extends ConfigurationPart {
+        // other settings
+        public boolean lagCompensateBlockBreaking = true;
+        public boolean useDimensionTypeForCustomSpawners = false;
+        public int maxNumOfPlayers = 20; // This is the new setting
+    }
 }
 ```
+You set the type of the setting as the field type, and the default value is the
+initial field value. The name of the setting defaults to the snake-case of the
+field name, so in this case it would be `misc.max-num-of-players`. You can use
+the `@Setting` annotation to override that, but generally just try to set the 
+field name to what you want the setting to be called.

-Notice that the field is always public, but the setter is always private. This
-is important to the way the configuration generation system works. To access
-this value, reference it as you would any other static value:
-
+#### Accessing the value
+If you added a new global config value, you can access it in the code just by
+doing
 ```java
-if (!PaperConfig.saveEmptyScoreboardTeams) {
+int maxPlayers = GlobalConfiguration.get().misc.maxNumOfPlayers;
+```
+Generally for global config values you will use the fully qualified class name,
+`io.papermc.paper.configuration.GlobalConfiguration` since it's not imported in
+most places.
+---
+If you are adding a new world config value, you must have access to an instance
+of the `net.minecraft.world.level.Level` which you can then access the config by doing
+```java
+int maxPlayers = level.paperConfig().misc.maxNumOfPlayers;
 ```

-It is often preferred that you use the fully qualified name for the
-configuration class when accessing it, like so:
-`com.destroystokyo.paper.PaperConfig.valueHere`.  
-If this is not done, a developer for Paper might fix that for you before
-merging, but it's always nice if you make it a habit where you only need 1-2
-lines changed.
+#### Committing changes
+All changes to the `GlobalConfiguration` and `WorldConfiguration` files
+should be done in the commit that created them. So do an interactive rebase
+or fixup to apply just those changes to that commit, then add a new commit
+that includes the logic that uses that option in the server somewhere.

-### PaperWorldConfig example
+## Testing API changes

-```java
-public boolean useInhabitedTime = true;
-private void useInhabitedTime() {
-    // This is called automatically!
-    // The name also doesn't matter.
-    useInhabitedTime = getBoolean("use-chunk-inhabited-timer", true);
-}
-```
+### Using the Paper Test Plugin

-Again, notice that the field is always public, but the setter is always private.
-To access this value, you'll need an instance of the `net.minecraft.World`
-object:
+The Paper project has a `test-plugin` module for easily testing out API changes
+and additions. To use the test plugin, enable it in `test-plugin.settings.gradle.kts`,
+which will be generated after running Gradle at least once. After this, you can edit
+the test plugin, and run a server with the plugin using `./gradlew runDev` (or any
+of the other Paper run tasks).

-```java
-return this.world.paperConfig.useInhabitedTime ? this.w : 0;
-```
+### Publishing to Maven local (use in external plugins)
+
+To build and install the Paper APIs and Server to your local Maven repository, do the following:
+
+- Run `./gradlew publishToMavenLocal` in the base directory.
+
+If you use Gradle to build your plugin:
+- Add `mavenLocal()` as a repository. Gradle checks repositories in the order they are declared,
+  so if you also have the Paper repository added, put the local repository above Paper's.
+- Make sure to remove `mavenLocal()` when you are done testing, see the [Gradle docs](https://docs.gradle.org/current/userguide/declaring_repositories.html#sec:case-for-maven-local)
+  for more details.
+
+If you use Maven to build your plugin:
+- If you later need to use the Paper-API, you might want to remove the jar
+  from your local Maven repository.  
+  If you use Windows and don't usually build using WSL, you might not need to
+  do this.

 ## Frequently Asked Questions

@@ -449,39 +400,25 @@ patching process.
 progress will be lost if you do not;
 1. Identify the name(s) of the file(s) you want to import.
   - A complete list of all possible file names can be found at
-   `./work/Minecraft/$MCVER/spigot/net/minecraft/server`. You might find
-   [MiniMappingViewer] very useful to find the file you need.
-1. Open the file at `./scripts/importmcdev.sh` and add the name of your file to
-the script. Skip to the 2nd last header and follow the instructions there;
-1. Re-patch the server `./paper patch`;
+   `./Paper-Server/.gradle/caches/paperweight/mc-dev-sources/net/minecraft/`. You might find
+   [MappingViewer] useful if you need to translate between Mojang and Spigot mapped names.
+1. Open the file at `./build-data/dev-imports.txt` and add the name of your file to
+the script. Follow the instructions there;
+1. Re-patch the server `./gradlew applyPatches`;
 1. Edit away!

 > ❗ This change is temporary! **DO NOT COMMIT CHANGES TO THIS FILE!**  
 > Once you have made your changes to the new file, and rebuilt patches, you may
-> undo your changes to `importmcdev.sh`.
+> undo your changes to `dev-imports.txt`.

 Any file modified in a patch file gets automatically imported, so you only need
 this temporarily to import it to create the first patch.

-To undo your changes to the file, type `git checkout scripts/importmcdev.sh`.
-
-### Where can I learn how to name method/field?
-
-For most cases, it is preferred if you use [yarn], as their license works with
-Paper's license. If you can't do that, [MiniMappingViewer] is always around to
-provide you with more of a general idea, *but* you cannot use the Mojang names
-for more than understanding the code.
-
-[yarn] is in general more thorough than Mojang's own mappings, as they include
-method arguments as well, whereas Mojang's do not. If you need local variables
-to understand the code, you might be more lucky with ModCoderPack.
-
-For more information on the Mojang name licensing issues, check this out:
-<https://cpw.github.io/MinecraftMappingData.html>
+To undo your changes to the file, type `git checkout build-data/dev-imports.txt`.

 ### My commit doesn't need a build, what do I do?

-Well, quite simple: You add `[CI-SKIP]` to the start of your commit subject.
+Well, quite simple: You add `[ci skip]` to the start of your commit subject.

 This case most often applies to changes to files like `README.md`, this very
 file (`CONTRIBUTING.md`), the `LICENSE.md` file, and so forth.
@@ -489,16 +426,16 @@ file (`CONTRIBUTING.md`), the `LICENSE.md` file, and so forth.
 ### Patching and building is *really* slow, what can I do?

 This only applies if you're running Windows. If you're running a prior Windows
-release, either update to Windows 10 or move to macOS/Linux/BSD.
+release, either update to Windows 10/11 or move to macOS/Linux/BSD.

 In order to speed up patching process on Windows, it's recommended you get WSL
 2. This is available in Windows 10 v2004, build 19041 or higher. (You can check
 your version by running `winver` in the run window (Windows key + R)). If you're
-out of date, update your system with the
-[Windows Update Assistant](https://www.microsoft.com/en-us/software-download/windows10).
+using an out of date version of Windows 10, update your system with the
+[Windows 10 Update Assistant](https://www.microsoft.com/en-us/software-download/windows10) or [Windows 11 Update Assistant](https://www.microsoft.com/en-us/software-download/windows11).

-To setup WSL 2, follow the information here:
-<https://docs.microsoft.com/en-us/windows/wsl/install-win10>
+To set up WSL 2, follow the information here:
+<https://docs.microsoft.com/en-us/windows/wsl/install>

 You will most likely want to use the Ubuntu apps. Once it's set up, install the
 required tools with `sudo apt-get update && sudo apt-get install $TOOL_NAMES
@@ -508,26 +445,6 @@ everything like usual.

 > ❗ Do not use the `/mnt/` directory in WSL! Instead, mount the WSL directories
 > in Windows like described here:
-> <https://www.howtogeek.com/426749/how-to-access-your-linux-wsl-files-in-windows-10/>
+> <https://docs.microsoft.com/en-us/windows/wsl/filesystems#view-your-current-directory-in-windows-file-explorer>

-### I wrote some API, how do I use it in Paper-Server?
-
-To install the API to your local maven repository, do the following:
-
- Enter the API directory by running `./paper api`;
- Run `mvn install`.
-   - If you are working on a patch without much care for whether the tests
-   pass, you can instead run `mvn install -DskipTests`. Do not PR changes
-   without running tests first.
-   - If a test failed, you have to identify the failing tests by scrolling up a
-   couple lines (i.e. around 50-200). You should find it fairly quickly.
-   - If you later need to use the Paper-API, you might want to remove the jar
-   from your local maven repository.  
-   If you use Windows and don't usually build using WSL, you might not need to
-   do this.
-
-You can now use the API in your plugin to test it before PRing. You will also
-need to do this to build the Server with the implemented API.
-
-[MiniMappingViewer]: https://minidigger.github.io/MiniMappingViewer/
-[yarn]: https://github.com/FabricMC/yarn
+[MappingViewer]: https://nms.screamingsandals.org/
@@ -17,7 +17,6 @@ should submit a pull request to this project to add their name.
 ```text
 Zach Brown <zach.brown@destroystokyo.com>
 Daniel Ennis <aikar@aikar.co>
-Kyle Wood <demonwav@gmail.com>
 kashike <kashike@vq.lc>
 Black Hole <black-hole@live.com>
 Mark Vainomaa <mikroskeem@mikroskeem.eu>
@@ -29,7 +28,7 @@ chickeneer <emcchickeneer@gmail.com>
 Minecrell <minecrell@minecrell.net>
 Techcable <Techcable@outlook.com>
 BillyGalbreath <blake.galbreath@gmail.com>
-MiniDigger <admin@minidigger.me>
+MiniDigger <admin@benndorf.dev>
 Brokkonaut <hannos17@gmx.de>
 vemacs <d@nkmem.es>
 stonar96 <minecraft.stonar96@gmail.com>
@@ -41,7 +40,6 @@ rickyboy320 <rickw320@hotmail.com>
 DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com>
 JRoy <joshroy126@gmail.com>
 ysl3000 <yannicklamprecht@live.de>
-KennyTV <jahnke.nassim@gmail.com>
 Machine_Maker <machine@machinemaker.me>
 Ivan Pekov <ivan@mrivanplays.com>
 Camotoy <20743703+Camotoy@users.noreply.github.com>
@@ -49,4 +47,6 @@ Bjarne Koll <lynxplay101@gmail.com>
 MeFisto94 <MeFisto94@users.noreply.github.com>
 Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
 LemonCaramel <admin@caramel.moe>
+Noah van der Aa <ndvdaa@gmail.com>
+Doc <nachito94@msn.com>
 ```
@@ -0,0 +1,36 @@
+plugins {
+    `java-library`
+    `maven-publish`
+}
+
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
+
+dependencies {
+    implementation(project(":paper-api"))
+    api("com.mojang:brigadier:1.0.18")
+
+    compileOnly("it.unimi.dsi:fastutil:8.5.6")
+    compileOnly("org.jetbrains:annotations:23.0.0")
+
+    testImplementation("junit:junit:4.13.2")
+    testImplementation("org.hamcrest:hamcrest-library:1.3")
+    testImplementation("org.ow2.asm:asm-tree:9.2")
+}
+
+configure<PublishingExtension> {
+    publications.create<MavenPublication>("maven") {
+        from(components["java"])
+    }
+}
+
+val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
+    badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;")
+    jarToScan.set(tasks.jar.flatMap { it.archiveFile })
+    classpath.from(configurations.compileClasspath)
+}
+tasks.check {
+    dependsOn(scanJar)
+}
@@ -1,204 +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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.destroystokyo.paper</groupId>
-        <artifactId>paper-parent</artifactId>
-        <version>dev-SNAPSHOT</version>
-    </parent>
-
-    <groupId>com.destroystokyo.paper</groupId>
-    <artifactId>paper-mojangapi</artifactId>
-    <version>1.16.5-R0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>Paper-MojangAPI</name>
-    <url>https://github.com/PaperMC/Paper</url>
-    <description>API additions that utilize Mojang Specific API's</description>
-
-    <properties>
-        <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>spigotmc-public</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-        </repository>
-        <repository>
-            <id>sonatype</id>
-            <url>https://oss.sonatype.org/content/groups/public/</url>
-        </repository>
-        <repository>
-            <id>minecraft-libraries</id>
-            <name>Minecraft Libraries</name>
-            <url>https://libraries.minecraft.net</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spigotmc-public</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.destroystokyo.paper</groupId>
-            <artifactId>paper-api</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- mojang api -->
-        <dependency>
-            <groupId>com.mojang</groupId>
-            <artifactId>brigadier</artifactId>
-            <version>1.0.17</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- utils -->
-        <dependency>
-            <groupId>it.unimi.dsi</groupId>
-            <artifactId>fastutil</artifactId>
-            <version>8.2.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- annotations -->
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>18.0.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- testing -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-tree</artifactId>
-            <version>7.3.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <defaultGoal>clean install</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <dependencies>
-                    <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
-                    <dependency>
-                        <groupId>org.codehaus.plexus</groupId>
-                        <artifactId>plexus-compiler-eclipse</artifactId>
-                        <version>2.8.5-spigotmc</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>org.bukkit</Automatic-Module-Name>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
-                    <!-- when downloading via Maven we can pull depends individually -->
-                    <shadedArtifactAttached>true</shadedArtifactAttached>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>development</id>
-            <properties>
-                <skipTests>false</skipTests>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-checkstyle-plugin</artifactId>
-                        <version>3.1.0</version>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <configLocation>checkstyle.xml</configLocation>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>com.puppycrawl.tools</groupId>
-                                <artifactId>checkstyle</artifactId>
-                                <version>8.29</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>animal-sniffer-maven-plugin</artifactId>
-                        <version>1.18</version>
-                        <executions>
-                            <execution>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <signature>
-                                <groupId>org.codehaus.mojo.signature</groupId>
-                                <artifactId>java18</artifactId>
-                                <version>1.0</version>
-                            </signature>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
@@ -3,6 +3,7 @@ package com.destroystokyo.paper.event.brigadier;
 import com.destroystokyo.paper.brigadier.BukkitBrigadierCommandSource;
 import com.mojang.brigadier.tree.RootCommandNode;
 import org.bukkit.Bukkit;
+import org.bukkit.Warning;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
@@ -27,6 +28,8 @@ import org.jetbrains.annotations.NotNull;
 * If your logic is not safe to run asynchronously, only react to the synchronous version.
 * @deprecated Draft API - Subject to change until confirmed solves desired use cases
 */
+@Deprecated
+@Warning(false)
 public class AsyncPlayerSendCommandsEvent <S extends BukkitBrigadierCommandSource> extends PlayerEvent {

    private static final HandlerList handlers = new HandlerList();
@@ -5,6 +5,7 @@ import com.destroystokyo.paper.brigadier.BukkitBrigadierCommandSource;
 import com.mojang.brigadier.tree.ArgumentCommandNode;
 import com.mojang.brigadier.tree.LiteralCommandNode;
 import com.mojang.brigadier.tree.RootCommandNode;
+import org.bukkit.Warning;
 import org.bukkit.command.Command;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
@@ -21,6 +22,8 @@ import org.jetbrains.annotations.NotNull;
 *
 * @deprecated Draft API - Subject to change until confirmed solves desired use cases
 */
+@Deprecated
+@Warning(false)
 public class CommandRegisteredEvent <S extends BukkitBrigadierCommandSource> extends ServerEvent implements Cancellable {

    private static final HandlerList handlers = new HandlerList();
@@ -1,12 +1,14 @@
-Paper ![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/PaperMC/Paper/Build%20Paper/master)
+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.


 **Support and Project Discussion:**
- - [IRC](https://webchat.esper.net/?channels=paper) or [Discord](https://discord.gg/papermc)
- 
+ - [Our forums](https://forums.papermc.io/), [Discord](https://discord.gg/papermc), or [IRC](https://webchat.esper.net/?channels=paper)

 How To (Server Admins)
 ------
@@ -16,27 +18,27 @@ Download Paper from our [downloads page](https://papermc.io/downloads).

 Run the Paperclip jar directly from your server. Just like old times

-  * Documentation on using Paper: [paper.readthedocs.io](https://paper.readthedocs.io/)
-  * For a sneak peak on upcoming features, [see here](https://github.com/PaperMC/Paper/projects)
+  * Documentation on using Paper: [docs.papermc.io](https://docs.papermc.io)
+  * For a sneak peek at upcoming features, [see here](https://github.com/PaperMC/Paper/projects)

 How To (Plugin Developers)
 ------
- * See our API patches [here](Spigot-API-Patches)
+ * See our API patches [here](patches/api)
 * See upcoming, pending, and recently added API [here](https://github.com/PaperMC/Paper/projects/6)
 * Paper API javadocs here: [papermc.io/javadocs](https://papermc.io/javadocs/)
 * Maven Repo (for paper-api):
 ```xml
 <repository>
    <id>papermc</id>
-    <url>https://papermc.io/repo/repository/maven-public/</url>
+    <url>https://repo.papermc.io/repository/maven-public/</url>
 </repository>
 ```
 * Artifact Information:
 ```xml
 <dependency>
-    <groupId>com.destroystokyo.paper</groupId>
+    <groupId>io.papermc.paper</groupId>
    <artifactId>paper-api</artifactId>
-    <version>1.16.5-R0.1-SNAPSHOT</version>
+    <version>1.19.1-R0.1-SNAPSHOT</version>
    <scope>provided</scope>
 </dependency>
 ```
@@ -44,33 +46,52 @@ How To (Plugin Developers)
 **Or alternatively, with Gradle:**

 * Repository:
-```groovy
+```kotlin
 repositories {
    maven {
-        url 'https://papermc.io/repo/repository/maven-public/'
+        url = uri("https://repo.papermc.io/repository/maven-public/")
    }
 }
-```
- * Artifact:
-```groovy
+
 dependencies {
-    compileOnly 'com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT'
+    compileOnly("io.papermc.paper:paper-api:1.19.1-R0.1-SNAPSHOT")
+}
+
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 }
 ```

 How To (Compiling Jar From Source)
 ------
-To compile Paper, you need JDK 8, maven, and an internet connection.
+To compile Paper, you need JDK 17 and an internet connection.

-Clone this repo, run `./paper jar` from *bash*, get files.
+Clone this repo, run `./gradlew applyPatches`, then `./gradlew createReobfBundlerJar` from your terminal. You can find the compiled jar in the project root's `build/libs` directory.
+
+To get a full list of tasks, run `./gradlew tasks`.

 How To (Pull Request)
 ------
 See [Contributing](CONTRIBUTING.md)

+Support Us
+------
+First of all, thank you for considering helping out, we really appreciate that!  
+
+PaperMC has various recurring expenses, mostly related to infrastructure. Paper uses [Open Collective](https://opencollective.com/) via the [Open Source Collective fiscal host](https://opencollective.com/opensource) to manage expenses. Open Collective allows us to be extremely transparent, so you can always see how your donations are used. You can read more about financially supporting PaperMC [on our website](https://papermc.io/sponsors).  
+
+You can find our collective [here](https://opencollective.com/papermc), or you can donate via GitHub Sponsors [here](https://github.com/sponsors/PaperMC), which will also go towards the collective.
+
 Special Thanks To:
 -------------

-![YourKit-Logo](https://www.yourkit.com/images/yklogo.png)
+[![YourKit-Logo](https://www.yourkit.com/images/yklogo.png)](https://www.yourkit.com/)

 [YourKit](https://www.yourkit.com/), makers of the outstanding java profiler, support open source projects of all kinds with their full featured [Java](https://www.yourkit.com/java/profiler) and [.NET](https://www.yourkit.com/.net/profiler) application profilers. We thank them for granting Paper an OSS license so that we can make our software the best it can be.
+
+[<img src="https://user-images.githubusercontent.com/21148213/121807008-8ffc6700-cc52-11eb-96a7-2f6f260f8fda.png" alt="" width="150">](https://www.jetbrains.com)
+
+[JetBrains](https://www.jetbrains.com/), creators of the IntelliJ IDEA, supports Paper with one of their [Open Source Licenses](https://www.jetbrains.com/opensource/). IntelliJ IDEA is the recommended IDE for working with Paper, and most of the Paper team uses it.
+
+All our sponsors!  
+[![Sponsor Image](https://raw.githubusercontent.com/PaperMC/papermc.io/data/sponsors.png)](https://papermc.io/sponsors)
@@ -1,106 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 00:16:08 +0100
-Subject: [PATCH] POM changes
-
-
-diff --git a/pom.xml b/pom.xml
-index 0223e94c1243a58955f858c8bf6d5df4ca8cf0ec..fd663f5471516c3ebbab07c27197e5df48c481e6 100644
--- a/pom.xml
-+++ b/pom.xml
-@@ -2,33 +2,34 @@
- <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">
-     <modelVersion>4.0.0</modelVersion>
-+    <parent>
-+        <groupId>com.destroystokyo.paper</groupId>
-+        <artifactId>paper-parent</artifactId>
-+        <version>dev-SNAPSHOT</version>
-+    </parent>
- 
-    <groupId>org.spigotmc</groupId>
-    <artifactId>spigot-api</artifactId>
-+    <groupId>com.destroystokyo.paper</groupId>
-+    <artifactId>paper-api</artifactId>
-     <version>1.16.5-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-    <name>Spigot-API</name>
-    <url>https://www.spigotmc.org/</url>
-+    <name>Paper-API</name>
-+    <url>https://github.com/PaperMC/Paper</url>
-     <description>An enhanced plugin API for Minecraft servers.</description>
- 
-     <properties>
-        <skipTests>true</skipTests>
-+        <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
-         <maven.compiler.source>1.8</maven.compiler.source>
-         <maven.compiler.target>1.8</maven.compiler.target>
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-     </properties>
- 
-    <distributionManagement>
-+    <repositories>
-         <repository>
-            <id>spigotmc-releases</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
-+            <id>sonatype</id>
-+            <url>https://oss.sonatype.org/content/groups/public/</url>
-         </repository>
-        <snapshotRepository>
-            <id>spigotmc-snapshots</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
-+    </repositories>
- 
-     <dependencies>
-         <dependency>
-@@ -37,6 +38,20 @@
-             <version>2.6</version>
-             <scope>compile</scope>
-         </dependency>
-+        <!-- bundled with Minecraft, shouldn't ever change -->
-+        <dependency>
-+            <groupId>com.google.code.findbugs</groupId>
-+            <artifactId>jsr305</artifactId>
-+            <version>1.3.9</version>
-+            <scope>compile</scope>
-+        </dependency>
-+        <!-- used in previous versions of the API -->
-+        <dependency>
-+            <groupId>com.googlecode.json-simple</groupId>
-+            <artifactId>json-simple</artifactId>
-+            <version>1.1.1</version>
-+            <scope>compile</scope>
-+        </dependency>
-         <!-- bundled with Minecraft, should be kept in sync -->
-         <dependency>
-             <groupId>com.google.guava</groupId>
-@@ -112,6 +127,7 @@
-     </dependencies>
- 
-     <build>
-+        <defaultGoal>clean install</defaultGoal>
-         <plugins>
-             <plugin>
-                 <groupId>net.md-5</groupId>
-@@ -130,10 +146,6 @@
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-compiler-plugin</artifactId>
-                 <version>3.8.1</version>
-                <configuration>
-                    <!-- we use the Eclipse compiler as it doesn't need a JDK -->
-                    <compilerId>eclipse</compilerId>
-                </configuration>
-                 <dependencies>
-                     <dependency>
-                         <groupId>org.codehaus.plexus</groupId>
-@@ -183,6 +195,7 @@
-                             </excludes>
-                         </filter>
-                     </filters>
-+                    <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
-                     <!-- when downloading via Maven we can pull depends individually -->
-                     <shadedArtifactAttached>true</shadedArtifactAttached>
-                 </configuration>
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 1 Apr 2016 00:02:47 -0400
-Subject: [PATCH] Add FastUtil to Bukkit
-
-Doesn't expose to plugins, just allows Paper-API to use it for optimization
-
-diff --git a/pom.xml b/pom.xml
-index 61b8ee4e3e122dd2671f50ea3b432e4abd4600a2..12306d830c6889c2c9b12699abebe0411262aef6 100644
--- a/pom.xml
-+++ b/pom.xml
-@@ -32,6 +32,12 @@
-     </repositories>
- 
-     <dependencies>
-+        <dependency>
-+            <groupId>it.unimi.dsi</groupId>
-+            <artifactId>fastutil</artifactId>
-+            <version>8.2.2</version>
-+            <scope>provided</scope>
-+        </dependency>
-         <dependency>
-             <groupId>commons-lang</groupId>
-             <artifactId>commons-lang</artifactId>
@@ -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 171e2663301f654258dbd772a57688b5a2f8469c..76ac0b20842002ce1b593e338bea98483e7080ac 100644
--- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1380,6 +1380,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>
@@ -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 ab4d5aca6251b620ef5d654fa4ea3fc31783c2f2..0636edd8d9121eabfa60957c8c224261d228a16b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1543,6 +1543,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 b862f22d5f31934eb46b50ecf04f8c1bf23c5044..5c638e0d45e8896382bdbf9b9c10474b05a97df5 100644
--- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1301,6 +1301,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.
-      *
@@ -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 41a1bc45cc5eb7f19374115ade7f5328c7fc1dae..e9d0d507b47b0347b975b1a83f5ae70dca5587b8 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
-+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -609,5 +609,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();
-+    }
- }
@@ -1,185 +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 207c656c0a11a3a630bc70491efcf433b2681e18..195b6bb328de92c4d17d1cd14e13578226b1ac3c 100644
--- a/src/main/java/org/bukkit/UnsafeValues.java
-+++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -84,5 +84,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 2305eb40832a82159cd89162934870cf57e1aa0e..4c2ddc722a9dc4011906ad9530b13fa9be1d3ff9 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.collect.ImmutableList;
- import com.google.common.io.Resources;
-@@ -16,6 +17,7 @@ import java.util.HashSet;
- import java.util.List;
- import java.util.Set;
- import java.util.concurrent.locks.ReentrantLock;
-+import net.kyori.adventure.text.Component; // Paper
- import org.apache.commons.lang.Validate;
- import org.bukkit.Bukkit;
- import org.bukkit.ChatColor;
-@@ -26,6 +28,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 +51,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 +157,14 @@ public class VersionCommand extends BukkitCommand {
- 
-     private final ReentrantLock versionLock = new ReentrantLock();
-     private boolean hasVersion = false;
-    private String versionMessage = null;
-+    private 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 +179,7 @@ public class VersionCommand extends BukkitCommand {
-                 return;
-             }
-             versionWaiters.add(sender);
-            sender.sendMessage("Checking version, please wait...");
-+            sender.sendMessage(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 +197,13 @@ public class VersionCommand extends BukkitCommand {
- 
-     private void obtainVersion() {
-         String version = Bukkit.getVersion();
-+        // Paper start
-+        if (version.startsWith("null")) { // running from ide?
-+            setVersionMessage(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 +233,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 Component msg) {
-         lastCheck = System.currentTimeMillis();
-        versionMessage = msg;
-+        final Component message = net.kyori.adventure.text.TextComponent.ofChildren(
-+            Component.text("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")", net.kyori.adventure.text.format.NamedTextColor.WHITE),
-+            Component.newline(),
-+            msg
-+        );
-+        this.versionMessage = Component.text()
-+            .append(message)
-+            .hoverEvent(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;
@@ -1,39 +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 player view distance API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 76ac0b20842002ce1b593e338bea98483e7080ac..f34601480a3b3069c30c52d258a35a2a79c981fb 100644
--- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1394,6 +1394,28 @@ 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
-+     * @deprecated This is unimplemented and <i>will</i> throw an exception at runtime. The {@link org.bukkit.World World}-based methods still work.
-+     * @see org.bukkit.World#getViewDistance()
-+     * @see org.bukkit.World#getNoTickViewDistance()
-+     */
-+    @Deprecated
-+    public int getViewDistance();
-+
-+    /**
-+     * Sets the view distance for this player
-+     *
-+     * @param viewDistance the player's view distance
-+     * @deprecated This is unimplemented and <i>will</i> throw an exception at runtime. The {@link org.bukkit.World World}-based methods still work.
-+     * @see org.bukkit.World#setViewDistance(int)
-+     * @see org.bukkit.World#setNoTickViewDistance(int)
-+     */
-+    @Deprecated
-+    public void setViewDistance(int viewDistance);
-     // Paper end
- 
-     /**
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Steve Anton <anxuiz.nx@gmail.com>
-Date: Mon, 29 Feb 2016 18:13:58 -0600
-Subject: [PATCH] Add PlayerInitialSpawnEvent
-
-For modifying a player's initial spawn location as they join the server
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..8b1fdb9d2869d4c1862d557c91bf8a1d8c537507
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
-@@ -0,0 +1,16 @@
-+package com.destroystokyo.paper.event.player;
-+
-+import org.bukkit.Location;
-+import org.bukkit.entity.Player;
-+import org.jetbrains.annotations.NotNull;
-+import org.spigotmc.event.player.PlayerSpawnLocationEvent;
-+
-+/**
-+ * @deprecated Use {@link PlayerSpawnLocationEvent}, Duplicate API
-+ */
-+public class PlayerInitialSpawnEvent extends PlayerSpawnLocationEvent {
-+
-+    public PlayerInitialSpawnEvent(@NotNull Player who, @NotNull Location spawnLocation) {
-+        super(who, spawnLocation);
-+    }
-+}
@@ -1,21 +0,0 @@
-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 cf2f517765d8f2a23cc4a17d9ee2dcd81f841b1b..2e306c7b984a02e12a74fac14589bf29ab6488bf 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
-+                disablePlugin(jPlugin);
-+                return;
-+                // Paper end
-             }
- 
-             // Perhaps abort here, rather than continue going, but as it stands,
@@ -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 0636edd8d9121eabfa60957c8c224261d228a16b..8d707e117035d5bc0d8c9a5fd386ee8355359259 100644
--- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1717,6 +1717,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 5c638e0d45e8896382bdbf9b9c10474b05a97df5..24bcc63afbda5f27aad385dc707f262d1a3a3399 100644
--- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1311,6 +1311,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.
-      *
@@ -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 10274053320f1ec690a65d3794abb44b58658059..22b83b142de97dcba28fa9a49730de7880d0b5d2 100644
--- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -285,6 +285,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 7e4a728ceb943b6a32b9ba9b84bada34e71c0980..9ce9b4ce2da6c57c62607502ae2042e30fc26d88 100644
--- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -234,6 +234,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 68795a48cb15d322906ce0569b7701231c1f94c2..88853cc165c67fd60a0a8f87e4ce356e4ca045f9 100644
--- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -614,6 +614,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.
-      *
@@ -1,577 +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 88853cc165c67fd60a0a8f87e4ce356e4ca045f9..c9e4cb2d153fc0c6853fe520263a0073e7504e38 100644
--- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2,6 +2,7 @@ package org.bukkit.entity;
- 
- import java.net.InetSocketAddress;
- import java.util.UUID;
-+import com.destroystokyo.paper.Title; // Paper
- import org.bukkit.DyeColor;
- import org.bukkit.Effect;
- import org.bukkit.GameMode;
-@@ -648,6 +649,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)} 
-+     */
-+    @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)}
-+     */
-+    @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)}
-+     */
-+    @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)}
-+     */
-+    @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)}
-+     */
-+    @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)}
-+     */
-+    @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)}
-+     */
-+    @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)}
-+     */
-+    @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)}
-+     */
-+    @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
- 
-     /**
@@ -1,604 +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..2f573299a9a817a98372817a1de8bf641aaca956
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
-@@ -0,0 +1,43 @@
-+package com.destroystokyo.paper.event.server;
-+
-+import com.google.common.base.Preconditions;
-+import org.apache.commons.lang.Validate;
-+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..6defac287d0214fdf99418d979144050cc1e53bc
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
-@@ -0,0 +1,38 @@
-+package com.destroystokyo.paper.exception;
-+
-+import com.google.common.base.Preconditions;
-+import org.apache.commons.lang.Validate;
-+import org.bukkit.plugin.Plugin;
-+
-+import static com.google.common.base.Preconditions.*;
-+
-+/**
-+ * 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 f020cb04eba27a2e70fc7cf799ebbfb434b9d974..adfc7aae2c0f49bbcdd358e83b04a0cf078a7d52 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
-+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -8,6 +8,10 @@ import java.util.HashMap;
- import java.util.Iterator;
- import java.util.List;
- import java.util.Map;
-+
-+import com.destroystokyo.paper.event.server.ServerExceptionEvent;
-+import com.destroystokyo.paper.exception.ServerCommandException;
-+import com.destroystokyo.paper.exception.ServerTabCompleteException;
- import org.apache.commons.lang.Validate;
- import org.bukkit.Location;
- import org.bukkit.Server;
-@@ -155,11 +159,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 ServerExceptionEvent(new 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 ServerExceptionEvent(new ServerCommandException(ex, target, sender, args))); // Paper
-+            throw new CommandException(msg, ex);
-         }
- 
-         // return true as command was handled
-@@ -238,7 +245,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 ServerExceptionEvent(new 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 745eaa8f2f2ff83536301db8ca47a8af30df7a73..d0fec44d2546290091649879450761ce08514fcb 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -23,6 +23,10 @@ import java.util.WeakHashMap;
- import java.util.logging.Level;
- import java.util.regex.Matcher;
- import java.util.regex.Pattern;
-+
-+import com.destroystokyo.paper.event.server.ServerExceptionEvent;
-+import com.destroystokyo.paper.exception.ServerEventException;
-+import com.destroystokyo.paper.exception.ServerPluginEnableDisableException;
- import org.apache.commons.lang.Validate;
- import org.bukkit.Server;
- import org.bukkit.World;
-@@ -478,7 +482,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();
-@@ -499,32 +504,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 {
-@@ -537,6 +547,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 ServerExceptionEvent(new ServerPluginEnableDisableException(msg, ex, plugin)));
-+    }
-+    // Paper end
-+
-     @Override
-     public void clearPlugins() {
-         synchronized (this) {
-@@ -600,7 +617,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 ServerExceptionEvent)) { // We don't want to cause an endless event loop
-+                    callEvent(new ServerExceptionEvent(new ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
-+                }
-+                // Paper end
-             }
-         }
-     }
@@ -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 c88418c7aa19b4fecdfa9af3d18ff202a5dc5763..fb0e608fa92dae99b9eee8fc1cbdf4b91a33e620 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;
-@@ -117,5 +120,33 @@ public interface CommandSender extends net.kyori.adventure.audience.Audience, Pe
-     default void sendMessage(final @NotNull net.kyori.adventure.identity.Identity identity, final @NotNull net.kyori.adventure.text.Component message, final @NotNull net.kyori.adventure.audience.MessageType type) {
-         this.sendMessage(org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().serialize(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
- }
@@ -1,30 +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
-
-
-diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 24c858182f25496cc7254f7cf9e996b3bea1f9ec..45e9f585c3e522ecf94a6bc42cdc190e1a191a5c 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
-+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -605,4 +605,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
- }
@@ -1,118 +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 769ad98fd7a6a866b320e1ccffd7962228d564cf..ddbe5734ac0f905b0c388e30f17a281530b82262 100644
--- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1124,7 +1124,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);
- 
-     /**
-@@ -1601,6 +1603,60 @@ 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);
-+
-+    /**
-+     * @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.
-      *
@@ -1,398 +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/pom.xml b/pom.xml
-index 1ced7a212684cee8faf07fa9a083adcd47be7fcb..7ec7e6047193a6b390d24f6d2722e35d1d36830d 100644
--- a/pom.xml
-+++ b/pom.xml
-@@ -163,6 +163,17 @@
-             <version>9.1</version>
-             <scope>test</scope>
-         </dependency>
-+        <!-- ASM -->
-+        <dependency>
-+            <groupId>org.ow2.asm</groupId>
-+            <artifactId>asm</artifactId>
-+            <version>9.0</version>
-+        </dependency>
-+        <dependency>
-+            <groupId>org.ow2.asm</groupId>
-+            <artifactId>asm-commons</artifactId>
-+            <version>9.0</version>
-+        </dependency>
-     </dependencies>
- 
-     <build>
-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..b6e7d8ee8d903ebf975d60bec0e08603d9a49fdb
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
-@@ -0,0 +1,47 @@
-+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());
-+        if (m.getReturnType() != void.class) {
-+            methodGenerator.pop();
-+        }
-+        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 2e306c7b984a02e12a74fac14589bf29ab6488bf..79ac529017aac059d13fe342f279e9c8faeba599 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 {
@@ -1,104 +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 8646fc0987a8833996c5d977c36fe0d01bf72992..72375883b07ede041a7ea5f7b6785f71aef702c0 100644
--- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1752,6 +1752,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 599347ef656acad9a40be15fc5030e5d0f1630df..a2940eafa61814aae7f766262309495e991533d6 100644
--- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1549,4 +1549,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..c62da4131b17e66892678e8b618fb9ba3de93b56 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, ChatColor.GREEN + "Permissions successfully reloaded.");
-+                return true;
-+            } else if ("confirm".equalsIgnoreCase(args[0])) {
-+                confirmed = true;
-+            } else {
-+                Command.broadcastCommandMessage(sender, ChatColor.RED + "Usage: " + usageMessage);
-+                return true;
-+            }
-+        }
-+        if (!confirmed) {
-+            Command.broadcastCommandMessage(sender, ChatColor.RED + "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 " + ChatColor.YELLOW + "/reload confirm");
-+            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 c2c49ee9b5531bc4761d2da54cd707c57fc647bf..2d27dfb859c312d46a14d0356c7c3f227e965a67 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -895,4 +895,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
-+
- }
@@ -1,90 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: crast <contact@jamescrasta.com>
-Date: Sat, 1 Jun 2013 13:52:30 -0600
-Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase
-
-Use ConcurrentHashMap to allow thread-safe access methods and very
-limited synchronized portions to allow much higher concurrency in
-MetadataStore as well as far less locking, especially on reads
-
-diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
-index baf850226aed8545a5794deba6dff9603953b4b2..d363d517c05b3335101d829ce4ec22d049059c24 100644
--- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
-+++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
-@@ -12,7 +12,7 @@ import org.bukkit.plugin.Plugin;
- import org.jetbrains.annotations.NotNull;
- 
- public abstract class MetadataStoreBase<T> {
-    private Map<String, Map<Plugin, MetadataValue>> metadataMap = new HashMap<String, Map<Plugin, MetadataValue>>();
-+    private Map<String, Map<Plugin, MetadataValue>> metadataMap = new java.util.concurrent.ConcurrentHashMap<String, Map<Plugin, MetadataValue>>(); // Paper
- 
-     /**
-      * Adds a metadata value to an object. Each metadata value is owned by a
-@@ -46,7 +46,9 @@ public abstract class MetadataStoreBase<T> {
-             entry = new WeakHashMap<Plugin, MetadataValue>(1);
-             metadataMap.put(key, entry);
-         }
-        entry.put(owningPlugin, newMetadataValue);
-+        synchronized (entry) {
-+            entry.put(owningPlugin, newMetadataValue);
-+        }
-     }
- 
-     /**
-@@ -60,10 +62,11 @@ public abstract class MetadataStoreBase<T> {
-      * @see MetadataStore#getMetadata(Object, String)
-      */
-     @NotNull
-    public synchronized List<MetadataValue> getMetadata(@NotNull T subject, @NotNull String metadataKey) {
-+    public List<MetadataValue> getMetadata(@NotNull T subject, @NotNull String metadataKey) { // Paper
-         String key = disambiguate(subject, metadataKey);
-        if (metadataMap.containsKey(key)) {
-            Collection<MetadataValue> values = metadataMap.get(key).values();
-+        Map<Plugin, MetadataValue> entry = metadataMap.get(key);
-+        if (entry != null) {
-+            Collection<MetadataValue> values = entry.values();
-             return Collections.unmodifiableList(new ArrayList<MetadataValue>(values));
-         } else {
-             return Collections.emptyList();
-@@ -78,7 +81,7 @@ public abstract class MetadataStoreBase<T> {
-      * @param metadataKey the unique metadata key being queried.
-      * @return the existence of the metadataKey within subject.
-      */
-    public synchronized boolean hasMetadata(@NotNull T subject, @NotNull String metadataKey) {
-+    public boolean hasMetadata(@NotNull T subject, @NotNull String metadataKey) { // Paper
-         String key = disambiguate(subject, metadataKey);
-         return metadataMap.containsKey(key);
-     }
-@@ -94,17 +97,18 @@ public abstract class MetadataStoreBase<T> {
-      * @see MetadataStore#removeMetadata(Object, String,
-      *     org.bukkit.plugin.Plugin)
-      */
-    public synchronized void removeMetadata(@NotNull T subject, @NotNull String metadataKey, @NotNull Plugin owningPlugin) {
-+    public void removeMetadata(@NotNull T subject, @NotNull String metadataKey, @NotNull Plugin owningPlugin) { // Paper
-         Validate.notNull(owningPlugin, "Plugin cannot be null");
-         String key = disambiguate(subject, metadataKey);
-         Map<Plugin, MetadataValue> entry = metadataMap.get(key);
-         if (entry == null) {
-             return;
-         }
-
-        entry.remove(owningPlugin);
-        if (entry.isEmpty()) {
-            metadataMap.remove(key);
-+        synchronized (entry) {
-+            entry.remove(owningPlugin);
-+            if (entry.isEmpty()) {
-+                metadataMap.remove(key);
-+            }
-         }
-     }
- 
-@@ -117,7 +121,7 @@ public abstract class MetadataStoreBase<T> {
-      * @throws IllegalArgumentException If plugin is null
-      * @see MetadataStore#invalidateAll(org.bukkit.plugin.Plugin)
-      */
-    public synchronized void invalidateAll(@NotNull Plugin owningPlugin) {
-+    public void invalidateAll(@NotNull Plugin owningPlugin) { // Paper
-         Validate.notNull(owningPlugin, "Plugin cannot be null");
-         for (Map<Plugin, MetadataValue> values : metadataMap.values()) {
-             if (values.containsKey(owningPlugin)) {
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 16 Jul 2013 21:26:50 -0400
-Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
-
-So that on reload, metadata will be cleared
-
-diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
-index d363d517c05b3335101d829ce4ec22d049059c24..abbe545af572687a0399c2387434863cd2b70f68 100644
--- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
-+++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
-@@ -4,6 +4,7 @@ import java.util.ArrayList;
- import java.util.Collection;
- import java.util.Collections;
- import java.util.HashMap;
-+import java.util.Iterator; // Paper
- import java.util.List;
- import java.util.Map;
- import java.util.WeakHashMap;
-@@ -130,6 +131,26 @@ public abstract class MetadataStoreBase<T> {
-         }
-     }
- 
-+    /**
-+     * Removes all metadata in the metadata store that originates from the
-+     * given plugin.
-+     *
-+     * @param owningPlugin the plugin requesting the invalidation.
-+     * @throws IllegalArgumentException If plugin is null
-+     */
-+    public void removeAll(@NotNull Plugin owningPlugin) {
-+        Validate.notNull(owningPlugin, "Plugin cannot be null");
-+        for (Iterator<Map<Plugin, MetadataValue>> iterator = metadataMap.values().iterator(); iterator.hasNext(); ) {
-+            Map<Plugin, MetadataValue> values = iterator.next();
-+            if (values.containsKey(owningPlugin)) {
-+                values.remove(owningPlugin);
-+            }
-+            if (values.isEmpty()) {
-+                iterator.remove();
-+            }
-+        }
-+    }
-+
-     /**
-      * Creates a unique name for the object receiving metadata by combining
-      * unique data from the subject with a metadataKey.
@@ -1,290 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Wed, 13 Apr 2016 20:20:18 -0700
-Subject: [PATCH] Add handshake event to allow plugins to handle client
- handshaking logic themselves
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..a077962fa786a3291849abfa823c7f0ec4664fce
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java
-@@ -0,0 +1,277 @@
-+package com.destroystokyo.paper.event.player;
-+
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import org.apache.commons.lang.Validate;
-+import org.bukkit.Bukkit;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.HandlerList;
-+
-+import java.util.UUID;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * This event is fired during a player handshake.
-+ *
-+ * <p>If there are no listeners listening to this event, the logic default
-+ * to your server platform will be ran.</p>
-+ *
-+ * <p>WARNING: TAMPERING WITH THIS EVENT CAN BE DANGEROUS</p>
-+ */
-+public class PlayerHandshakeEvent extends Event implements Cancellable {
-+
-+    private static final HandlerList HANDLERS = new HandlerList();
-+    @NotNull private final String originalHandshake;
-+    @NotNull private final String originalSocketAddressHostname;
-+    private boolean cancelled;
-+    @Nullable private String serverHostname;
-+    @Nullable private String socketAddressHostname;
-+    @Nullable private UUID uniqueId;
-+    @Nullable private String propertiesJson;
-+    private boolean failed;
-+    private Component failMessage = Component.text("If you wish to use IP forwarding, please enable it in your BungeeCord config as well!", NamedTextColor.YELLOW);
-+
-+    /**
-+     * Creates a new {@link PlayerHandshakeEvent}.
-+     *
-+     * @param originalHandshake the original handshake string
-+     * @param cancelled if this event is enabled
-+     *
-+     * @deprecated in favour of {@link PlayerHandshakeEvent(String, String, boolean)}
-+     */
-+    @Deprecated
-+    public PlayerHandshakeEvent(@NotNull String originalHandshake, boolean cancelled) {
-+        this(originalHandshake, "127.0.0.1", cancelled);
-+    }
-+
-+    /**
-+     * Creates a new {@link PlayerHandshakeEvent}.
-+     *
-+     * @param originalHandshake the original handshake string
-+     * @param originalSocketAddressHostname the original socket address hostname
-+     * @param cancelled if this event is enabled
-+     */
-+    public PlayerHandshakeEvent(@NotNull String originalHandshake, @NotNull String originalSocketAddressHostname, boolean cancelled) {
-+        super(true);
-+        this.originalHandshake = originalHandshake;
-+        this.originalSocketAddressHostname = originalSocketAddressHostname;
-+        this.cancelled = cancelled;
-+    }
-+
-+    /**
-+     * Determines if this event is cancelled.
-+     *
-+     * <p>When this event is cancelled, custom handshake logic will not
-+     * be processed.</p>
-+     *
-+     * @return {@code true} if this event is cancelled, {@code false} otherwise
-+     */
-+    @Override
-+    public boolean isCancelled() {
-+        return this.cancelled;
-+    }
-+
-+    /**
-+     * Sets if this event is cancelled.
-+     *
-+     * <p>When this event is cancelled, custom handshake logic will not
-+     * be processed.</p>
-+     *
-+     * @param cancelled {@code true} if this event is cancelled, {@code false} otherwise
-+     */
-+    @Override
-+    public void setCancelled(boolean cancelled) {
-+        this.cancelled = cancelled;
-+    }
-+
-+    /**
-+     * Gets the original handshake string.
-+     *
-+     * @return the original handshake string
-+     */
-+    @NotNull
-+    public String getOriginalHandshake() {
-+        return this.originalHandshake;
-+    }
-+
-+    /**
-+     * Gets the original socket address hostname.
-+     *
-+     * <p>This does not include the port.</p>
-+     * <p>In cases where this event is manually fired and the plugin wasn't updated yet, the default is {@code "127.0.0.1"}.</p>
-+     *
-+     * @return the original socket address hostname
-+     */
-+    @NotNull
-+    public String getOriginalSocketAddressHostname() {
-+        return this.originalSocketAddressHostname;
-+    }
-+
-+    /**
-+     * Gets the server hostname string.
-+     *
-+     * <p>This should not include the port.</p>
-+     *
-+     * @return the server hostname string
-+     */
-+    @Nullable
-+    public String getServerHostname() {
-+        return this.serverHostname;
-+    }
-+
-+    /**
-+     * Sets the server hostname string.
-+     *
-+     * <p>This should not include the port.</p>
-+     *
-+     * @param serverHostname the server hostname string
-+     */
-+    public void setServerHostname(@NotNull String serverHostname) {
-+        this.serverHostname = serverHostname;
-+    }
-+
-+    /**
-+     * Gets the socket address hostname string.
-+     *
-+     * <p>This should not include the port.</p>
-+     *
-+     * @return the socket address hostname string
-+     */
-+    @Nullable
-+    public String getSocketAddressHostname() {
-+        return this.socketAddressHostname;
-+    }
-+
-+    /**
-+     * Sets the socket address hostname string.
-+     *
-+     * <p>This should not include the port.</p>
-+     *
-+     * @param socketAddressHostname the socket address hostname string
-+     */
-+    public void setSocketAddressHostname(@NotNull String socketAddressHostname) {
-+        this.socketAddressHostname = socketAddressHostname;
-+    }
-+
-+    /**
-+     * Gets the unique id.
-+     *
-+     * @return the unique id
-+     */
-+    @Nullable
-+    public UUID getUniqueId() {
-+        return this.uniqueId;
-+    }
-+
-+    /**
-+     * Sets the unique id.
-+     *
-+     * @param uniqueId the unique id
-+     */
-+    public void setUniqueId(@NotNull UUID uniqueId) {
-+        this.uniqueId = uniqueId;
-+    }
-+
-+    /**
-+     * Gets the profile properties.
-+     *
-+     * <p>This should be a valid JSON string.</p>
-+     *
-+     * @return the profile properties, as JSON
-+     */
-+    @Nullable
-+    public String getPropertiesJson() {
-+        return this.propertiesJson;
-+    }
-+
-+    /**
-+     * Determines if authentication failed.
-+     *
-+     * <p>When {@code true}, the client connecting will be disconnected
-+     * with the {@link #getFailMessage() fail message}.</p>
-+     *
-+     * @return {@code true} if authentication failed, {@code false} otherwise
-+     */
-+    public boolean isFailed() {
-+        return this.failed;
-+    }
-+
-+    /**
-+     * Sets if authentication failed and the client should be disconnected.
-+     *
-+     * <p>When {@code true}, the client connecting will be disconnected
-+     * with the {@link #getFailMessage() fail message}.</p>
-+     *
-+     * @param failed {@code true} if authentication failed, {@code false} otherwise
-+     */
-+    public void setFailed(boolean failed) {
-+        this.failed = failed;
-+    }
-+
-+    /**
-+     * Sets the profile properties.
-+     *
-+     * <p>This should be a valid JSON string.</p>
-+     *
-+     * @param propertiesJson the profile properties, as JSON
-+     */
-+    public void setPropertiesJson(@NotNull String propertiesJson) {
-+        this.propertiesJson = propertiesJson;
-+    }
-+
-+    /**
-+     * Gets the message to display to the client when authentication fails.
-+     *
-+     * @return the message to display to the client
-+     */
-+    @NotNull
-+    public Component failMessage() {
-+        return this.failMessage;
-+    }
-+
-+    /**
-+     * Sets the message to display to the client when authentication fails.
-+     *
-+     * @param failMessage the message to display to the client
-+     */
-+    public void failMessage(@NotNull Component failMessage) {
-+        this.failMessage = failMessage;
-+    }
-+
-+    /**
-+     * Gets the message to display to the client when authentication fails.
-+     *
-+     * @return the message to display to the client
-+     * @deprecated use {@link #failMessage()}
-+     */
-+    @NotNull
-+    @Deprecated
-+    public String getFailMessage() {
-+        return Bukkit.getUnsafe().legacyComponentSerializer().serialize(this.failMessage());
-+    }
-+
-+    /**
-+     * Sets the message to display to the client when authentication fails.
-+     *
-+     * @param failMessage the message to display to the client
-+     * @deprecated use {@link #failMessage(Component)}
-+     */
-+    @Deprecated
-+    public void setFailMessage(@NotNull String failMessage) {
-+        Validate.notEmpty(failMessage, "fail message cannot be null or empty");
-+        this.failMessage(Bukkit.getUnsafe().legacyComponentSerializer().deserialize(failMessage));
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return HANDLERS;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return HANDLERS;
-+    }
-+}
@@ -1,402 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 1 May 2016 15:19:49 -0400
-Subject: [PATCH] LootTable API
-
-Provides API to control what Loot Table an object uses.
-
-Also provides an Event to control if a lootable inventory should
-auto replenish for a player.
-
-Provides methods to determine players looted state for an object
-
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..92d7b853a2ccaae5afa8ac141bead840942944ef
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java
-@@ -0,0 +1,17 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import org.bukkit.block.Block;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Represents an Inventory that can generate loot, such as Chests inside of Fortresses and Mineshafts
-+ */
-+public interface LootableBlockInventory extends LootableInventory {
-+
-+    /**
-+     * Gets the block that is lootable
-+     * @return The Block
-+     */
-+    @NotNull
-+    Block getBlock();
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..b387894fe8001edb41ad2ad2b70ebabe065b682e
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java
-@@ -0,0 +1,17 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import org.bukkit.entity.Entity;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Represents an Inventory that can generate loot, such as Minecarts inside of Mineshafts
-+ */
-+public interface LootableEntityInventory extends LootableInventory {
-+
-+    /**
-+     * Gets the entity that is lootable
-+     * @return The Entity
-+     */
-+    @NotNull
-+    Entity getEntity();
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..97815eeb231cf0706b34fa47a4f7d1bb786305b4
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java
-@@ -0,0 +1,116 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import org.bukkit.entity.Player;
-+import org.bukkit.loot.Lootable;
-+
-+import java.util.UUID;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * Represents an Inventory that contains a Loot Table associated to it that will
-+ * automatically fill on first open.
-+ *
-+ * A new feature and API is provided to support automatically refreshing the contents
-+ * of the inventory based on that Loot Table after a configurable amount of time has passed.
-+ *
-+ * The behavior of how the Inventory is filled based on the loot table may vary based
-+ * on Minecraft versions and the Loot Table feature.
-+ */
-+public interface LootableInventory extends Lootable {
-+
-+    /**
-+     * Server owners have to enable whether or not an object in a world should refill
-+     *
-+     * @return If the world this inventory is currently in has Replenishable Lootables enabled
-+     */
-+    boolean isRefillEnabled();
-+
-+    /**
-+     * Whether or not this object has ever been filled
-+     * @return Has ever been filled
-+     */
-+    boolean hasBeenFilled();
-+
-+    /**
-+     * Has this player ever looted this block
-+     * @param player The player to check
-+     * @return Whether or not this player has looted this block
-+     */
-+    default boolean hasPlayerLooted(@NotNull Player player) {
-+        return hasPlayerLooted(player.getUniqueId());
-+    }
-+
-+    /**
-+     * Has this player ever looted this block
-+     * @param player The player to check
-+     * @return Whether or not this player has looted this block
-+     */
-+    boolean hasPlayerLooted(@NotNull UUID player);
-+
-+    /**
-+     * Gets the timestamp, in milliseconds, of when the player last looted this object
-+     *
-+     * @param player The player to check
-+     * @return Timestamp last looted, or null if player has not looted this object
-+     */
-+    @Nullable
-+    default Long getLastLooted(@NotNull Player player) {
-+        return getLastLooted(player.getUniqueId());
-+    }
-+
-+    /**
-+     * Gets the timestamp, in milliseconds, of when the player last looted this object
-+     *
-+     * @param player The player to check
-+     * @return Timestamp last looted, or null if player has not looted this object
-+     */
-+    @Nullable
-+    Long getLastLooted(@NotNull UUID player);
-+
-+    /**
-+     * Change the state of whether or not a player has looted this block
-+     * @param player The player to change state for
-+     * @param looted true to add player to looted list, false to remove
-+     * @return The previous state of whether the player had looted this or not
-+     */
-+    default boolean setHasPlayerLooted(@NotNull Player player, boolean looted) {
-+        return setHasPlayerLooted(player.getUniqueId(), looted);
-+    }
-+
-+    /**
-+     * Change the state of whether or not a player has looted this block
-+     * @param player The player to change state for
-+     * @param looted true to add player to looted list, false to remove
-+     * @return The previous state of whether the player had looted this or not
-+     */
-+    boolean setHasPlayerLooted(@NotNull UUID player, boolean looted);
-+
-+    /**
-+     * Returns Whether or not this object has been filled and now has a pending refill
-+     * @return Has pending refill
-+     */
-+    boolean hasPendingRefill();
-+
-+    /**
-+     * Gets the timestamp in milliseconds that the Lootable object was last refilled
-+     *
-+     * @return -1 if it was never refilled, or timestamp in milliseconds
-+     */
-+    long getLastFilled();
-+
-+    /**
-+     * Gets the timestamp in milliseconds that the Lootable object will refill
-+     *
-+     * @return -1 if it is not scheduled for refill, or timestamp in milliseconds
-+     */
-+    long getNextRefill();
-+
-+    /**
-+     * Sets the timestamp in milliseconds of the next refill for this object
-+     *
-+     * @param refillAt timestamp in milliseconds. -1 to clear next refill
-+     * @return The previous scheduled time to refill, or -1 if was not scheduled
-+     */
-+    long setNextRefill(long refillAt);
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..fd184f13f5e8ee5cf829fff4f44696e1f760430b
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java
-@@ -0,0 +1,45 @@
-+package com.destroystokyo.paper.loottable;
-+
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.player.PlayerEvent;
-+import org.jetbrains.annotations.NotNull;
-+
-+public class LootableInventoryReplenishEvent extends PlayerEvent implements Cancellable {
-+    @NotNull private final LootableInventory inventory;
-+
-+    public LootableInventoryReplenishEvent(@NotNull Player player, @NotNull LootableInventory inventory) {
-+        super(player);
-+        this.inventory = inventory;
-+    }
-+
-+    @NotNull
-+    public LootableInventory getInventory() {
-+        return inventory;
-+    }
-+
-+    private static final HandlerList handlers = new HandlerList();
-+
-+    @NotNull
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+
-+    private boolean cancelled = false;
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        cancelled = cancel;
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java
-index b451191312e4fb19f2131c2d0a0c0337953f6c7c..db6affbc78106b2d93b41953b624a0bca0ca1d72 100644
--- a/src/main/java/org/bukkit/block/Chest.java
-+++ b/src/main/java/org/bukkit/block/Chest.java
-@@ -1,5 +1,7 @@
- package org.bukkit.block;
- 
-+import com.destroystokyo.paper.loottable.LootableBlockInventory; // Paper
-+import org.bukkit.Nameable; // Paper
- import org.bukkit.inventory.Inventory;
- import org.bukkit.loot.Lootable;
- import org.jetbrains.annotations.NotNull;
-@@ -7,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
- /**
-  * Represents a captured state of a chest.
-  */
-public interface Chest extends Container, Lootable, Lidded {
-+public interface Chest extends Container, LootableBlockInventory, Lidded { // Paper
- 
-     /**
-      * Gets the inventory of the chest block represented by this block state.
-diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java
-index 74cd194c9a98245dc52e7e352d7d6c046e1e5cf3..07af1a3f011d4b96275f919d302ac367198e923e 100644
--- a/src/main/java/org/bukkit/block/Dispenser.java
-+++ b/src/main/java/org/bukkit/block/Dispenser.java
-@@ -1,5 +1,6 @@
- package org.bukkit.block;
- 
-+import com.destroystokyo.paper.loottable.LootableBlockInventory;
- import org.bukkit.Nameable;
- import org.bukkit.loot.Lootable;
- import org.bukkit.projectiles.BlockProjectileSource;
-@@ -8,7 +9,7 @@ import org.jetbrains.annotations.Nullable;
- /**
-  * Represents a captured state of a dispenser.
-  */
-public interface Dispenser extends Container, Nameable, Lootable {
-+public interface Dispenser extends Container, Nameable, LootableBlockInventory { // Paper
- 
-     /**
-      * Gets the BlockProjectileSource object for the dispenser.
-diff --git a/src/main/java/org/bukkit/block/Dropper.java b/src/main/java/org/bukkit/block/Dropper.java
-index 424392fb5ed4628199b0e73689522aa3c90740cb..c76202321e29ad67597ca3017eb8d9baf6787383 100644
--- a/src/main/java/org/bukkit/block/Dropper.java
-+++ b/src/main/java/org/bukkit/block/Dropper.java
-@@ -1,11 +1,12 @@
- package org.bukkit.block;
- 
-+import com.destroystokyo.paper.loottable.LootableBlockInventory;
- import org.bukkit.loot.Lootable;
- 
- /**
-  * Represents a captured state of a dropper.
-  */
-public interface Dropper extends Container, Lootable {
-+public interface Dropper extends Container, LootableBlockInventory { // Paper
- 
-     /**
-      * Tries to drop a randomly selected item from the dropper's inventory,
-diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java
-index 58e493099810fb8d4705ecd49b4a5e1e1949b87b..7ade312f180b7e30871d3a3240c76325cc369c26 100644
--- a/src/main/java/org/bukkit/block/Hopper.java
-+++ b/src/main/java/org/bukkit/block/Hopper.java
-@@ -1,8 +1,9 @@
- package org.bukkit.block;
- 
-+import com.destroystokyo.paper.loottable.LootableBlockInventory;
- import org.bukkit.loot.Lootable;
- 
- /**
-  * Represents a captured state of a hopper.
-  */
-public interface Hopper extends Container, Lootable { }
-+public interface Hopper extends Container, LootableBlockInventory { } // Paper
-diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java
-index 387b2892886e1ccb2bd928e5111fb9bd41d777ab..5dc5318b0a451937228a8a059dfec1cd9de389a6 100644
--- a/src/main/java/org/bukkit/block/ShulkerBox.java
-+++ b/src/main/java/org/bukkit/block/ShulkerBox.java
-@@ -1,5 +1,6 @@
- package org.bukkit.block;
- 
-+import com.destroystokyo.paper.loottable.LootableBlockInventory;
- import org.bukkit.DyeColor;
- import org.bukkit.loot.Lootable;
- import org.jetbrains.annotations.Nullable;
-@@ -7,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
- /**
-  * Represents a captured state of a ShulkerBox.
-  */
-public interface ShulkerBox extends Container, Lootable, Lidded {
-+public interface ShulkerBox extends Container, LootableBlockInventory, Lidded { // Paper
- 
-     /**
-      * Get the {@link DyeColor} corresponding to this ShulkerBox
-diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
-index 937b99f8734d71b2ad33af142afbc251b81d9745..db69687a7ad4b18d17ab1677cae5d8dd4dcd3678 100644
--- a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
-+++ b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
-@@ -1,5 +1,6 @@
- package org.bukkit.entity.minecart;
- 
-+import com.destroystokyo.paper.loottable.LootableEntityInventory;
- import org.bukkit.entity.Minecart;
- import org.bukkit.inventory.InventoryHolder;
- import org.bukkit.loot.Lootable;
-@@ -7,7 +8,7 @@ import org.bukkit.loot.Lootable;
- /**
-  * Represents a Minecart with a Hopper inside it
-  */
-public interface HopperMinecart extends Minecart, InventoryHolder, Lootable {
-+public interface HopperMinecart extends Minecart, InventoryHolder, LootableEntityInventory {
- 
-     /**
-      * Checks whether or not this Minecart will pick up
-diff --git a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
-index 9ea403e6fd8e960d017660e0aec118abeda2c42b..238d118f7788b13cd86b7e9ea3a0fc38e2e09715 100644
--- a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
-+++ b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java
-@@ -1,5 +1,6 @@
- package org.bukkit.entity.minecart;
- 
-+import com.destroystokyo.paper.loottable.LootableEntityInventory;
- import org.bukkit.entity.Minecart;
- import org.bukkit.inventory.InventoryHolder;
- import org.bukkit.loot.Lootable;
-@@ -9,5 +10,5 @@ import org.bukkit.loot.Lootable;
-  * minecarts} have their own inventory that can be accessed using methods
-  * from the {@link InventoryHolder} interface.
-  */
-public interface StorageMinecart extends Minecart, InventoryHolder, Lootable {
-+public interface StorageMinecart extends Minecart, InventoryHolder, LootableEntityInventory { // Paper
- }
-diff --git a/src/main/java/org/bukkit/loot/Lootable.java b/src/main/java/org/bukkit/loot/Lootable.java
-index 24a3d989db3bc67e7afe8459a3d4bb132f448ea7..901db852498e0658c79a57582508dab29bf0a798 100644
--- a/src/main/java/org/bukkit/loot/Lootable.java
-+++ b/src/main/java/org/bukkit/loot/Lootable.java
-@@ -36,6 +36,34 @@ public interface Lootable {
-     @Nullable
-     LootTable getLootTable();
- 
-+    // Paper start
-+    /**
-+     * Set the loot table and seed for a container or entity at the same time.
-+     *
-+     * @param table the Loot Table this {@link org.bukkit.block.Container} or {@link org.bukkit.entity.Mob} will have.
-+     * @param seed the seed to used to generate loot. Default is 0.
-+     */
-+    default void setLootTable(@Nullable LootTable table, long seed) {
-+        setLootTable(table);
-+        setSeed(seed);
-+    }
-+
-+    /**
-+     * Returns whether or not this object has a Loot Table
-+     * @return Has a loot table
-+     */
-+    default boolean hasLootTable() {
-+        return getLootTable() != null;
-+    }
-+
-+    /**
-+     * Clears the associated Loot Table to this object
-+     */
-+    default void clearLootTable() {
-+        setLootTable(null);
-+    }
-+    // Paper end
-+
-     /**
-      * Set the seed used when this Loot Table generates loot.
-      *
@@ -1,123 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaBlend <whizkid3000@hotmail.com>
-Date: Sun, 16 Oct 2016 23:19:34 -0700
-Subject: [PATCH] Add EntityZapEvent
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..3b725a489008d333630af166d2be5fc48168a6b9
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
-@@ -0,0 +1,65 @@
-+package com.destroystokyo.paper.event.entity;
-+
-+import org.apache.commons.lang.Validate;
-+import org.bukkit.entity.Entity;
-+import org.bukkit.entity.LightningStrike;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.entity.EntityEvent;
-+import org.bukkit.event.entity.EntityTransformEvent;
-+
-+import java.util.Collections;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ *  Fired when lightning strikes an entity
-+ */
-+public class EntityZapEvent extends EntityTransformEvent implements Cancellable {
-+    private static final HandlerList handlers = new HandlerList();
-+    private boolean cancelled;
-+    @NotNull private final LightningStrike bolt;
-+
-+    public EntityZapEvent(@NotNull final Entity entity, @NotNull final LightningStrike bolt, @NotNull final Entity replacementEntity) {
-+        super(entity, Collections.singletonList(replacementEntity), TransformReason.LIGHTNING);
-+        Validate.notNull(bolt);
-+        Validate.notNull(replacementEntity);
-+        this.bolt = bolt;
-+    }
-+
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
-+    }
-+
-+    /**
-+     * Gets the lightning bolt that is striking the entity.
-+     * @return The lightning bolt responsible for this event
-+     */
-+    @NotNull
-+    public LightningStrike getBolt() {
-+        return bolt;
-+    }
-+
-+    /**
-+     * Gets the entity that will replace the struck entity.
-+     * @return The entity that will replace the struck entity
-+     */
-+    @NotNull
-+    public Entity getReplacementEntity() {
-+        return getTransformedEntity();
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-index 0e0ed93b568fd2c0d8f6e359c31dc29cb0fa71c2..d3949edfc736b3d67a627ef378748b374769e183 100644
--- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-@@ -2,6 +2,7 @@ package org.bukkit.event.entity;
- 
- import java.util.Collections;
- import org.bukkit.entity.Entity;
-+import com.destroystokyo.paper.event.entity.EntityZapEvent;
- import org.bukkit.entity.LightningStrike;
- import org.bukkit.entity.Pig;
- import org.bukkit.entity.PigZombie;
-@@ -12,14 +13,14 @@ import org.jetbrains.annotations.NotNull;
- /**
-  * Stores data for pigs being zapped
-  */
-public class PigZapEvent extends EntityTransformEvent implements Cancellable {
-    private static final HandlerList handlers = new HandlerList();
-+public class PigZapEvent extends EntityZapEvent implements Cancellable {
-+    //private static final HandlerList handlers = new HandlerList();
-     private boolean canceled;
-     private final PigZombie pigzombie;
-     private final LightningStrike bolt;
- 
-     public PigZapEvent(@NotNull final Pig pig, @NotNull final LightningStrike bolt, @NotNull final PigZombie pigzombie) {
-        super(pig, Collections.singletonList((Entity) pigzombie), TransformReason.LIGHTNING);
-+        super(pig, bolt, pigzombie);
-         this.bolt = bolt;
-         this.pigzombie = pigzombie;
-     }
-@@ -63,6 +64,8 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
-         return pigzombie;
-     }
- 
-+    // Paper start
-+    /*
-     @NotNull
-     @Override
-     public HandlerList getHandlers() {
-@@ -73,4 +76,6 @@ public class PigZapEvent extends EntityTransformEvent implements Cancellable {
-     public static HandlerList getHandlerList() {
-         return handlers;
-     }
-+    */
-+    // Paper end
- }
@@ -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 1380a26f34a9d2b162e88fbea14b17118945643c..7b3a0c958b4b4bffb6c19a0e4d3bf4824f8db237 100644
--- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1759,6 +1759,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 4c201097ef98f545acb604fa72d56413553e4d4f..6f4817af249e258905c97f4dac3d2f33804bdfc5 100644
--- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1551,4 +1551,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 adfc7aae2c0f49bbcdd358e83b04a0cf078a7d52..460fda05a62b12db2edcfb7ea8b2a5dd8e4b110d 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
-+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -297,4 +297,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 c62da4131b17e66892678e8b618fb9ba3de93b56..0c7ba0718de2b93d013968ca0fec34ffd423990f 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, ChatColor.GREEN + "Permissions successfully reloaded.");
-                 return true;
-+            } else if ("commands".equalsIgnoreCase(args[0])) {
-+                if (Bukkit.getServer().reloadCommandAliases()) {
-+                    Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Command aliases successfully reloaded.");
-+                } else {
-+                    Command.broadcastCommandMessage(sender, ChatColor.RED + "An error occurred while trying to reload command aliases.");
-+                }
-+                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
-     }
- }
@@ -1,86 +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 ddbe5734ac0f905b0c388e30f17a281530b82262..6bb0bb8052c12c5a215abf4bd9602fbefc769523 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.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;
-@@ -616,6 +617,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
-      *
-@@ -643,9 +677,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);
-     }
-@@ -1728,6 +1764,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}
-@@ -1740,6 +1777,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}
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Wed, 21 Dec 2016 11:47:25 -0600
-Subject: [PATCH] Add API methods to control if armour stands can move
-
-
-diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index e94ec567fbda93f4f5783f84b4b5136b309d0eab..fddc063798edc8084ca695578a47485204a7f3cd 100644
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
-+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
-@@ -344,4 +344,21 @@ public interface ArmorStand extends LivingEntity {
-          */
-         ADDING;
-     }
-+    // Paper start
-+    /**
-+     * Tests if this armor stand can move.
-+     *
-+     * <p>The default value is {@code true}.</p>
-+     *
-+     * @return {@code true} if this armour stand can move, {@code false} otherwise
-+     */
-+    boolean canMove();
-+
-+    /**
-+     * Sets if this armor stand can move.
-+     *
-+     * @param move {@code true} if this armour stand can move, {@code false} otherwise
-+     */
-+    void setCanMove(boolean move);
-+    // Paper end
- }
@@ -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 6b5dbe4ea711807a1944cfe2aae2ce415d4f2638..789e070f6aee83e4b6426def784e05df98e1bc65 100644
--- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -40,6 +40,33 @@ import org.jetbrains.annotations.Nullable;
-  */
- public interface World extends PluginMessageRecipient, Metadatable, 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
-      *
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Sat, 21 Jan 2017 17:03:10 -0600
-Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check
-
-
-diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java
-index 7e8f5649ce0eb0090899514b1e228601eb644613..afb7b136b461202026290624836446cff9f9e45d 100644
--- a/src/main/java/org/bukkit/WorldBorder.java
-+++ b/src/main/java/org/bukkit/WorldBorder.java
-@@ -117,4 +117,18 @@ public interface WorldBorder {
-      * @return if this location is inside the border or not
-      */
-     public boolean isInside(@NotNull Location location);
-+
-+    // Paper start
-+    /**
-+     * Checks if the location is within the boundaries of this border.
-+     * 
-+     * @param location specific location to check
-+     * @return true if the location is within the bounds of this border, false otherwise.
-+     * @deprecated use {@link #isInside(Location)} for an upstream compatible replacement
-+     */
-+    @Deprecated
-+    public default boolean isInBounds(@NotNull Location location) {
-+        return this.isInside(location);
-+    }
-+    // Paper end
- }
@@ -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 7b3a0c958b4b4bffb6c19a0e4d3bf4824f8db237..e2052baa65ed3525a89b26c065b3e2a58916ab99 100644
--- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1768,6 +1768,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 6f4817af249e258905c97f4dac3d2f33804bdfc5..8fd026e4ffcdf009365ae04b87f7559bed32c7d3 100644
--- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1553,4 +1553,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 03bdc1622791e1206406c87065978688d602e39e..7c80dc54776d0d66f7816b77136f6dbd9b801704 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 {
-         Validate.notNull(args, "Arguments cannot be null");
-         Validate.notNull(alias, "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();
-         }
- 
@@ -1,46 +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 javadoc warnings and errors
-
-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/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 3f68baef538098d9ce66b91195b6fa17f26f0d78..e71b048e53ee2db4e768eea2ddf19b00a14d2484 100644
--- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -634,7 +634,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/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
-index 1b2267f4e8ebded198773ec80e2bff2c861c7084..1a58734d919fae247eeb85dd785fd59990856505 100644
--- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
-@@ -78,7 +78,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
-      *
-      * @return Location the player moved to
-      */
-    @Nullable
-+    @NotNull // Paper
-     public Location getTo() {
-         return to;
-     }
-diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-index 91afd844dafec4ed9ab9e2e16b220ffbd35e7495..1e45c9078ffffe9d3c25538fdd433780ae751270 100644
--- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
-+++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-@@ -106,7 +106,7 @@ public interface PlayerInventory extends Inventory {
-      *
-      * @return the ItemStack in the given slot
-      */
-    @NotNull
-+    @Nullable
-     public ItemStack getItem(@NotNull EquipmentSlot slot);
- 
-     /**
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 5 May 2017 03:57:08 -0500
-Subject: [PATCH] Item#canEntityPickup
-
-
-diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index 3f2736fbddd8661e764bc2f8d0499bd13ca91df5..c404a5b8efea7c780db5ddae19456753808abb3d 100644
--- a/src/main/java/org/bukkit/entity/Item.java
-+++ b/src/main/java/org/bukkit/entity/Item.java
-@@ -75,4 +75,20 @@ public interface Item extends Entity {
-      */
-     @Nullable
-     public UUID getThrower();
-+
-+    // Paper Start
-+    /**
-+     * Gets if non-player entities can pick this Item up
-+     *
-+     * @return True if non-player entities can pickup
-+     */
-+     public boolean canMobPickup();
-+
-+    /**
-+     * Sets if non-player entities can pick this Item up
-+     *
-+     * @param canMobPickup True to allow non-player entity pickup
-+     */
-+    public void setCanMobPickup(boolean canMobPickup);
-+    // Paper end
- }
@@ -1,126 +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..d5632d352590dec6982a372b285a8d4a332fa589
--- /dev/null
-+++ b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java
-@@ -0,0 +1,114 @@
-+package org.bukkit.event.command;
-+
-+import net.kyori.adventure.text.Component;
-+import org.bukkit.Bukkit;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.Event;
-+
-+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 : Bukkit.getUnsafe().legacyComponentSerializer().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 : Bukkit.getUnsafe().legacyComponentSerializer().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 : Bukkit.getUnsafe().legacyComponentSerializer().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;
-+    }
-+}
-+
@@ -1,351 +0,0 @@
-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..2ef9a7bd55e2c9cf8cb20d5f77282676ae11181f
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
-@@ -0,0 +1,177 @@
-+package com.destroystokyo.paper.profile;
-+
-+import java.util.Collection;
-+import java.util.Set;
-+import java.util.UUID;
-+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 {
-+
-+    /**
-+     * @return The players name, if set
-+     */
-+    @Nullable
-+    String getName();
-+
-+    /**
-+     * Sets this profiles Name
-+     *
-+     * @param name The new Name
-+     * @return The previous Name
-+     */
-+    @NotNull
-+    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
-+    UUID setId(@Nullable UUID uuid);
-+
-+    /**
-+     * @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);
-+
-+    /**
-+     * Whether or not this Profile has textures associated to it
-+     * @return If 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 e2052baa65ed3525a89b26c065b3e2a58916ab99..39942b4c5683f2dcc40be5a23af36a3bb32badb1 100644
--- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1778,6 +1778,40 @@ public final class Bukkit {
-     public static boolean suggestPlayerNamesWhenNullTabCompletions() {
-         return server.suggestPlayerNamesWhenNullTabCompletions();
-     }
-+
-+    /**
-+     * Creates a PlayerProfile for the specified uuid, with name as null
-+     * @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
-+     * @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.
-+     *
-+     * @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);
-+    }
-     // Paper end
- 
-     @NotNull
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8fd026e4ffcdf009365ae04b87f7559bed32c7d3..0c1fbaee08cb614dfdd1de0200dfa7fa351fc52d 100644
--- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1562,5 +1562,33 @@ 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
-+     * @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
-+     * @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.
-+     *
-+     * @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);
-     // Paper end
- }
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 17 Jun 2017 15:04:51 -0400
-Subject: [PATCH] Shoulder Entities Release API
-
-
-diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 72178c3036f567ceaf15016978a9737eb9c4afc4..d212d5123b6294f7873d72f125505a006c290b05 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
-+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -300,6 +300,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
-      */
-     public int getExpToLevel();
- 
-+    // Paper start
-+    /**
-+     * If there is an Entity on this entities left shoulder, it will be released to the world and returned.
-+     * If no Entity is released, null will be returned.
-+     *
-+     * @return The released entity, or null
-+     */
-+    @Nullable
-+    public Entity releaseLeftShoulderEntity();
-+
-+    /**
-+     * If there is an Entity on this entities left shoulder, it will be released to the world and returned.
-+     * If no Entity is released, null will be returned.
-+     *
-+     * @return The released entity, or null
-+     */
-+    @Nullable
-+    public Entity releaseRightShoulderEntity();
-+    // Paper end
-+
-     /**
-      * Gets the current cooldown for a player's attack.
-      *
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Sun, 18 Jun 2017 18:17:05 -0500
-Subject: [PATCH] Entity#fromMobSpawner()
-
-
-diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index e9d0d507b47b0347b975b1a83f5ae70dca5587b8..feb9507a972bf797144a01adeeaac83ec2bd165a 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
-+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -619,5 +619,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
-      */
-     @Nullable
-     Location getOrigin();
-+
-+    /**
-+     * Returns whether this entity was spawned from a mob spawner.
-+     *
-+     * @return True if entity spawned from a mob spawner
-+     */
-+    boolean fromMobSpawner();
-     // Paper end
- }
@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 4 May 2016 23:55:48 -0400
-Subject: [PATCH] ensureServerConversions API
-
-This will take a Bukkit ItemStack and run it through any conversions a server process would perform on it,
-to ensure it meets latest minecraft expectations.
-
-diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 6cc4bad2ecd19f44a680ff03cbfb99d48ea5c337..42551f8aa6666a6144815b619327c6d8f3c3776b 100644
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
-+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
-@@ -160,5 +160,17 @@ public interface ItemFactory {
-      */
-     @NotNull
-     net.kyori.adventure.text.Component displayName(@NotNull ItemStack itemStack);
-+
-+    /**
-+     * Minecraft updates are converting simple item stacks into more complex NBT oriented Item Stacks.
-+     *
-+     * Use this method to to ensure any desired data conversions are processed.
-+     * The input itemstack will not be the same as the returned itemstack.
-+     *
-+     * @param item The item to process conversions on
-+     * @return A potentially Data Converted ItemStack
-+     */
-+    @NotNull
-+    ItemStack ensureServerConversions(@NotNull ItemStack item);
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index a15abec467bac70116a6fc21a300d4930b909f15..f9d226962f16821d07ac80f1bf69cb01a5de2654 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
-+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -536,7 +536,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
-             }
-         }
- 
-        return result;
-+        return result.ensureServerConversions(); // Paper
-     }
- 
-     /**
-@@ -611,5 +611,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
-     public @NotNull net.kyori.adventure.text.Component displayName() {
-         return Bukkit.getServer().getItemFactory().displayName(this);
-     }
-+
-+    /**
-+     * Minecraft updates are converting simple item stacks into more complex NBT oriented Item Stacks.
-+     *
-+     * Use this method to to ensure any desired data conversions are processed.
-+     * The input itemstack will not be the same as the returned itemstack.
-+     *
-+     * @return A potentially Data Converted ItemStack
-+     */
-+    @NotNull
-+    public ItemStack ensureServerConversions() {
-+        return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
-+    }
-     // Paper end
- }
@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 4 May 2016 23:55:48 -0400
-Subject: [PATCH] Add getI18NDisplayName API
-
-Gets the Display name as seen in the Client.
-Currently the server only supports the English language. To override this,
-You must replace the language file embedded in the server jar.
-
-diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 44a858490f4db37f979fd487ed7a5b2b8b7f1a3f..3fd56a95de7d4cbeaf5d8554fbc7127a627cb977 100644
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
-+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
-@@ -172,5 +172,16 @@ public interface ItemFactory {
-      */
-     @NotNull
-     ItemStack ensureServerConversions(@NotNull ItemStack item);
-+
-+    /**
-+     * Gets the Display name as seen in the Client.
-+     * Currently the server only supports the English language. To override this,
-+     * You must replace the language file embedded in the server jar.
-+     *
-+     * @param item Item to return Display name of
-+     * @return Display name of Item
-+     */
-+    @Nullable
-+    String getI18NDisplayName(@Nullable ItemStack item);
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 47d8611221967d32b654ddac0fbf0e405ef62352..82bd3e6701dbd7df9f0f8c3801c5ae1baba4eec5 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
-+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -624,5 +624,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
-     public ItemStack ensureServerConversions() {
-         return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
-     }
-+
-+    /**
-+     * Gets the Display name as seen in the Client.
-+     * Currently the server only supports the English language. To override this,
-+     * You must replace the language file embedded in the server jar.
-+     *
-+     * @return Display name of Item
-+     */
-+    @Nullable
-+    public String getI18NDisplayName() {
-+        return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
-+    }
-     // Paper end
- }
@@ -1,157 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 3 Jul 2017 18:11:34 -0500
-Subject: [PATCH] ProfileWhitelistVerifyEvent
-
-Fires when the server is validating if a player is whitelisted.
-
-Allows you to do dynamic whitelisting and change of kick message
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..8a259ab49ea79673b6da9e4e2aaecec67469994e
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java
-@@ -0,0 +1,142 @@
-+/*
-+ * Copyright (c) 2017 - Daniel Ennis (Aikar) - MIT License
-+ *
-+ *  Permission is hereby granted, free of charge, to any person obtaining
-+ *  a copy of this software and associated documentation files (the
-+ *  "Software"), to deal in the Software without restriction, including
-+ *  without limitation the rights to use, copy, modify, merge, publish,
-+ *  distribute, sublicense, and/or sell copies of the Software, and to
-+ *  permit persons to whom the Software is furnished to do so, subject to
-+ *  the following conditions:
-+ *
-+ *  The above copyright notice and this permission notice shall be
-+ *  included in all copies or substantial portions of the Software.
-+ *
-+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+package com.destroystokyo.paper.event.profile;
-+
-+import com.destroystokyo.paper.profile.PlayerProfile;
-+import net.kyori.adventure.text.Component;
-+import org.bukkit.Bukkit;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.HandlerList;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * Fires when the server needs to verify if a player is whitelisted.
-+ *
-+ * Plugins may override/control the servers whitelist with this event,
-+ * and dynamically change the kick message.
-+ */
-+public class ProfileWhitelistVerifyEvent extends Event {
-+    private static final HandlerList handlers = new HandlerList();
-+    @NotNull private final PlayerProfile profile;
-+    private final boolean whitelistEnabled;
-+    private boolean whitelisted;
-+    private final boolean isOp;
-+    @Nullable private Component kickMessage;
-+
-+    @Deprecated
-+    public ProfileWhitelistVerifyEvent(@NotNull final PlayerProfile profile, boolean whitelistEnabled, boolean whitelisted, boolean isOp, @Nullable String kickMessage) {
-+        this(profile, whitelistEnabled, whitelisted, isOp, kickMessage == null ? null : Bukkit.getUnsafe().legacyComponentSerializer().deserialize(kickMessage));
-+    }
-+
-+    public ProfileWhitelistVerifyEvent(@NotNull final PlayerProfile profile, boolean whitelistEnabled, boolean whitelisted, boolean isOp, @Nullable Component kickMessage) {
-+        this.profile = profile;
-+        this.whitelistEnabled = whitelistEnabled;
-+        this.whitelisted = whitelisted;
-+        this.isOp = isOp;
-+        this.kickMessage = kickMessage;
-+    }
-+
-+    /**
-+     * @return the currently planned message to send to the user if they are not whitelisted
-+     * @deprecated use {@link #kickMessage()}
-+     */
-+    @Deprecated
-+    @Nullable
-+    public String getKickMessage() {
-+        return this.kickMessage == null ? null : Bukkit.getUnsafe().legacyComponentSerializer().serialize(kickMessage);
-+    }
-+
-+    /**
-+     * @param kickMessage The message to send to the player on kick if not whitelisted. May set to null to use the server configured default
-+     * @deprecated Use {@link #kickMessage(Component)}
-+     */
-+    @Deprecated
-+    public void setKickMessage(@Nullable String kickMessage) {
-+        this.kickMessage(kickMessage == null ? null : Bukkit.getUnsafe().legacyComponentSerializer().deserialize(kickMessage));
-+    }
-+
-+    /**
-+     * @return the currently planned message to send to the user if they are not whitelisted
-+     */
-+    @Nullable
-+    public Component kickMessage() {
-+        return this.kickMessage;
-+    }
-+
-+    /**
-+     * @param kickMessage The message to send to the player on kick if not whitelisted. May set to null to use the server configured default
-+     */
-+    public void kickMessage(@Nullable Component kickMessage) {
-+        this.kickMessage = kickMessage;
-+    }
-+
-+    /**
-+     * @return The profile of the player trying to connect
-+     */
-+    @NotNull
-+    public PlayerProfile getPlayerProfile() {
-+        return profile;
-+    }
-+
-+    /**
-+     * @return Whether the player is whitelisted to play on this server (whitelist may be off is why its true)
-+     */
-+    public boolean isWhitelisted() {
-+        return whitelisted;
-+    }
-+
-+    /**
-+     * Changes the players whitelisted state. false will deny the login
-+     * @param whitelisted The new whitelisted state
-+     */
-+    public void setWhitelisted(boolean whitelisted) {
-+        this.whitelisted = whitelisted;
-+    }
-+
-+    /**
-+     * @return if the player obtained whitelist status by having op
-+     */
-+    public boolean isOp() {
-+        return isOp;
-+    }
-+
-+    /**
-+     * @return if the server even has whitelist on
-+     */
-+    public boolean isWhitelistEnabled() {
-+        return whitelistEnabled;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Mon, 31 Jul 2017 01:49:43 -0500
-Subject: [PATCH] LivingEntity#setKiller
-
-
-diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 45e9f585c3e522ecf94a6bc42cdc190e1a191a5c..33fffda7c8b05cde3c95623937e7eb6c8b628ec6 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
-+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -279,6 +279,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-     @Nullable
-     public Player getKiller();
- 
-+    // Paper start
-+    /**
-+     * Sets the player identified as the killer of the living entity.
-+     *
-+     * @param killer player
-+     */
-+    public void setKiller(@Nullable Player killer);
-+    // Paper end
-+
-     /**
-      * Adds the given {@link PotionEffect} to the living entity.
-      *
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Minecrell <minecrell@minecrell.net>
-Date: Thu, 21 Sep 2017 16:14:13 +0200
-Subject: [PATCH] Handle plugin prefixes in implementation logging
- configuration
-
-Currently, plugin prefixes are prepended to the log message in
-the PluginLogger before passing the message to the underlying
-logging framework. This is bad design because they need to be
-stripped manually when using custom appenders to log messages
-in a different format.
-
-Additionally, it makes integration of alternative logging APIs hard
-because all logging must go through the PluginLogger. Avoid using
-PluginLogger and create a regular logger using the plugin name.
-The implementation should handle plugin prefixes by displaying
-logger names when appropriate.
-
-diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 2231900549607a0917dd04e8b433c027b846cef9..bb2e55e97bf887a28cac7d4f9a0a23960d22cf56 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-+++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-@@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase {
-     private boolean naggable = true;
-     private FileConfiguration newConfig = null;
-     private File configFile = null;
-    private PluginLogger logger = null;
-+    private Logger logger = null; // Paper - PluginLogger -> Logger
- 
-     public JavaPlugin() {
-         final ClassLoader classLoader = this.getClass().getClassLoader();
-@@ -276,7 +276,8 @@ public abstract class JavaPlugin extends PluginBase {
-         this.dataFolder = dataFolder;
-         this.classLoader = classLoader;
-         this.configFile = new File(dataFolder, "config.yml");
-        this.logger = new PluginLogger(this);
-+        // Paper - Handle plugin prefix in implementation
-+        this.logger = Logger.getLogger(description.getPrefix() != null ? description.getPrefix() : description.getName());
-     }
- 
-     /**
@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Minecrell <minecrell@minecrell.net>
-Date: Thu, 21 Sep 2017 16:33:12 +0200
-Subject: [PATCH] Allow plugins to use SLF4J for logging
-
-SLF4J is a commonly used abstraction for various logging frameworks
-such as java.util.logging (JUL) or Log4j. Currently, plugins are
-required to do all their logging using the provided JUL logger.
-This is annoying for plugins that target multiple platforms or when
-using libraries that log messages using SLF4J.
-
-Expose SLF4J as optional logging API for plugins, so they can use
-it without having to shade it in the plugin and going through
-several layers of logging abstraction.
-
-diff --git a/pom.xml b/pom.xml
-index 7ec7e6047193a6b390d24f6d2722e35d1d36830d..6b71d9a397dd5b72320402a47b8e7197d24e061c 100644
--- a/pom.xml
-+++ b/pom.xml
-@@ -144,6 +144,13 @@
-             <version>20.1.0</version>
-             <scope>provided</scope>
-         </dependency>
-+        <!-- Paper - Add SLF4J -->
-+        <dependency>
-+            <groupId>org.slf4j</groupId>
-+            <artifactId>slf4j-api</artifactId>
-+            <version>1.7.25</version>
-+            <scope>compile</scope>
-+        </dependency>
-         <!-- testing -->
-         <dependency>
-             <groupId>junit</groupId>
-diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
-index febfec6efafd76bb59b4b43aa223af16f73339b4..79890c68f1ad31f951dfdbd9a16dac500ec58c40 100644
--- a/src/main/java/org/bukkit/plugin/Plugin.java
-+++ b/src/main/java/org/bukkit/plugin/Plugin.java
-@@ -166,6 +166,13 @@ public interface Plugin extends TabExecutor {
-     @NotNull
-     public Logger getLogger();
- 
-+    // Paper start - Add SLF4J logger
-+    @NotNull
-+    default org.slf4j.Logger getSLF4JLogger() {
-+        return org.slf4j.LoggerFactory.getLogger(getLogger().getName());
-+    }
-+    // Paper end
-+
-     /**
-      * Returns the name of the plugin.
-      * <p>
@@ -1,117 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Minecrell <minecrell@minecrell.net>
-Date: Thu, 21 Sep 2017 19:41:20 +0200
-Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin
- logger
-
-Essentials uses a custom logger name ("Essentials") instead of the
-plugin logger. Log messages are redirected to the plugin logger by
-setting the parent of the "Essentials" logger to the plugin logger.
-
-With our changes, the plugin logger is now also called "Essentials",
-resulting in an infinite loop. Make sure plugins can't change the
-parent of the plugin logger to avoid this.
-
-diff --git a/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..76f2cb9cd99cad2a9484eab2becd8c36f1dd91b3
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java
-@@ -0,0 +1,41 @@
-+package com.destroystokyo.paper.utils;
-+
-+import org.bukkit.plugin.PluginDescriptionFile;
-+
-+import java.util.logging.Level;
-+import java.util.logging.LogManager;
-+import java.util.logging.Logger;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Prevents plugins (e.g. Essentials) from changing the parent of the plugin logger.
-+ */
-+public class PaperPluginLogger extends Logger {
-+
-+    @NotNull
-+    public static Logger getLogger(@NotNull PluginDescriptionFile description) {
-+        Logger logger = new PaperPluginLogger(description);
-+        if (!LogManager.getLogManager().addLogger(logger)) {
-+            // Disable this if it's going to happen across reloads anyways...
-+            //logger.log(Level.WARNING, "Could not insert plugin logger - one was already found: {}", LogManager.getLogManager().getLogger(this.getName()));
-+            logger = LogManager.getLogManager().getLogger(description.getPrefix() != null ? description.getPrefix() : description.getName());
-+        }
-+
-+        return logger;
-+    }
-+
-+    private PaperPluginLogger(@NotNull PluginDescriptionFile description) {
-+        super(description.getPrefix() != null ? description.getPrefix() : description.getName(), null);
-+    }
-+
-+    @Override
-+    public void setParent(@NotNull Logger parent) {
-+        if (getParent() != null) {
-+            warning("Ignoring attempt to change parent of plugin logger");
-+        } else {
-+            this.log(Level.FINE, "Setting plugin logger parent to {0}", parent);
-+            super.setParent(parent);
-+        }
-+    }
-+
-+}
-diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index bb2e55e97bf887a28cac7d4f9a0a23960d22cf56..04fa3991f6ce4e9dad804f28fc6c947695857089 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-+++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-@@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase {
-     private boolean naggable = true;
-     private FileConfiguration newConfig = null;
-     private File configFile = null;
-    private Logger logger = null; // Paper - PluginLogger -> Logger
-+    Logger logger = null; // Paper - PluginLogger -> Logger, package-private
- 
-     public JavaPlugin() {
-         final ClassLoader classLoader = this.getClass().getClassLoader();
-@@ -276,8 +276,11 @@ public abstract class JavaPlugin extends PluginBase {
-         this.dataFolder = dataFolder;
-         this.classLoader = classLoader;
-         this.configFile = new File(dataFolder, "config.yml");
-        // Paper - Handle plugin prefix in implementation
-        this.logger = Logger.getLogger(description.getPrefix() != null ? description.getPrefix() : description.getName());
-+        // Paper start
-+        if (this.logger == null) {
-+            this.logger = com.destroystokyo.paper.utils.PaperPluginLogger.getLogger(this.description);
-+        }
-+        // Paper end
-     }
- 
-     /**
-diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 13100c688bfccb826b3072aaa92901f8634cf9ab..b9766b9b47547c400ed075f1635bb1461cb5e860 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -44,6 +44,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
-     private JavaPlugin pluginInit;
-     private IllegalStateException pluginState;
-     private final Set<String> seenIllegalAccess = Collections.newSetFromMap(new ConcurrentHashMap<>());
-+    private java.util.logging.Logger logger; // Paper - add field
- 
-     static {
-         ClassLoader.registerAsParallelCapable();
-@@ -62,6 +63,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
-         this.url = file.toURI().toURL();
-         this.libraryLoader = libraryLoader;
- 
-+        this.logger = com.destroystokyo.paper.utils.PaperPluginLogger.getLogger(description); // Paper - Register logger early
-+
-         try {
-             Class<?> jarClass;
-             try {
-@@ -222,6 +225,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
-         pluginState = new IllegalStateException("Initial initialization");
-         this.pluginInit = javaPlugin;
- 
-+        javaPlugin.logger = this.logger; // Paper - set logger
-         javaPlugin.init(loader, loader.server, description, dataFolder, file, this);
-     }
- }
@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Minecrell <minecrell@minecrell.net>
-Date: Tue, 10 Oct 2017 18:44:42 +0200
-Subject: [PATCH] Expose client protocol version and virtual host
-
-Add a NetworkClient interface that provides access to:
-  - The socket address
-  - The protocol version
-  - The virtual host (the hostname/port the client used to connect
-    to the server)
-
-diff --git a/src/main/java/com/destroystokyo/paper/network/NetworkClient.java b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b851aa04f
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
-@@ -0,0 +1,41 @@
-+package com.destroystokyo.paper.network;
-+
-+import java.net.InetSocketAddress;
-+
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * Represents a client connected to the server.
-+ */
-+public interface NetworkClient {
-+
-+    /**
-+     * Returns the socket address of the client.
-+     *
-+     * @return The client's socket address
-+     */
-+    @NotNull
-+    InetSocketAddress getAddress();
-+
-+    /**
-+     * Returns the protocol version of the client.
-+     *
-+     * @return The client's protocol version, or {@code -1} if unknown
-+     * @see <a href="http://wiki.vg/Protocol_version_numbers">List of protocol
-+     *     version numbers</a>
-+     */
-+    int getProtocolVersion();
-+
-+    /**
-+     * Returns the virtual host the client is connected to.
-+     *
-+     * <p>The virtual host refers to the hostname/port the client used to
-+     * connect to the server.</p>
-+     *
-+     * @return The client's virtual host, or {@code null} if unknown
-+     */
-+    @Nullable
-+    InetSocketAddress getVirtualHost();
-+
-+}
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9cf7adf244335ac7dccbdf11f605a8c6910f7414..04f1a6513711dde8576c9b5c2b04619c56b48d8a 100644
--- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable;
- /**
-  * Represents a player, connected or not
-  */
-public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginMessageRecipient, net.kyori.adventure.identity.Identified { // Paper
-+public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginMessageRecipient, net.kyori.adventure.identity.Identified, com.destroystokyo.paper.network.NetworkClient { // Paper
- 
-     // Paper start
-     @Override
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 6 Nov 2017 21:10:01 -0500
-Subject: [PATCH] API to get a BlockState without a snapshot
-
-This allows you to get a BlockState without creating a snapshot, operating
-on the real tile entity.
-
-This is useful for where performance is needed
-
-diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 0cfad6f84eda6f7bfa1fae041341ccb1021b157d..e89c8079625525667f496c06207da655fe43d749 100644
--- a/src/main/java/org/bukkit/block/Block.java
-+++ b/src/main/java/org/bukkit/block/Block.java
-@@ -269,6 +269,16 @@ public interface Block extends Metadatable {
-     @NotNull
-     BlockState getState();
- 
-+    // Paper start
-+    /**
-+     * @see #getState() optionally disables use of snapshot, to operate on real block data
-+     * @param useSnapshot if this block is a TE, should we create a fully copy of the TileEntity
-+     * @return BlockState with the current state of this block
-+     */
-+    @NotNull
-+    BlockState getState(boolean useSnapshot);
-+    // Paper end
-+
-     /**
-      * Returns the biome that this block resides in
-      *
@@ -1,266 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 26 Nov 2017 13:17:09 -0500
-Subject: [PATCH] AsyncTabCompleteEvent
-
-Let plugins be able to control tab completion of commands and chat async.
-
-This will be useful for frameworks like ACF so we can define async safe completion handlers,
-and avoid going to main for tab completions.
-
-Especially useful if you need to query a database in order to obtain the results for tab
-completion, such as offline players.
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..619ed37169c126a8c75d02699a04728bac49d10d
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
-@@ -0,0 +1,177 @@
-+/*
-+ * Copyright (c) 2017 Daniel Ennis (Aikar) MIT License
-+ *
-+ *  Permission is hereby granted, free of charge, to any person obtaining
-+ *  a copy of this software and associated documentation files (the
-+ *  "Software"), to deal in the Software without restriction, including
-+ *  without limitation the rights to use, copy, modify, merge, publish,
-+ *  distribute, sublicense, and/or sell copies of the Software, and to
-+ *  permit persons to whom the Software is furnished to do so, subject to
-+ *  the following conditions:
-+ *
-+ *  The above copyright notice and this permission notice shall be
-+ *  included in all copies or substantial portions of the Software.
-+ *
-+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+ *  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+ *  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+ *  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+package com.destroystokyo.paper.event.server;
-+
-+import com.google.common.collect.ImmutableList;
-+import org.apache.commons.lang.Validate;
-+import org.bukkit.Location;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.HandlerList;
-+
-+import java.util.ArrayList;
-+import java.util.List;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * Allows plugins to compute tab completion results asynchronously. If this event provides completions, then the standard synchronous process will not be fired to populate the results. However, the synchronous TabCompleteEvent will fire with the Async results.
-+ *
-+ * Only 1 process will be allowed to provide completions, the Async Event, or the standard process.
-+ */
-+public class AsyncTabCompleteEvent extends Event implements Cancellable {
-+    @NotNull private final CommandSender sender;
-+    @NotNull private final String buffer;
-+    private final boolean isCommand;
-+    @Nullable
-+    private final Location loc;
-+    @NotNull private List<String> completions;
-+    private boolean cancelled;
-+    private boolean handled = false;
-+    private boolean fireSyncHandler = true;
-+
-+    public AsyncTabCompleteEvent(@NotNull CommandSender sender, @NotNull List<String> completions, @NotNull String buffer, boolean isCommand, @Nullable Location loc) {
-+        super(true);
-+        this.sender = sender;
-+        this.completions = completions;
-+        this.buffer = buffer;
-+        this.isCommand = isCommand;
-+        this.loc = loc;
-+    }
-+
-+    /**
-+     * Get the sender completing this command.
-+     *
-+     * @return the {@link CommandSender} instance
-+     */
-+    @NotNull
-+    public CommandSender getSender() {
-+        return sender;
-+    }
-+
-+    /**
-+     * The list of completions which will be offered to the sender, in order.
-+     * This list is mutable and reflects what will be offered.
-+     *
-+     * If this collection is not empty after the event is fired, then
-+     * the standard process of calling {@link Command#tabComplete(CommandSender, String, String[])}
-+     * or current player names will not be called.
-+     *
-+     * @return a list of offered completions
-+     */
-+    @NotNull
-+    public List<String> getCompletions() {
-+        return completions;
-+    }
-+
-+    /**
-+     * Set the completions offered, overriding any already set.
-+     * If this collection is not empty after the event is fired, then
-+     * the standard process of calling {@link Command#tabComplete(CommandSender, String, String[])}
-+     * or current player names will not be called.
-+     *
-+     * The passed collection will be cloned to a new List. You must call {{@link #getCompletions()}} to mutate from here
-+     *
-+     * @param completions the new completions
-+     */
-+    public void setCompletions(@NotNull List<String> completions) {
-+        Validate.notNull(completions);
-+        this.completions = new ArrayList<>(completions);
-+    }
-+
-+    /**
-+     * Return the entire buffer which formed the basis of this completion.
-+     *
-+     * @return command buffer, as entered
-+     */
-+    @NotNull
-+    public String getBuffer() {
-+        return buffer;
-+    }
-+
-+    /**
-+     * @return True if it is a command being tab completed, false if it is a chat message.
-+     */
-+    public boolean isCommand() {
-+        return isCommand;
-+    }
-+
-+    /**
-+     * @return The position looked at by the sender, or null if none
-+     */
-+    @Nullable
-+    public Location getLocation() {
-+        return loc;
-+    }
-+
-+    /**
-+     * If true, the standard process of calling {@link Command#tabComplete(CommandSender, String, String[])}
-+     * or current player names will not be called.
-+     *
-+     * @return Is completions considered handled. Always true if completions is not empty.
-+     */
-+    public boolean isHandled() {
-+        return !completions.isEmpty() || handled;
-+    }
-+
-+    /**
-+     * Sets whether or not to consider the completion request handled.
-+     * If true, the standard process of calling {@link Command#tabComplete(CommandSender, String, String[])}
-+     * or current player names will not be called.
-+     *
-+     * @param handled if this completion should be marked as being handled
-+     */
-+    public void setHandled(boolean handled) {
-+        this.handled = handled;
-+    }
-+
-+    private static final HandlerList handlers = new HandlerList();
-+
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    /**
-+     * Will provide no completions, and will not fire the synchronous process
-+     * @param cancelled true if you wish to cancel this event
-+     */
-+    @Override
-+    public void setCancelled(boolean cancelled) {
-+        this.cancelled = cancelled;
-+    }
-+
-+    @NotNull
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
-index d1a9956a1573dab54c5ff2e5d67ca86cfe1dc01a..f96c4ba53ab41ea66d4f9a4d54eeabb63f992b58 100644
--- a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
-+++ b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
-@@ -1,5 +1,6 @@
- package org.bukkit.event.server;
- 
-+import java.util.ArrayList;
- import java.util.List;
- import org.apache.commons.lang.Validate;
- import org.bukkit.command.CommandSender;
-@@ -8,6 +9,7 @@ import org.bukkit.event.Event;
- import org.bukkit.event.HandlerList;
- import org.bukkit.event.player.PlayerCommandSendEvent;
- import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
- 
- /**
-  * Called when a {@link CommandSender} of any description (ie: player or
-@@ -29,6 +31,13 @@ public class TabCompleteEvent extends Event implements Cancellable {
-     private boolean cancelled;
- 
-     public TabCompleteEvent(@NotNull CommandSender sender, @NotNull String buffer, @NotNull List<String> completions) {
-+        // Paper start
-+        this(sender, buffer, completions, sender instanceof org.bukkit.command.ConsoleCommandSender || buffer.startsWith("/"), null);
-+    }
-+    public TabCompleteEvent(@NotNull CommandSender sender, @NotNull String buffer, @NotNull List<String> completions, boolean isCommand, @Nullable org.bukkit.Location location) {
-+        this.isCommand = isCommand;
-+        this.loc = location;
-+        // Paper end
-         Validate.notNull(sender, "sender");
-         Validate.notNull(buffer, "buffer");
-         Validate.notNull(completions, "completions");
-@@ -69,14 +78,35 @@ public class TabCompleteEvent extends Event implements Cancellable {
-         return completions;
-     }
- 
-+    // Paper start
-+    private final boolean isCommand;
-+    private final org.bukkit.Location loc;
-+    /**
-+     * @return True if it is a command being tab completed, false if it is a chat message.
-+     */
-+    public boolean isCommand() {
-+        return isCommand;
-+    }
-+
-+    /**
-+     * @return The position looked at by the sender, or null if none
-+     */
-+    @Nullable
-+    public org.bukkit.Location getLocation() {
-+        return loc;
-+    }
-+    // Paper end
-+
-     /**
-      * Set the completions offered, overriding any already set.
-      *
-+     * The passed collection will be cloned to a new List. You must call {{@link #getCompletions()}} to mutate from here
-+     *
-      * @param completions the new completions
-      */
-     public void setCompletions(@NotNull List<String> completions) {
-         Validate.notNull(completions);
-        this.completions = completions;
-+        this.completions = new ArrayList<>(completions); // Paper
-     }
- 
-     @Override
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 9 Dec 2017 12:40:25 -0500
-Subject: [PATCH] Display warning on deprecated recipe API
-
-Any plugin still using this API will result in the server saving an inconsistent UUID to player data files,
-which then triggers warnings such as "Tried to load unrecognized recipe: bukkit:9e5b92f5-e549-4f47-b0a8-9f89390ed77b removed now."
-on the players login.
-
-Plugin authors need to define a key to keep it consistent between server restarts.
-
-diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-index d74b3114f535e1e5e36ae007f1fe0522916a0362..d742c4058ba9aed4fbe1591fd755a06608b06e98 100644
--- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-+++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
-@@ -25,6 +25,7 @@ public class ShapedRecipe implements Recipe, Keyed {
-     public ShapedRecipe(@NotNull ItemStack result) {
-         Preconditions.checkArgument(result.getType() != Material.AIR, "Recipe must have non-AIR result.");
-         this.key = NamespacedKey.randomKey();
-+        new Throwable("Warning: A plugin is creating a recipe using a Deprecated method. This will cause you to receive warnings stating 'Tried to load unrecognized recipe: bukkit:<ID>'. Please ask the author to give their recipe a static key using NamespacedKey.").printStackTrace();
-         this.output = new ItemStack(result);
-     }
- 
-diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index 68447fb8c12356e779b96ec98c54119045046751..84062dd719cb8a6142dc8c806777cb208c6b42b2 100644
--- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-+++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-@@ -26,6 +26,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
-     public ShapelessRecipe(@NotNull ItemStack result) {
-         Preconditions.checkArgument(result.getType() != Material.AIR, "Recipe must have non-AIR result.");
-         this.key = NamespacedKey.randomKey();
-+        new Throwable("Warning: A plugin is creating a recipe using a Deprecated method. This will cause you to receive warnings stating 'Tried to load unrecognized recipe: bukkit:<ID>'. Please ask the author to give their recipe a static key using NamespacedKey.").printStackTrace();
-         this.output = new ItemStack(result);
-     }
- 
@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 20 Dec 2017 17:38:07 -0500
-Subject: [PATCH] Ability to apply mending to XP API
-
-This allows plugins that give players the ability to apply the experience
-points to the Item Mending formula, which will repair an item instead
-of giving the player experience points.
-
-Both an API To standalone mend, and apply mending logic to .giveExp has been added.
-
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 21bed0d8075335538374fadfdf1cb868e4eebe80..9d1ad67b7d220ab425ac9bf6b1c8d8fb8d5f416c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -892,12 +892,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      */
-     public void resetPlayerWeather();
- 
-+    // Paper start
-+    /**
-+     * Gives the player the amount of experience specified.
-+     *
-+     * @param amount Exp amount to give
-+     */
-+    public default void giveExp(int amount) {
-+        giveExp(amount, false);
-+    }
-     /**
-      * Gives the player the amount of experience specified.
-      *
-      * @param amount Exp amount to give
-+     * @param applyMending Mend players items with mending, with same behavior as picking up orbs. calls {@link #applyMending(int)}
-      */
-    public void giveExp(int amount);
-+    public void giveExp(int amount, boolean applyMending);
-+
-+    /**
-+     * Applies the mending effect to any items just as picking up an orb would.
-+     *
-+     * Can also be called with {@link #giveExp(int, boolean)} by passing true to applyMending
-+     *
-+     * @param amount Exp to apply
-+     * @return the remaining experience
-+     */
-+    public int applyMending(int amount);
-+    // Paper end
- 
-     /**
-      * Gives the player the amount of experience levels specified. Levels can
@@ -1,78 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 19 Jan 2018 00:29:28 -0500
-Subject: [PATCH] Add setPlayerProfile API for Skulls
-
-This allows you to create already filled textures on Skulls to avoid texture lookups
-which commonly cause rate limit issues with Mojang API
-
-diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java
-index 943d751fb3e48212fbe258845beba03c25fa22d9..a6914f01e01e9103702185f92b0209b3c84c152a 100644
--- a/src/main/java/org/bukkit/block/Skull.java
-+++ b/src/main/java/org/bukkit/block/Skull.java
-@@ -7,6 +7,7 @@ import org.bukkit.block.data.BlockData;
- import org.jetbrains.annotations.Contract;
- import org.jetbrains.annotations.NotNull;
- import org.jetbrains.annotations.Nullable;
-+import com.destroystokyo.paper.profile.PlayerProfile; // Paper
- 
- /**
-  * Represents a captured state of a skull block.
-@@ -61,6 +62,20 @@ public interface Skull extends TileState {
-      */
-     public void setOwningPlayer(@NotNull OfflinePlayer player);
- 
-+    // Paper start
-+    /**
-+     * Sets this skull to use the supplied Player Profile, which can include textures already prefilled.
-+     * @param profile The profile to set this Skull to use, may not be null
-+     */
-+    void setPlayerProfile(@NotNull PlayerProfile profile);
-+
-+    /**
-+     * If the skull has an owner, per {@link #hasOwner()}, return the owners {@link PlayerProfile}
-+     * @return The profile of the owner, if set
-+     */
-+    @Nullable PlayerProfile getPlayerProfile();
-+    // Paper end
-+
-     /**
-      * Gets the rotation of the skull in the world (or facing direction if this
-      * is a wall mounted skull).
-diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
-index 496254f959345d74167a9b44d160ea1bb428c5a1..88d1c889c09adb91abb09a8e43a30c871b217da2 100644
--- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
-+++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
-@@ -1,9 +1,11 @@
- package org.bukkit.inventory.meta;
- 
-+import com.destroystokyo.paper.profile.PlayerProfile;
- import org.bukkit.OfflinePlayer;
- import org.jetbrains.annotations.NotNull;
- import org.jetbrains.annotations.Nullable;
- 
-+
- /**
-  * Represents a skull that can have an owner.
-  */
-@@ -36,6 +38,20 @@ public interface SkullMeta extends ItemMeta {
-     @Deprecated
-     boolean setOwner(@Nullable String owner);
- 
-+    // Paper start
-+    /**
-+     * Sets this skull to use the supplied Player Profile, which can include textures already prefilled.
-+     * @param profile The profile to set this Skull to use, or null to clear owner
-+     */
-+    void setPlayerProfile(@Nullable PlayerProfile profile);
-+
-+    /**
-+     * If the skull has an owner, per {@link #hasOwner()}, return the owners {@link PlayerProfile}
-+     * @return The profile of the owner, if set
-+     */
-+    @Nullable PlayerProfile getPlayerProfile();
-+    // Paper end
-+
-     /**
-      * Gets the owner of the skull.
-      *
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 18 Jan 2018 01:00:27 -0500
-Subject: [PATCH] Optimize Hoppers
-
-Adds data about what Item related methods were used in InventoryMoveItem event
-so that the server can improve the performance of this event.
-
-diff --git a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
-index a8c48f5a416326e96c431e5fa22edee04825530e..04d4a83bfc4f86341f9d72128458154d08c8ec43 100644
--- a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
-+++ b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
-@@ -31,6 +31,8 @@ public class InventoryMoveItemEvent extends Event implements Cancellable {
-     private final Inventory destinationInventory;
-     private ItemStack itemStack;
-     private final boolean didSourceInitiate;
-+    public boolean calledGetItem; // Paper
-+    public boolean calledSetItem; // Paper
- 
-     public InventoryMoveItemEvent(@NotNull final Inventory sourceInventory, @NotNull final ItemStack itemStack, @NotNull final Inventory destinationInventory, final boolean didSourceInitiate) {
-         Validate.notNull(itemStack, "ItemStack cannot be null");
-@@ -58,7 +60,8 @@ public class InventoryMoveItemEvent extends Event implements Cancellable {
-      */
-     @NotNull
-     public ItemStack getItem() {
-        return itemStack.clone();
-+        calledGetItem = true; // Paper - record this method was used for auto detection of mode
-+        return itemStack; // Paper - Removed clone, handled better in Server
-     }
- 
-     /**
-@@ -70,6 +73,7 @@ public class InventoryMoveItemEvent extends Event implements Cancellable {
-      */
-     public void setItem(@NotNull ItemStack itemStack) {
-         Validate.notNull(itemStack, "ItemStack cannot be null.  Cancel the event if you want nothing to be transferred.");
-+        calledSetItem = true; // Paper - record this method was used for auto detection of mode
-         this.itemStack = itemStack.clone();
-     }
- 
@@ -1,91 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 18 Mar 2018 11:43:30 -0400
-Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
-
-This will allow you to change the players name or skin on login.
-
-diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index 992d1025ca02020e87a9ab5db83d249427f41d69..a40b57edb1aeff71fc0b9767d410950da5c06283 100644
--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-@@ -2,6 +2,9 @@ package org.bukkit.event.player;
- 
- import java.net.InetAddress;
- import java.util.UUID;
-+
-+import com.destroystokyo.paper.profile.PlayerProfile;
-+import org.bukkit.Bukkit;
- import org.bukkit.event.Event;
- import org.bukkit.event.HandlerList;
- import org.jetbrains.annotations.NotNull;
-@@ -15,9 +18,9 @@ public class AsyncPlayerPreLoginEvent extends Event {
-     private static final HandlerList handlers = new HandlerList();
-     private Result result;
-     private net.kyori.adventure.text.Component message; // Paper
-    private final String name;
-+    //private String name; // Paper - Not used anymore
-     private final InetAddress ipAddress;
-    private final UUID uniqueId;
-+    //private UUID uniqueId; // Paper - Not used anymore
- 
-     @Deprecated
-     public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress) {
-@@ -25,12 +28,37 @@ public class AsyncPlayerPreLoginEvent extends Event {
-     }
- 
-     public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId) {
-+        // Paper start
-+        this(name, ipAddress, uniqueId, Bukkit.createProfile(uniqueId, name));
-+    }
-+    private PlayerProfile profile;
-+
-+    /**
-+     * Gets the PlayerProfile of the player logging in
-+     * @return The Profile
-+     */
-+    @NotNull
-+    public PlayerProfile getPlayerProfile() {
-+        return profile;
-+    }
-+
-+    /**
-+     * Changes the PlayerProfile the player will login as
-+     * @param profile The profile to use
-+     */
-+    public void setPlayerProfile(@NotNull PlayerProfile profile) {
-+        this.profile = profile;
-+    }
-+
-+    public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) {
-         super(true);
-+        this.profile = profile;
-+        // Paper end
-         this.result = Result.ALLOWED;
-         this.message = net.kyori.adventure.text.Component.empty(); // Paper
-        this.name = name;
-+        //this.name = name; // Paper - Not used anymore
-         this.ipAddress = ipAddress;
-        this.uniqueId = uniqueId;
-+        //this.uniqueId = uniqueId; // Paper - Not used anymore
-     }
- 
-     /**
-@@ -193,7 +221,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
-      */
-     @NotNull
-     public String getName() {
-        return name;
-+        return profile.getName(); // Paper
-     }
- 
-     /**
-@@ -213,7 +241,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
-      */
-     @NotNull
-     public UUID getUniqueId() {
-        return uniqueId;
-+        return profile.getId(); // Paper
-     }
- 
-     @NotNull
@@ -1,381 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Minecrell <minecrell@minecrell.net>
-Date: Wed, 11 Oct 2017 15:55:38 +0200
-Subject: [PATCH] Add extended PaperServerListPingEvent
-
-Add a new event that extends the original ServerListPingEvent
-and allows full control of the response sent to the client.
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..baac2e4f090a490372ef4aed92c8a5771955e921
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
-@@ -0,0 +1,334 @@
-+package com.destroystokyo.paper.event.server;
-+
-+import static java.util.Objects.requireNonNull;
-+
-+import com.destroystokyo.paper.network.StatusClient;
-+import com.destroystokyo.paper.profile.PlayerProfile;
-+import org.bukkit.Bukkit;
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.server.ServerListPingEvent;
-+import org.bukkit.util.CachedServerIcon;
-+
-+import java.util.ArrayList;
-+import java.util.Iterator;
-+import java.util.List;
-+import java.util.NoSuchElementException;
-+import java.util.UUID;
-+
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * Extended version of {@link ServerListPingEvent} that allows full control
-+ * of the response sent to the client.
-+ */
-+public class PaperServerListPingEvent extends ServerListPingEvent implements Cancellable {
-+
-+    @NotNull private final StatusClient client;
-+
-+    private int numPlayers;
-+    private boolean hidePlayers;
-+    @NotNull private final List<PlayerProfile> playerSample = new ArrayList<>();
-+
-+    @NotNull private String version;
-+    private int protocolVersion;
-+
-+    @Nullable private CachedServerIcon favicon;
-+
-+    private boolean cancelled;
-+
-+    private boolean originalPlayerCount = true;
-+    private Object[] players;
-+
-+    @Deprecated
-+    public PaperServerListPingEvent(@NotNull StatusClient client, @NotNull String motd, int numPlayers, int maxPlayers,
-+            @NotNull String version, int protocolVersion, @Nullable CachedServerIcon favicon) {
-+        super(client.getAddress().getAddress(), motd, numPlayers, maxPlayers);
-+        this.client = client;
-+        this.numPlayers = numPlayers;
-+        this.version = version;
-+        this.protocolVersion = protocolVersion;
-+        setServerIcon(favicon);
-+    }
-+
-+    public PaperServerListPingEvent(@NotNull StatusClient client, @NotNull net.kyori.adventure.text.Component motd, int numPlayers, int maxPlayers,
-+                                    @NotNull String version, int protocolVersion, @Nullable CachedServerIcon favicon) {
-+        super(client.getAddress().getAddress(), motd, numPlayers, maxPlayers);
-+        this.client = client;
-+        this.numPlayers = numPlayers;
-+        this.version = version;
-+        this.protocolVersion = protocolVersion;
-+        setServerIcon(favicon);
-+    }
-+
-+    /**
-+     * Returns the {@link StatusClient} pinging the server.
-+     *
-+     * @return The client
-+     */
-+    @NotNull
-+    public StatusClient getClient() {
-+        return this.client;
-+    }
-+
-+    /**
-+     * {@inheritDoc}
-+     *
-+     * <p>Returns {@code -1} if players are hidden using
-+     * {@link #shouldHidePlayers()}.</p>
-+     */
-+    @Override
-+    public int getNumPlayers() {
-+        if (this.hidePlayers) {
-+            return -1;
-+        }
-+
-+        return this.numPlayers;
-+    }
-+
-+    /**
-+     * Sets the number of players displayed in the server list.
-+     *
-+     * <p>Note that this won't have any effect if {@link #shouldHidePlayers()}
-+     * is enabled.</p>
-+     *
-+     * @param numPlayers The number of online players
-+     */
-+    public void setNumPlayers(int numPlayers) {
-+        if (this.numPlayers != numPlayers) {
-+            this.numPlayers = numPlayers;
-+            this.originalPlayerCount = false;
-+        }
-+    }
-+
-+    /**
-+     * {@inheritDoc}
-+     *
-+     * <p>Returns {@code -1} if players are hidden using
-+     * {@link #shouldHidePlayers()}.</p>
-+     */
-+    @Override
-+    public int getMaxPlayers() {
-+        if (this.hidePlayers) {
-+            return -1;
-+        }
-+
-+        return super.getMaxPlayers();
-+    }
-+
-+    /**
-+     * Returns whether all player related information is hidden in the server
-+     * list. This will cause {@link #getNumPlayers()}, {@link #getMaxPlayers()}
-+     * and {@link #getPlayerSample()} to be skipped in the response.
-+     *
-+     * <p>The Vanilla Minecraft client will display the player count as {@code ???}
-+     * when this option is enabled.</p>
-+     *
-+     * @return {@code true} if the player count is hidden
-+     */
-+    public boolean shouldHidePlayers() {
-+        return hidePlayers;
-+    }
-+
-+    /**
-+     * Sets whether all player related information is hidden in the server
-+     * list. This will cause {@link #getNumPlayers()}, {@link #getMaxPlayers()}
-+     * and {@link #getPlayerSample()} to be skipped in the response.
-+     *
-+     * <p>The Vanilla Minecraft client will display the player count as {@code ???}
-+     * when this option is enabled.</p>
-+     *
-+     * @param hidePlayers {@code true} if the player count should be hidden
-+     */
-+    public void setHidePlayers(boolean hidePlayers) {
-+        this.hidePlayers = hidePlayers;
-+    }
-+
-+    /**
-+     * Returns a mutable list of {@link PlayerProfile} that will be displayed
-+     * as online players on the client.
-+     *
-+     * <p>The Vanilla Minecraft client will display them when hovering the
-+     * player count with the mouse.</p>
-+     *
-+     * @return The mutable player sample list
-+     */
-+    @NotNull
-+    public List<PlayerProfile> getPlayerSample() {
-+        return this.playerSample;
-+    }
-+
-+    /**
-+     * Returns the version that will be sent as server version on the client.
-+     *
-+     * @return The server version
-+     */
-+    @NotNull
-+    public String getVersion() {
-+        return version;
-+    }
-+
-+    /**
-+     * Sets the version that will be sent as server version to the client.
-+     *
-+     * @param version The server version
-+     */
-+    public void setVersion(@NotNull String version) {
-+        this.version = requireNonNull(version, "version");
-+    }
-+
-+    /**
-+     * Returns the protocol version that will be sent as the protocol version
-+     * of the server to the client.
-+     *
-+     * @return The protocol version of the server, or {@code -1} if the server
-+     * has not finished initialization yet
-+     */
-+    public int getProtocolVersion() {
-+        return protocolVersion;
-+    }
-+
-+    /**
-+     * Sets the protocol version that will be sent as the protocol version
-+     * of the server to the client.
-+     *
-+     * @param protocolVersion The protocol version of the server
-+     */
-+    public void setProtocolVersion(int protocolVersion) {
-+        this.protocolVersion = protocolVersion;
-+    }
-+
-+    /**
-+     * Gets the server icon sent to the client.
-+     *
-+     * @return The icon to send to the client, or {@code null} for none
-+     */
-+    @Nullable
-+    public CachedServerIcon getServerIcon() {
-+        return this.favicon;
-+    }
-+
-+    /**
-+     * Sets the server icon sent to the client.
-+     *
-+     * @param icon The icon to send to the client, or {@code null} for none
-+     */
-+    @Override
-+    public void setServerIcon(@Nullable CachedServerIcon icon) {
-+        if (icon != null && icon.isEmpty()) {
-+            // Represent empty icons as null
-+            icon = null;
-+        }
-+
-+        this.favicon = icon;
-+    }
-+
-+    /**
-+     * {@inheritDoc}
-+     *
-+     * <p>Cancelling this event will cause the connection to be closed immediately,
-+     * without sending a response to the client.</p>
-+     */
-+    @Override
-+    public boolean isCancelled() {
-+        return this.cancelled;
-+    }
-+
-+    /**
-+     * {@inheritDoc}
-+     *
-+     * <p>Cancelling this event will cause the connection to be closed immediately,
-+     * without sending a response to the client.</p>
-+     */
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
-+    }
-+
-+    /**
-+     * {@inheritDoc}
-+     *
-+     * <p><b>Note:</b> For compatibility reasons, this method will return all
-+     * online players, not just the ones referenced in {@link #getPlayerSample()}.
-+     * Removing a player will:</p>
-+     *
-+     * <ul>
-+     *     <li>Decrement the online player count (if and only if) the player
-+     *     count wasn't changed by another plugin before.</li>
-+     *     <li>Remove all entries from {@link #getPlayerSample()} that refer to
-+     *     the removed player (based on their {@link UUID}).</li>
-+     * </ul>
-+     */
-+    @NotNull
-+    @Override
-+    public Iterator<Player> iterator() {
-+        if (this.players == null) {
-+            this.players = getOnlinePlayers();
-+        }
-+
-+        return new PlayerIterator();
-+    }
-+
-+    @NotNull
-+    protected Object[] getOnlinePlayers() {
-+        return Bukkit.getOnlinePlayers().toArray();
-+    }
-+
-+    @NotNull
-+    protected Player getBukkitPlayer(@NotNull Object player) {
-+        return (Player) player;
-+    }
-+
-+    private final class PlayerIterator implements Iterator<Player> {
-+
-+        private int next;
-+        private int current;
-+        @Nullable private Player player;
-+
-+        @Override
-+        public boolean hasNext() {
-+            for (; this.next < players.length; this.next++) {
-+                if (players[this.next] != null) {
-+                    return true;
-+                }
-+            }
-+
-+            return false;
-+        }
-+
-+        @NotNull
-+        @Override
-+        public Player next() {
-+            if (!hasNext()) {
-+                this.player = null;
-+                throw new NoSuchElementException();
-+            }
-+
-+            this.current = this.next++;
-+            return this.player = getBukkitPlayer(players[this.current]);
-+        }
-+
-+        @Override
-+        public void remove() {
-+            if (this.player == null) {
-+                throw new IllegalStateException();
-+            }
-+
-+            UUID uniqueId = this.player.getUniqueId();
-+            this.player = null;
-+
-+            // Remove player from iterator
-+            players[this.current] = null;
-+
-+            // Remove player from sample
-+            getPlayerSample().removeIf(p -> uniqueId.equals(p.getId()));
-+
-+            // Decrement player count
-+            if (originalPlayerCount) {
-+                numPlayers--;
-+            }
-+        }
-+    }
-+
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..517d15238ed117f38bbd39f570874014cecf7bb5
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
-@@ -0,0 +1,13 @@
-+package com.destroystokyo.paper.network;
-+
-+import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
-+
-+/**
-+ * Represents a client requesting the current status from the server (e.g. from
-+ * the server list).
-+ *
-+ * @see PaperServerListPingEvent
-+ */
-+public interface StatusClient extends NetworkClient {
-+
-+}
-diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
-index 612958a331575d1da2715531ebdf6b1168f2e860..bb4f7702ced0baf0670a7a21d48ad528b7249361 100644
--- a/src/main/java/org/bukkit/util/CachedServerIcon.java
-+++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
-@@ -18,4 +18,9 @@ public interface CachedServerIcon {
-     @Nullable
-     public String getData(); // Paper
- 
-+    // Paper start
-+    default boolean isEmpty() {
-+        return getData() == null;
-+    }
-+    // Paper end
- }
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 18 Mar 2018 12:28:55 -0400
-Subject: [PATCH] Player.setPlayerProfile API
-
-This can be useful for changing name or skins after a player has logged in.
-
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9a262d412b2762a33a60b1e8762a7d9c9c3f933d..3ae4d670059f80bd057870a37f4025261e397dfa 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.UUID;
- import com.destroystokyo.paper.Title; // Paper
- import net.kyori.adventure.text.Component;
-+import com.destroystokyo.paper.profile.PlayerProfile; // Paper
- import org.bukkit.DyeColor;
- import org.bukkit.Effect;
- import org.bukkit.GameMode;
-@@ -1714,6 +1715,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
-      */
-     boolean hasResourcePack();
-+
-+    /**
-+     * Gets a copy of this players profile
-+     * @return The players profile object
-+     */
-+    @NotNull
-+    PlayerProfile getPlayerProfile();
-+
-+    /**
-+     * Changes the PlayerProfile for this player. This will cause this player
-+     * to be reregistered to all clients that can currently see this player
-+     * @param profile The new profile to use
-+     */
-+    void setPlayerProfile(@NotNull PlayerProfile profile);
-     // Paper end
- 
-     // Spigot start
@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 22 Mar 2018 01:39:28 -0400
-Subject: [PATCH] getPlayerUniqueId API
-
-Gets the unique ID of the player currently known as the specified player name
-In Offline Mode, will return an Offline UUID
-
-This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f5d3a7370390871d1b6075f32846d1a942b05b7f..2d7f8e128e23934a8fe26baf19198b7ffc8447bb 100644
--- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -504,6 +504,20 @@ public final class Bukkit {
-         return server.getPlayer(id);
-     }
- 
-+    // Paper start
-+    /**
-+     * Gets the unique ID of the player currently known as the specified player name
-+     * In Offline Mode, will return an Offline UUID
-+     *
-+     * @param playerName the player name to look up the unique ID for
-+     * @return A UUID, or null if that player name is not registered with Minecraft and the server is in online mode
-+     */
-+    @Nullable
-+    public static UUID getPlayerUniqueId(@NotNull String playerName) {
-+        return server.getPlayerUniqueId(playerName);
-+    }
-+    // Paper end
-+
-     /**
-      * Gets the plugin manager for interfacing with plugins.
-      *
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 38d138b217734e598581ed14065ff2015135ee9a..01657abaff86cf7bb3ffb857024c5032781b8660 100644
--- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -429,6 +429,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     @Nullable
-     public Player getPlayer(@NotNull UUID id);
- 
-+    // Paper start
-+    /**
-+     * Gets the unique ID of the player currently known as the specified player name
-+     * In Offline Mode, will return an Offline UUID
-+     *
-+     * @param playerName the player name to look up the unique ID for
-+     * @return A UUID, or null if that player name is not registered with Minecraft and the server is in online mode
-+     */
-+    @Nullable
-+    public UUID getPlayerUniqueId(@NotNull String playerName);
-+    // Paper end
-+
-     /**
-      * Gets the plugin manager for interfacing with plugins.
-      *
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
-Date: Sun, 1 Apr 2018 02:28:43 +0300
-Subject: [PATCH] Add method to open already placed sign
-
-
-diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index d212d5123b6294f7873d72f125505a006c290b05..7430bc85301d0fcb34c6035fbe08ae245c76e043 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
-+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -461,6 +461,14 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
-      */
-     @Deprecated
-     public void setShoulderEntityRight(@Nullable Entity entity);
-+    // Paper start - Add method to open already placed sign
-+    /**
-+     * Opens an editor window for the specified sign
-+     *
-+     * @param sign The sign to open
-+     */
-+    void openSign(@NotNull org.bukkit.block.Sign sign);
-+    // Paper end
- 
-     /**
-      * Make the entity drop the item in their hand.
@@ -1,253 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 28 Apr 2018 10:28:50 -0400
-Subject: [PATCH] Add Ban Methods to Player Objects
-
-Allows a more logical API for banning players.
-
-player.banPlayer("Breaking the rules");
-
-diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 58313929f81509030216a0e5e3869da63e11108e..6cf05fed701c67a2c797a4e0839c795802a238a1 100644
--- a/src/main/java/org/bukkit/OfflinePlayer.java
-+++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -45,6 +45,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
-      * @return true if banned, otherwise false
-      */
-     public boolean isBanned();
-+    // Paper start
-+
-+    /**
-+     * Permanently Bans this player from the server
-+     *
-+     * @param reason Reason for Ban
-+     * @return Ban Entry
-+     */
-+    @NotNull
-+    public default BanEntry banPlayer(@Nullable String reason) {
-+        return banPlayer(reason, null, null);
-+    }
-+
-+    /**
-+     * Permanently Bans this player from the server
-+     * @param reason Reason for Ban
-+     * @param source Source of the ban, or null for default
-+     * @return Ban Entry
-+     */
-+    @NotNull
-+    public default BanEntry banPlayer(@Nullable String reason, @Nullable String source) {
-+        return banPlayer(reason, null, source);
-+    }
-+
-+    /**
-+     * Bans this player from the server
-+     * @param reason Reason for Ban
-+     * @param expires When to expire the ban
-+     * @return Ban Entry
-+     */
-+    @NotNull
-+    public default BanEntry banPlayer(@Nullable String reason, @Nullable java.util.Date expires) {
-+        return banPlayer(reason, expires, null);
-+    }
-+
-+    /**
-+     * Bans this player from the server
-+     * @param reason Reason for Ban
-+     * @param expires When to expire the ban
-+     * @param source Source of the ban or null for default
-+     * @return Ban Entry
-+     */
-+    @NotNull
-+    public default BanEntry banPlayer(@Nullable String reason, @Nullable java.util.Date expires, @Nullable String source) {
-+        return banPlayer(reason, expires, source, true);
-+    }
-+    @NotNull
-+    public default BanEntry banPlayer(@Nullable String reason, @Nullable java.util.Date expires, @Nullable String source, boolean kickIfOnline) {
-+        BanEntry banEntry = Bukkit.getServer().getBanList(BanList.Type.NAME).addBan(getName(), reason, expires, source);
-+        if (kickIfOnline && isOnline()) {
-+            getPlayer().kickPlayer(reason);
-+        }
-+        return banEntry;
-+    }
-+    // Paper end
- 
-     /**
-      * Checks if this player is whitelisted or not
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6769330f336afcd5f26c0f7286defa00bead543c..88fd4cdeaad4d27f414c6b268022cdedf73492e7 100644
--- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -5,6 +5,10 @@ import java.util.UUID;
- import com.destroystokyo.paper.Title; // Paper
- import net.kyori.adventure.text.Component;
- import com.destroystokyo.paper.profile.PlayerProfile; // Paper
-+import java.util.Date; // Paper
-+import org.bukkit.BanEntry; // Paper
-+import org.bukkit.BanList; // Paper
-+import org.bukkit.Bukkit; // Paper
- import org.bukkit.DyeColor;
- import org.bukkit.Effect;
- import org.bukkit.GameMode;
-@@ -618,6 +622,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     public void sendMap(@NotNull MapView map);
- 
-     // Paper start
-+    /**
-+     * Permanently Bans the Profile and IP address currently used by the player.
-+     *
-+     * @param reason Reason for ban
-+     * @return Ban Entry
-+     */
-+    // For reference, Bukkit defines this as nullable, while they impl isn't, we'll follow API.
-+    @Nullable
-+    public default BanEntry banPlayerFull(@Nullable String reason) {
-+        return banPlayerFull(reason, null, null);
-+    }
-+
-+    /**
-+     * Permanently Bans the Profile and IP address currently used by the player.
-+     *
-+     * @param reason Reason for ban
-+     * @param source Source of ban, or null for default
-+     * @return Ban Entry
-+     */
-+    @Nullable
-+    public default BanEntry banPlayerFull(@Nullable String reason, @Nullable String source) {
-+        return banPlayerFull(reason, null, source);
-+    }
-+
-+    /**
-+     * Bans the Profile and IP address currently used by the player.
-+     *
-+     * @param reason Reason for Ban
-+     * @param expires When to expire the ban
-+     * @return Ban Entry
-+     */
-+    @Nullable
-+    public default BanEntry banPlayerFull(@Nullable String reason, @Nullable Date expires) {
-+        return banPlayerFull(reason, expires, null);
-+    }
-+
-+    /**
-+     * Bans the Profile and IP address currently used by the player.
-+     *
-+     * @param reason Reason for Ban
-+     * @param expires When to expire the ban
-+     * @param source Source of the ban, or null for default
-+     * @return Ban Entry
-+     */
-+    @Nullable
-+    public default BanEntry banPlayerFull(@Nullable String reason, @Nullable Date expires, @Nullable String source) {
-+        banPlayer(reason, expires, source);
-+        return banPlayerIP(reason, expires, source, true);
-+    }
-+
-+    /**
-+     * Permanently Bans the IP address currently used by the player.
-+     * Does not ban the Profile, use {@link #banPlayerFull(String, Date, String)}
-+     *
-+     * @param reason Reason for ban
-+     * @param kickPlayer Whether or not to kick the player afterwards
-+     * @return Ban Entry
-+     */
-+    @Nullable
-+    public default BanEntry banPlayerIP(@Nullable String reason, boolean kickPlayer) {
-+        return banPlayerIP(reason, null, null, kickPlayer);
-+    }
-+
-+    /**
-+     * Permanently Bans the IP address currently used by the player.
-+     * Does not ban the Profile, use {@link #banPlayerFull(String, Date, String)}
-+     * @param reason Reason for ban
-+     * @param source Source of ban, or null for default
-+     * @param kickPlayer Whether or not to kick the player afterwards
-+     * @return Ban Entry
-+     */
-+    @Nullable
-+    public default BanEntry banPlayerIP(@Nullable String reason, @Nullable String source, boolean kickPlayer) {
-+        return banPlayerIP(reason, null, source, kickPlayer);
-+    }
-+
-+    /**
-+     * Bans the IP address currently used by the player.
-+     * Does not ban the Profile, use {@link #banPlayerFull(String, Date, String)}
-+     * @param reason Reason for Ban
-+     * @param expires When to expire the ban
-+     * @param kickPlayer Whether or not to kick the player afterwards
-+     * @return Ban Entry
-+     */
-+    @Nullable
-+    public default BanEntry banPlayerIP(@Nullable String reason, @Nullable Date expires, boolean kickPlayer) {
-+        return banPlayerIP(reason, expires, null, kickPlayer);
-+    }
-+
-+    /**
-+     * Permanently Bans the IP address currently used by the player.
-+     * Does not ban the Profile, use {@link #banPlayerFull(String, Date, String)}
-+     *
-+     * @param reason Reason for ban
-+     * @return Ban Entry
-+     */
-+    @Nullable
-+    public default BanEntry banPlayerIP(@Nullable String reason) {
-+        return banPlayerIP(reason, null, null);
-+    }
-+
-+    /**
-+     * Permanently Bans the IP address currently used by the player.
-+     * Does not ban the Profile, use {@link #banPlayerFull(String, Date, String)}
-+     * @param reason Reason for ban
-+     * @param source Source of ban, or null for default
-+     * @return Ban Entry
-+     */
-+    @Nullable
-+    public default BanEntry banPlayerIP(@Nullable String reason, @Nullable String source) {
-+        return banPlayerIP(reason, null, source);
-+    }
-+
-+    /**
-+     * Bans the IP address currently used by the player.
-+     * Does not ban the Profile, use {@link #banPlayerFull(String, Date, String)}
-+     * @param reason Reason for Ban
-+     * @param expires When to expire the ban
-+     * @return Ban Entry
-+     */
-+    @Nullable
-+    public default BanEntry banPlayerIP(@Nullable String reason, @Nullable Date expires) {
-+        return banPlayerIP(reason, expires, null);
-+    }
-+
-+    /**
-+     * Bans the IP address currently used by the player.
-+     * Does not ban the Profile, use {@link #banPlayerFull(String, Date, String)}
-+     * @param reason Reason for Ban
-+     * @param expires When to expire the ban
-+     * @param source Source of the banm or null for default
-+     * @return Ban Entry
-+     */
-+    @Nullable
-+    public default BanEntry banPlayerIP(@Nullable String reason, @Nullable Date expires, @Nullable String source) {
-+        return banPlayerIP(reason, expires, source, true);
-+    }
-+
-+    /**
-+     * Bans the IP address currently used by the player.
-+     * Does not ban the Profile, use {@link #banPlayerFull(String, Date, String)}
-+     * @param reason Reason for Ban
-+     * @param expires When to expire the ban
-+     * @param source Source of the banm or null for default
-+     * @param kickPlayer if the targeted player should be kicked
-+     * @return Ban Entry
-+     */
-+    @Nullable
-+    public default BanEntry banPlayerIP(@Nullable String reason, @Nullable Date expires, @Nullable String source, boolean kickPlayer) {
-+        BanEntry banEntry = Bukkit.getServer().getBanList(BanList.Type.IP).addBan(getAddress().getAddress().getHostAddress(), reason, expires, source);
-+        if (kickPlayer && isOnline()) {
-+            getPlayer().kickPlayer(reason);
-+        }
-+
-+        return banEntry;
-+    }
- 
-     /**
-      * Sends an Action Bar message to the client.
@@ -1,292 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 30 Apr 2018 17:55:28 -0400
-Subject: [PATCH] Additional world.getNearbyEntities API's
-
-Provides more methods to get nearby entities, and filter by types and predicates
-
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 0f86a9c67797fd662cbbfdb808789bcab95caba4..cae848ce698337d0b254bd48938abfc1e68ad561 100644
--- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -1,6 +1,9 @@
- package org.bukkit;
- 
- import java.io.File;
-+import org.bukkit.generator.ChunkGenerator;
-+
-+import java.util.ArrayList;
- import java.util.Collection;
- import java.util.HashMap;
- import java.util.List;
-@@ -659,6 +662,256 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
-     @NotNull
-     public Collection<Entity> getEntitiesByClasses(@NotNull Class<?>... classes);
- 
-+    // Paper start
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param loc Center location
-+     * @param radius Radius
-+     * @return the collection of entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public default Collection<LivingEntity> getNearbyLivingEntities(@NotNull Location loc, double radius) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, loc, radius, radius, radius);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param loc Center location
-+     * @param xzRadius X/Z Radius
-+     * @param yRadius Y Radius
-+     * @return the collection of entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public default Collection<LivingEntity> getNearbyLivingEntities(@NotNull Location loc, double xzRadius, double yRadius) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, loc, xzRadius, yRadius, xzRadius);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param loc Center location
-+     * @param xRadius X Radius
-+     * @param yRadius Y Radius
-+     * @param zRadius Z radius
-+     * @return the collection of entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public default Collection<LivingEntity> getNearbyLivingEntities(@NotNull Location loc, double xRadius, double yRadius, double zRadius) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, loc, xRadius, yRadius, zRadius);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param loc Center location
-+     * @param radius X Radius
-+     * @param predicate a predicate used to filter results
-+     * @return the collection of living entities near location. This will always be a non-null collection
-+     */
-+    @NotNull
-+    public default Collection<LivingEntity> getNearbyLivingEntities(@NotNull Location loc, double radius, @Nullable Predicate<LivingEntity> predicate) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, loc, radius, radius, radius, predicate);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param loc Center location
-+     * @param xzRadius X/Z Radius
-+     * @param yRadius Y Radius
-+     * @param predicate a predicate used to filter results
-+     * @return the collection of living entities near location. This will always be a non-null collection
-+     */
-+    @NotNull
-+    public default Collection<LivingEntity> getNearbyLivingEntities(@NotNull Location loc, double xzRadius, double yRadius, @Nullable Predicate<LivingEntity> predicate) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, loc, xzRadius, yRadius, xzRadius, predicate);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param loc Center location
-+     * @param xRadius X Radius
-+     * @param yRadius Y Radius
-+     * @param zRadius Z radius
-+     * @param predicate a predicate used to filter results
-+     * @return the collection of living entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public default Collection<LivingEntity> getNearbyLivingEntities(@NotNull Location loc, double xRadius, double yRadius, double zRadius, @Nullable Predicate<LivingEntity> predicate) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, loc, xRadius, yRadius, zRadius, predicate);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param loc Center location
-+     * @param radius X/Y/Z Radius
-+     * @return the collection of living entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public default Collection<Player> getNearbyPlayers(@NotNull Location loc, double radius) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, loc, radius, radius, radius);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param loc Center location
-+     * @param xzRadius X/Z Radius
-+     * @param yRadius Y Radius
-+     * @return the collection of living entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public default Collection<Player> getNearbyPlayers(@NotNull Location loc, double xzRadius, double yRadius) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, loc, xzRadius, yRadius, xzRadius);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param loc Center location
-+     * @param xRadius X Radius
-+     * @param yRadius Y Radius
-+     * @param zRadius Z Radius
-+     * @return the collection of players near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public default Collection<Player> getNearbyPlayers(@NotNull Location loc, double xRadius, double yRadius, double zRadius) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, loc, xRadius, yRadius, zRadius);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param loc Center location
-+     * @param radius X/Y/Z Radius
-+     * @param predicate a predicate used to filter results
-+     * @return the collection of players near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public default Collection<Player> getNearbyPlayers(@NotNull Location loc, double radius, @Nullable Predicate<Player> predicate) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, loc, radius, radius, radius, predicate);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param loc Center location
-+     * @param xzRadius X/Z Radius
-+     * @param yRadius Y Radius
-+     * @param predicate a predicate used to filter results
-+     * @return the collection of players near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public default Collection<Player> getNearbyPlayers(@NotNull Location loc, double xzRadius, double yRadius, @Nullable Predicate<Player> predicate) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, loc, xzRadius, yRadius, xzRadius, predicate);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param loc Center location
-+     * @param xRadius X Radius
-+     * @param yRadius Y Radius
-+     * @param zRadius Z Radius
-+     * @param predicate a predicate used to filter results
-+     * @return the collection of players near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public default Collection<Player> getNearbyPlayers(@NotNull Location loc, double xRadius, double yRadius, double zRadius, @Nullable Predicate<Player> predicate) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, loc, xRadius, yRadius, zRadius, predicate);
-+    }
-+
-+    /**
-+     * Gets all nearby entities of the specified type, within the specified radius (bounding box)
-+     * @param clazz Type to filter by
-+     * @param loc Center location
-+     * @param radius X/Y/Z radius to search within
-+     * @param <T> the entity type
-+     * @return the collection of entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public default <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, @NotNull Location loc, double radius) {
-+        return getNearbyEntitiesByType(clazz, loc, radius, radius, radius, null);
-+    }
-+
-+    /**
-+     * Gets all nearby entities of the specified type, within the specified radius, with x and x radius matching (bounding box)
-+     * @param clazz Type to filter by
-+     * @param loc Center location
-+     * @param xzRadius X/Z radius to search within
-+     * @param yRadius Y radius to search within
-+     * @param <T> the entity type
-+     * @return the collection of entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public default <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, @NotNull Location loc, double xzRadius, double yRadius) {
-+        return getNearbyEntitiesByType(clazz, loc, xzRadius, yRadius, xzRadius, null);
-+    }
-+
-+    /**
-+     * Gets all nearby entities of the specified type, within the specified radius (bounding box)
-+     * @param clazz Type to filter by
-+     * @param loc Center location
-+     * @param xRadius X Radius
-+     * @param yRadius Y Radius
-+     * @param zRadius Z Radius
-+     * @param <T> the entity type
-+     * @return the collection of entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public default <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, @NotNull Location loc, double xRadius, double yRadius, double zRadius) {
-+        return getNearbyEntitiesByType(clazz, loc, xRadius, yRadius, zRadius, null);
-+    }
-+
-+    /**
-+     * Gets all nearby entities of the specified type, within the specified radius (bounding box)
-+     * @param clazz Type to filter by
-+     * @param loc Center location
-+     * @param radius X/Y/Z radius to search within
-+     * @param predicate a predicate used to filter results
-+     * @param <T> the entity type
-+     * @return the collection of entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public default <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, @NotNull Location loc, double radius, @Nullable Predicate<T> predicate) {
-+        return getNearbyEntitiesByType(clazz, loc, radius, radius, radius, predicate);
-+    }
-+
-+    /**
-+     * Gets all nearby entities of the specified type, within the specified radius, with x and x radius matching (bounding box)
-+     * @param clazz Type to filter by
-+     * @param loc Center location
-+     * @param xzRadius X/Z radius to search within
-+     * @param yRadius Y radius to search within
-+     * @param predicate a predicate used to filter results
-+     * @param <T> the entity type
-+     * @return the collection of entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public default <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, @NotNull Location loc, double xzRadius, double yRadius, @Nullable Predicate<T> predicate) {
-+        return getNearbyEntitiesByType(clazz, loc, xzRadius, yRadius, xzRadius, predicate);
-+    }
-+
-+     /**
-+      * Gets all nearby entities of the specified type, within the specified radius (bounding box)
-+      * @param clazz Type to filter by
-+      * @param loc Center location
-+      * @param xRadius X Radius
-+      * @param yRadius Y Radius
-+      * @param zRadius Z Radius
-+      * @param predicate a predicate used to filter results
-+      * @param <T> the entity type
-+      * @return the collection of entities near location. This will always be a non-null collection.
-+      */
-+     @NotNull
-+    public default <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends Entity> clazz, @NotNull Location loc, double xRadius, double yRadius, double zRadius, @Nullable Predicate<T> predicate) {
-+        if (clazz == null) {
-+            clazz = Entity.class;
-+        }
-+        List<T> nearby = new ArrayList<>();
-+        for (Entity bukkitEntity : getNearbyEntities(loc, xRadius, yRadius, zRadius)) {
-+            //noinspection unchecked
-+            if (clazz.isAssignableFrom(bukkitEntity.getClass()) && (predicate == null || predicate.test((T) bukkitEntity))) {
-+                //noinspection unchecked
-+                nearby.add((T) bukkitEntity);
-+            }
-+        }
-+        return nearby;
-+    }
-+    // Paper end
-+
-     /**
-      * Get a list of all players in this World
-      *
-diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index a40b57edb1aeff71fc0b9767d410950da5c06283..184d9462ebbc500d8b81aaf14fe138d247bf2470 100644
--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-@@ -42,8 +42,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
-         return profile;
-     }
- 
-    /**
-     * Changes the PlayerProfile the player will login as
-+    /*    * Changes the PlayerProfile the player will login as
-      * @param profile The profile to use
-      */
-     public void setPlayerProfile(@NotNull PlayerProfile profile) {
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 30 Apr 2018 19:27:31 -0400
-Subject: [PATCH] Location.isChunkLoaded() API
-
-
-diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 0939a8070f9cc4f66f1679fef74862debb7d32ae..6c8b8eddcdb81f7151202eb12541308040790d45 100644
--- a/src/main/java/org/bukkit/Location.java
-+++ b/src/main/java/org/bukkit/Location.java
-@@ -533,6 +533,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
-         return this;
-     }
- 
-+    public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
-     @Override
-     public boolean equals(Object obj) {
-         if (obj == null) {
@@ -1,579 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 29 Aug 2017 23:58:48 -0400
-Subject: [PATCH] Expand World.spawnParticle API and add Builder
-
-Adds ability to control who receives it and who is the source/sender (vanish API)
-the standard API is to send the packet to everyone in the world, which is ineffecient.
-
-This adds a new Builder API which is much friendlier to use.
-
-diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..06f1602f5b327705f726d0a99dd6b95e1554d382
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
-@@ -0,0 +1,478 @@
-+package com.destroystokyo.paper;
-+
-+import com.google.common.collect.Lists;
-+import org.bukkit.Color;
-+import org.bukkit.Location;
-+import org.bukkit.Particle;
-+import org.bukkit.World;
-+import org.bukkit.entity.Player;
-+import org.bukkit.util.NumberConversions;
-+
-+import java.util.Collection;
-+import java.util.List;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * Helps prepare a particle to be sent to players.
-+ *
-+ * Usage of the builder is preferred over the super long {@link World#spawnParticle(Particle, Location, int, double, double, double, double, Object)} API
-+ */
-+public class ParticleBuilder {
-+
-+    private Particle particle;
-+    private List<Player> receivers;
-+    private Player source;
-+    private Location location;
-+    private int count = 1;
-+    private double offsetX = 0, offsetY = 0, offsetZ = 0;
-+    private double extra = 1;
-+    private Object data;
-+    private boolean force = true;
-+
-+    public ParticleBuilder(@NotNull Particle particle) {
-+        this.particle = particle;
-+    }
-+
-+    /**
-+     * Sends the particle to all receiving players (or all). This method is safe to use
-+     * Asynchronously
-+     *
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder spawn() {
-+        if (this.location == null) {
-+            throw new IllegalStateException("Please specify location for this particle");
-+        }
-+        location.getWorld().spawnParticle(particle, receivers, source,
-+            location.getX(), location.getY(), location.getZ(),
-+            count, offsetX, offsetY, offsetZ, extra, data, force
-+        );
-+        return this;
-+    }
-+
-+    /**
-+     * @return The particle going to be sent
-+     */
-+    @NotNull
-+    public Particle particle() {
-+        return particle;
-+    }
-+
-+    /**
-+     * Changes what particle will be sent
-+     *
-+     * @param particle The particle
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder particle(@NotNull Particle particle) {
-+        this.particle = particle;
-+        return this;
-+    }
-+
-+    /**
-+     * @return List of players who will receive the particle, or null for all in world
-+     */
-+    @Nullable
-+    public List<Player> receivers() {
-+        return receivers;
-+    }
-+
-+    /**
-+     * Example use:
-+     *
-+     * builder.receivers(16); if (builder.hasReceivers()) { sendParticleAsync(builder); }
-+     *
-+     * @return If this particle is going to be sent to someone
-+     */
-+    public boolean hasReceivers() {
-+        return (receivers == null && !location.getWorld().getPlayers().isEmpty()) || (
-+            receivers != null && !receivers.isEmpty());
-+    }
-+
-+    /**
-+     * Sends this particle to all players in the world. This is rather silly and you should likely not
-+     * be doing this.
-+     *
-+     * Just be a logical person and use receivers by radius or collection.
-+     *
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder allPlayers() {
-+        this.receivers = null;
-+        return this;
-+    }
-+
-+    /**
-+     * @param receivers List of players to receive this particle, or null for all players in the
-+     * world
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder receivers(@Nullable List<Player> receivers) {
-+        // Had to keep this as we first made API List<> and not Collection, but removing this may break plugins compiled on older jars
-+        // TODO: deprecate?
-+        this.receivers = receivers != null ? Lists.newArrayList(receivers) : null;
-+        return this;
-+    }
-+
-+    /**
-+     * @param receivers List of players to receive this particle, or null for all players in the
-+     * world
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder receivers(@Nullable Collection<Player> receivers) {
-+        this.receivers = receivers != null ? Lists.newArrayList(receivers) : null;
-+        return this;
-+    }
-+
-+    /**
-+     * @param receivers List of players to be receive this particle, or null for all players in the
-+     * world
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder receivers(@Nullable Player... receivers) {
-+        this.receivers = receivers != null ? Lists.newArrayList(receivers) : null;
-+        return this;
-+    }
-+
-+    /**
-+     * Selects all players within a cuboid selection around the particle location, within the
-+     * specified bounding box. If you want a more spherical check, see {@link #receivers(int,
-+     * boolean)}
-+     *
-+     * @param radius amount to add on all axis
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder receivers(int radius) {
-+        return receivers(radius, radius);
-+    }
-+
-+    /**
-+     * Selects all players within the specified radius around the particle location. If byDistance is
-+     * false, behavior uses cuboid selection the same as {@link #receivers(int, int)} If byDistance is
-+     * true, radius is tested by distance in a spherical shape
-+     *
-+     * @param radius amount to add on each axis
-+     * @param byDistance true to use a spherical radius, false to use a cuboid
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder receivers(int radius, boolean byDistance) {
-+        if (!byDistance) {
-+            return receivers(radius, radius, radius);
-+        } else {
-+            this.receivers = Lists.newArrayList();
-+            for (Player nearbyPlayer : location.getWorld()
-+                .getNearbyPlayers(location, radius, radius, radius)) {
-+                Location loc = nearbyPlayer.getLocation();
-+                double x = NumberConversions.square(location.getX() - loc.getX());
-+                double y = NumberConversions.square(location.getY() - loc.getY());
-+                double z = NumberConversions.square(location.getZ() - loc.getZ());
-+                if (Math.sqrt(x + y + z) > radius) {
-+                    continue;
-+                }
-+                this.receivers.add(nearbyPlayer);
-+            }
-+            return this;
-+        }
-+    }
-+
-+    /**
-+     * Selects all players within a cuboid selection around the particle location, within the
-+     * specified bounding box. Allows specifying a different Y size than X and Z If you want a more
-+     * cylinder check, see {@link #receivers(int, int, boolean)} If you want a more spherical check,
-+     * see {@link #receivers(int, boolean)}
-+     *
-+     * @param xzRadius amount to add on the x/z axis
-+     * @param yRadius amount to add on the y axis
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder receivers(int xzRadius, int yRadius) {
-+        return receivers(xzRadius, yRadius, xzRadius);
-+    }
-+
-+    /**
-+     * Selects all players within the specified radius around the particle location. If byDistance is
-+     * false, behavior uses cuboid selection the same as {@link #receivers(int, int)} If byDistance is
-+     * true, radius is tested by distance on the y plane and on the x/z plane, in a cylinder shape.
-+     *
-+     * @param xzRadius amount to add on the x/z axis
-+     * @param yRadius amount to add on the y axis
-+     * @param byDistance true to use a cylinder shape, false to use cuboid
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder receivers(int xzRadius, int yRadius, boolean byDistance) {
-+        if (!byDistance) {
-+            return receivers(xzRadius, yRadius, xzRadius);
-+        } else {
-+            this.receivers = Lists.newArrayList();
-+            for (Player nearbyPlayer : location.getWorld()
-+                .getNearbyPlayers(location, xzRadius, yRadius, xzRadius)) {
-+                Location loc = nearbyPlayer.getLocation();
-+                if (Math.abs(loc.getY() - this.location.getY()) > yRadius) {
-+                    continue;
-+                }
-+                double x = NumberConversions.square(location.getX() - loc.getX());
-+                double z = NumberConversions.square(location.getZ() - loc.getZ());
-+                if (x + z > NumberConversions.square(xzRadius)) {
-+                    continue;
-+                }
-+                this.receivers.add(nearbyPlayer);
-+            }
-+            return this;
-+        }
-+    }
-+
-+    /**
-+     * Selects all players within a cuboid selection around the particle location, within the
-+     * specified bounding box. If you want a more cylinder check, see {@link #receivers(int, int,
-+     * boolean)} If you want a more spherical check, see {@link #receivers(int, boolean)}
-+     *
-+     * @param xRadius amount to add on the x axis
-+     * @param yRadius amount to add on the y axis
-+     * @param zRadius amount to add on the z axis
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder receivers(int xRadius, int yRadius, int zRadius) {
-+        if (location == null) {
-+            throw new IllegalStateException("Please set location first");
-+        }
-+        return receivers(location.getWorld().getNearbyPlayers(location, xRadius, yRadius, zRadius));
-+    }
-+
-+    /**
-+     * @return The player considered the source of this particle (for Visibility concerns), or null
-+     */
-+    @Nullable
-+    public Player source() {
-+        return source;
-+    }
-+
-+    /**
-+     * Sets the source of this particle for visibility concerns (Vanish API)
-+     *
-+     * @param source The player who is considered the source
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder source(@Nullable Player source) {
-+        this.source = source;
-+        return this;
-+    }
-+
-+    /**
-+     * @return Location of where the particle will spawn
-+     */
-+    @Nullable
-+    public Location location() {
-+        return location;
-+    }
-+
-+    /**
-+     * Sets the location of where to spawn the particle
-+     *
-+     * @param location The location of the particle
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder location(@NotNull Location location) {
-+        this.location = location.clone();
-+        return this;
-+    }
-+
-+    /**
-+     * Sets the location of where to spawn the particle
-+     *
-+     * @param world World to spawn particle in
-+     * @param x X location
-+     * @param y Y location
-+     * @param z Z location
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder location(@NotNull World world, double x, double y, double z) {
-+        this.location = new Location(world, x, y, z);
-+        return this;
-+    }
-+
-+    /**
-+     * @return Number of particles to spawn
-+     */
-+    public int count() {
-+        return count;
-+    }
-+
-+    /**
-+     * Sets the number of particles to spawn
-+     *
-+     * @param count Number of particles
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder count(int count) {
-+        this.count = count;
-+        return this;
-+    }
-+
-+    /**
-+     * Particle offset X. Varies by particle on how this is used
-+     *
-+     * @return Particle offset X.
-+     */
-+    public double offsetX() {
-+        return offsetX;
-+    }
-+
-+    /**
-+     * Particle offset Y. Varies by particle on how this is used
-+     *
-+     * @return Particle offset Y.
-+     */
-+    public double offsetY() {
-+        return offsetY;
-+    }
-+
-+    /**
-+     * Particle offset Z. Varies by particle on how this is used
-+     *
-+     * @return Particle offset Z.
-+     */
-+    public double offsetZ() {
-+        return offsetZ;
-+    }
-+
-+    /**
-+     * Sets the particle offset. Varies by particle on how this is used
-+     *
-+     * @param offsetX Particle offset X
-+     * @param offsetY Particle offset Y
-+     * @param offsetZ Particle offset Z
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder offset(double offsetX, double offsetY, double offsetZ) {
-+        this.offsetX = offsetX;
-+        this.offsetY = offsetY;
-+        this.offsetZ = offsetZ;
-+        return this;
-+    }
-+
-+    /**
-+     * Gets the Particle extra data. Varies by particle on how this is used
-+     *
-+     * @return the extra particle data
-+     */
-+    public double extra() {
-+        return extra;
-+    }
-+
-+    /**
-+     * Sets the particle extra data. Varies by particle on how this is used
-+     *
-+     * @param extra the extra particle data
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder extra(double extra) {
-+        this.extra = extra;
-+        return this;
-+    }
-+
-+    /**
-+     * Gets the particle custom data. Varies by particle on how this is used
-+     *
-+     * @param <T> The Particle data type
-+     * @return the ParticleData for this particle
-+     */
-+    @Nullable
-+    public <T> T data() {
-+        //noinspection unchecked
-+        return (T) data;
-+    }
-+
-+    /**
-+     * Sets the particle custom data. Varies by particle on how this is used
-+     *
-+     * @param data The new particle data
-+     * @param <T> The Particle data type
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public <T> ParticleBuilder data(@Nullable T data) {
-+        this.data = data;
-+        return this;
-+    }
-+
-+    /**
-+     * Sets whether the particle is forcefully shown to the player. If forced, the particle will show
-+     * faraway, as far as the player's view distance allows. If false, the particle will show
-+     * according to the client's particle settings.
-+     *
-+     * @param force true to force, false for normal
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder force(boolean force) {
-+        this.force = force;
-+        return this;
-+    }
-+
-+    /**
-+     * Sets the particle Color. Only valid for REDSTONE.
-+     *
-+     * @param color the new particle color
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder color(@Nullable Color color) {
-+        return color(color, 1);
-+    }
-+
-+    /**
-+     * Sets the particle Color and size. Only valid for REDSTONE.
-+     *
-+     * @param color the new particle color
-+     * @param size the size of the particle
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder color(@Nullable Color color, float size) {
-+        if (particle != Particle.REDSTONE && color != null) {
-+            throw new IllegalStateException("Color may only be set on REDSTONE");
-+        }
-+
-+        // We don't officially support reusing these objects, but here we go
-+        if (color == null) {
-+            if (data instanceof Particle.DustOptions) {
-+                return data(null);
-+            } else {
-+                return this;
-+            }
-+        }
-+
-+        return data(new Particle.DustOptions(color, size));
-+    }
-+
-+    /**
-+     * Sets the particle Color.
-+     * Only valid for REDSTONE.
-+     * @param r red color component
-+     * @param g green color component
-+     * @param b blue color component
-+     * @return a reference to this object.
-+     */
-+    @NotNull
-+    public ParticleBuilder color(int r, int g, int b) {
-+        return color(Color.fromRGB(r, g, b));
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index b32de827cf8d1780861c271b4215276fdaab7165..1020002ff7127877db2d7e096f2c521751bf13a7 100644
--- a/src/main/java/org/bukkit/Particle.java
-+++ b/src/main/java/org/bukkit/Particle.java
-@@ -106,6 +106,17 @@ public enum Particle {
-         return dataType;
-     }
- 
-+    // Paper start - Particle API expansion
-+    /**
-+     * Creates a {@link com.destroystokyo.paper.ParticleBuilder}
-+     *
-+     * @return a {@link com.destroystokyo.paper.ParticleBuilder} for the particle
-+     */
-+    @NotNull
-+    public com.destroystokyo.paper.ParticleBuilder builder() {
-+        return new com.destroystokyo.paper.ParticleBuilder(this);
-+    }
-+    // Paper end
-     /**
-      * Options which can be applied to redstone dust particles - a particle
-      * color and size.
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 27bbddac946879149ec43d428417c4707f6a9a8c..fe125ae7bbd7c9dde9db7838169e4819416e148d 100644
--- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -2592,7 +2592,57 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
-      * @param data the data to use for the particle or null,
-      *             the type of this depends on {@link Particle#getDataType()}
-      */
-    public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
-+    public default <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data) { spawnParticle(particle, null, null, x, y, z, count, offsetX, offsetY, offsetZ, extra, data, true); }// Paper start - Expand Particle API
-+    /**
-+     * Spawns the particle (the number of times specified by count)
-+     * at the target location. The position of each particle will be
-+     * randomized positively and negatively by the offset parameters
-+     * on each axis.
-+     *
-+     * @param particle the particle to spawn
-+     * @param receivers List of players to receive the particles, or null for all in world
-+     * @param source Source of the particles to be used in visibility checks, or null if no player source
-+     * @param x the position on the x axis to spawn at
-+     * @param y the position on the y axis to spawn at
-+     * @param z the position on the z axis to spawn at
-+     * @param count the number of particles
-+     * @param offsetX the maximum random offset on the X axis
-+     * @param offsetY the maximum random offset on the Y axis
-+     * @param offsetZ the maximum random offset on the Z axis
-+     * @param extra the extra data for this particle, depends on the
-+     *              particle used (normally speed)
-+     * @param data the data to use for the particle or null,
-+     *             the type of this depends on {@link Particle#getDataType()}
-+     * @param <T> Type
-+     */
-+    public default <T> void spawnParticle(@NotNull Particle particle, @Nullable List<Player> receivers, @NotNull Player source, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data) { spawnParticle(particle, receivers, source, x, y, z, count, offsetX, offsetY, offsetZ, extra, data, true); }
-+    /**
-+     * Spawns the particle (the number of times specified by count)
-+     * at the target location. The position of each particle will be
-+     * randomized positively and negatively by the offset parameters
-+     * on each axis.
-+     *
-+     * @param particle the particle to spawn
-+     * @param receivers List of players to receive the particles, or null for all in world
-+     * @param source Source of the particles to be used in visibility checks, or null if no player source
-+     * @param x the position on the x axis to spawn at
-+     * @param y the position on the y axis to spawn at
-+     * @param z the position on the z axis to spawn at
-+     * @param count the number of particles
-+     * @param offsetX the maximum random offset on the X axis
-+     * @param offsetY the maximum random offset on the Y axis
-+     * @param offsetZ the maximum random offset on the Z axis
-+     * @param extra the extra data for this particle, depends on the
-+     *              particle used (normally speed)
-+     * @param data the data to use for the particle or null,
-+     *             the type of this depends on {@link Particle#getDataType()}
-+     * @param <T> Type
-+     * @param force allows the particle to be seen further away from the player
-+     *              and shows to players using any vanilla client particle settings
-+     */
-+    public <T> void spawnParticle(@NotNull Particle particle, @Nullable List<Player> receivers, @Nullable Player source, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
-+    // Paper end
-+
- 
-     /**
-      * Spawns the particle (the number of times specified by count)
@@ -1,141 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 1 May 2018 21:33:35 -0400
-Subject: [PATCH] Close Plugin Class Loaders on Disable
-
-This should close more memory leaks from /reload and disabling plugins,
-by closing the class loader and the jar file.
-
-diff --git a/src/main/java/org/bukkit/plugin/PluginLoader.java b/src/main/java/org/bukkit/plugin/PluginLoader.java
-index a88733f1cd1ddb5d85ab1b0e6af4fd5b80bbc1c6..6ab9cd8213cbe35943748dcf42948d5fc048c84c 100644
--- a/src/main/java/org/bukkit/plugin/PluginLoader.java
-+++ b/src/main/java/org/bukkit/plugin/PluginLoader.java
-@@ -77,4 +77,18 @@ public interface PluginLoader {
-      * @param plugin Plugin to disable
-      */
-     public void disablePlugin(@NotNull Plugin plugin);
-+    // Paper start - close Classloader on disable
-+    /**
-+     * Disables the specified plugin
-+     * <p>
-+     * Attempting to disable a plugin that is not enabled will have no effect
-+     *
-+     * @param plugin Plugin to disable
-+     * @param closeClassloader if the classloader for the Plugin should be closed
-+     */
-+    // provide default to allow other PluginLoader implementations to work
-+    default public void disablePlugin(@NotNull Plugin plugin, boolean closeClassloader) {
-+        disablePlugin(plugin);
-+    }
-+    // Paper end - close Classloader on disable
- }
-diff --git a/src/main/java/org/bukkit/plugin/PluginManager.java b/src/main/java/org/bukkit/plugin/PluginManager.java
-index 41e26451fe12d8e6e0ef73c85731b24b4e3f200c..86cc5025ad98f7a752c51713b7cd6a39d5136ecc 100644
--- a/src/main/java/org/bukkit/plugin/PluginManager.java
-+++ b/src/main/java/org/bukkit/plugin/PluginManager.java
-@@ -161,6 +161,18 @@ public interface PluginManager {
-      */
-     public void disablePlugin(@NotNull Plugin plugin);
- 
-+    // Paper start - close Classloader on disable
-+    /**
-+     * Disables the specified plugin
-+     * <p>
-+     * Attempting to disable a plugin that is not enabled will have no effect
-+     *
-+     * @param plugin Plugin to disable
-+     * @param closeClassloader if the classloader for the Plugin should be closed
-+     */
-+    public void disablePlugin(@NotNull Plugin plugin, boolean closeClassloader);
-+    // Paper end - close Classloader on disable
-+
-     /**
-      * Gets a {@link Permission} from its fully qualified name
-      *
-diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 8b33d914d29897c0276f9e2e7ce83bd2c316d5e2..a7393d2830b95d7167121b02066a3f357cee6085 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -492,17 +492,28 @@ public final class SimplePluginManager implements PluginManager {
- 
-     @Override
-     public void disablePlugins() {
-+        disablePlugins(false);
-+    }
-+
-+    public void disablePlugins(boolean closeClassloaders) {
-+        // Paper end - close Classloader on disable
-         Plugin[] plugins = getPlugins();
-         for (int i = plugins.length - 1; i >= 0; i--) {
-            disablePlugin(plugins[i]);
-+            disablePlugin(plugins[i], closeClassloaders); // Paper - close Classloader on disable
-         }
-     }
- 
-     @Override
-     public void disablePlugin(@NotNull final Plugin plugin) {
-+        disablePlugin(plugin, false);
-+    }
-+
-+    @Override
-+    public void disablePlugin(@NotNull final Plugin plugin, boolean closeClassloader) {
-+        // Paper end - close Classloader on disable
-         if (plugin.isEnabled()) {
-             try {
-                plugin.getPluginLoader().disablePlugin(plugin);
-+                plugin.getPluginLoader().disablePlugin(plugin, closeClassloader); // Paper - close Classloader on disable
-             } catch (Throwable ex) {
-                 handlePluginException("Error occurred (in the plugin loader) while disabling "
-                         + plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
-@@ -557,7 +568,7 @@ public final class SimplePluginManager implements PluginManager {
-     @Override
-     public void clearPlugins() {
-         synchronized (this) {
-            disablePlugins();
-+            disablePlugins(true); // Paper - close Classloader on disable
-             plugins.clear();
-             lookupNames.clear();
-             dependencyGraph = GraphBuilder.directed().build();
-diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 79ac529017aac059d13fe342f279e9c8faeba599..816c2b1797447ab315ceb6eda89d25f27d2bce98 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -322,7 +322,7 @@ public final class JavaPluginLoader implements PluginLoader {
-             } 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
-                disablePlugin(jPlugin);
-+                server.getPluginManager().disablePlugin(jPlugin, true); // Paper - close Classloader on disable - She's dead jim
-                 return;
-                 // Paper end
-             }
-@@ -335,6 +335,12 @@ public final class JavaPluginLoader implements PluginLoader {
- 
-     @Override
-     public void disablePlugin(@NotNull Plugin plugin) {
-+    // Paper start - close Classloader on disable
-+        disablePlugin(plugin, false); // Retain old behavior unless requested
-+    }
-+
-+    public void disablePlugin(@NotNull Plugin plugin, boolean closeClassloader) {
-+        // Paper end - close Class Loader on disable
-         Validate.isTrue(plugin instanceof JavaPlugin, "Plugin is not associated with this PluginLoader");
- 
-         if (plugin.isEnabled()) {
-@@ -367,6 +373,16 @@ public final class JavaPluginLoader implements PluginLoader {
-                 } catch (IOException ex) {
-                     //
-                 }
-+                // Paper start - close Class Loader on disable
-+                try {
-+                    if (closeClassloader) {
-+                        loader.close();
-+                    }
-+                } catch (IOException e) {
-+                    server.getLogger().log(Level.WARNING, "Error closing the Plugin Class Loader for " + plugin.getDescription().getFullName());
-+                    e.printStackTrace();
-+                }
-+                // Paper end
-             }
-         }
-     }
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 24 May 2018 21:01:13 -0400
-Subject: [PATCH] Location.toBlockLocation/toCenterLocation()
-
-Convert location objects to their block coordinates, or the center of the block
-
-diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 6c8b8eddcdb81f7151202eb12541308040790d45..f61bf28afe99f83cdac6490bcc114509698d0aad 100644
--- a/src/main/java/org/bukkit/Location.java
-+++ b/src/main/java/org/bukkit/Location.java
-@@ -534,6 +534,31 @@ public class Location implements Cloneable, ConfigurationSerializable {
-     }
- 
-     public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
-+
-+    // Paper start
-+    /**
-+     * @return A new location where X/Y/Z are on the Block location (integer value of X/Y/Z)
-+     */
-+    @NotNull
-+    public Location toBlockLocation() {
-+        Location blockLoc = clone();
-+        blockLoc.setX(getBlockX());
-+        blockLoc.setY(getBlockY());
-+        blockLoc.setZ(getBlockZ());
-+        return blockLoc;
-+    }
-+    /**
-+     * @return A new location where X/Y/Z are the center of the block
-+     */
-+    @NotNull
-+    public Location toCenterLocation() {
-+        Location centerLoc = clone();
-+        centerLoc.setX(getBlockX() + 0.5);
-+        centerLoc.setY(getBlockY() + 0.5);
-+        centerLoc.setZ(getBlockZ() + 0.5);
-+        return centerLoc;
-+    }
-+    // Paper end
-     @Override
-     public boolean equals(Object obj) {
-         if (obj == null) {
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 3 Jun 2018 04:10:13 -0400
-Subject: [PATCH] PotionEffect clone methods
-
-
-diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java
-index 60716c627d315b08c3fe03b1a945af60c350711f..74767751199bce03d63f2a9524712656193f850c 100644
--- a/src/main/java/org/bukkit/potion/PotionEffect.java
-+++ b/src/main/java/org/bukkit/potion/PotionEffect.java
-@@ -101,6 +101,33 @@ public class PotionEffect implements ConfigurationSerializable {
-         this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true)));
-     }
- 
-+    // Paper start
-+    @NotNull
-+    public PotionEffect withType(@NotNull PotionEffectType type) {
-+        return new PotionEffect(type, duration, amplifier, ambient, particles, icon);
-+    }
-+    @NotNull
-+    public PotionEffect withDuration(int duration) {
-+        return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
-+    }
-+    @NotNull
-+    public PotionEffect withAmplifier(int amplifier) {
-+        return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
-+    }
-+    @NotNull
-+    public PotionEffect withAmbient(boolean ambient) {
-+        return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
-+    }
-+    @NotNull
-+    public PotionEffect withParticles(boolean particles) {
-+        return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
-+    }
-+    @NotNull
-+    public PotionEffect withIcon(boolean icon) {
-+        return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
-+    }
-+    // Paper end
-+
-     @NotNull
-     private static PotionEffectType getEffectType(@NotNull Map<?, ?> map) {
-         int type = getInt(map, TYPE);
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 5 Jun 2018 22:59:50 -0400
-Subject: [PATCH] ItemStack#getMaxItemUseDuration
-
-Allows you to determine how long it takes to use a usable/consumable item
-
-diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 82bd3e6701dbd7df9f0f8c3801c5ae1baba4eec5..f41701e6374ca23eca4bdb092e385053a12eb718 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
-+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -636,5 +636,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
-     public String getI18NDisplayName() {
-         return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
-     }
-+
-+    public int getMaxItemUseDuration() {
-+        if (type == null || type == Material.AIR || !type.isItem()) {
-+            return 0;
-+        }
-+        // Requires access to NMS
-+        return ensureServerConversions().getMaxItemUseDuration();
-+    }
-     // Paper end
- }
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 16 Jun 2018 01:17:39 -0500
-Subject: [PATCH] Make shield blocking delay configurable
-
-
-diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 33fffda7c8b05cde3c95623937e7eb6c8b628ec6..879dec59f202ee95043bd7317a672cd59ab3bbbe 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
-+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -628,5 +628,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-      * @param arrows Number of arrows to stick in this entity
-      */
-     void setArrowsStuck(int arrows);
-+
-+    /**
-+     * Get the delay (in ticks) before blocking is effective for this entity
-+     *
-+     * @return Delay in ticks
-+     */
-+    int getShieldBlockingDelay();
-+
-+    /**
-+     * Set the delay (in ticks) before blocking is effective for this entity
-+     *
-+     * @param delay Delay in ticks
-+     */
-+    void setShieldBlockingDelay(int delay);
-     // Paper end
- }
@@ -1,275 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Mon, 18 Jun 2018 00:41:46 -0500
-Subject: [PATCH] Add "getNearbyXXX" methods to Location
-
-
-diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index f61bf28afe99f83cdac6490bcc114509698d0aad..4cf22afc3c1f1cc19b6e5350043431215908a612 100644
--- a/src/main/java/org/bukkit/Location.java
-+++ b/src/main/java/org/bukkit/Location.java
-@@ -12,6 +12,15 @@ import org.bukkit.util.Vector;
- import org.jetbrains.annotations.NotNull;
- import org.jetbrains.annotations.Nullable;
- 
-+// Paper start
-+import java.util.Collection;
-+import java.util.Collections;
-+import java.util.function.Predicate;
-+import org.bukkit.entity.Entity;
-+import org.bukkit.entity.LivingEntity;
-+import org.bukkit.entity.Player;
-+// Paper end
-+
- /**
-  * Represents a 3-dimensional position in a world.
-  * <br>
-@@ -558,6 +567,248 @@ public class Location implements Cloneable, ConfigurationSerializable {
-         centerLoc.setZ(getBlockZ() + 0.5);
-         return centerLoc;
-     }
-+
-+    /**
-+     * Returns a list of entities within a bounding box centered around a Location.
-+     *
-+     * Some implementations may impose artificial restrictions on the size of the search bounding box.
-+     *
-+     * @param x 1/2 the size of the box along x axis
-+     * @param y 1/2 the size of the box along y axis
-+     * @param z 1/2 the size of the box along z axis
-+     * @return the collection of entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public Collection<Entity> getNearbyEntities(double x, double y, double z) {
-+        World world = this.getWorld();
-+        if (world == null) {
-+            throw new IllegalArgumentException("Location has no world");
-+        }
-+        return world.getNearbyEntities(this, x, y, z);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param radius X Radius
-+     * @return the collection of entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public Collection<LivingEntity> getNearbyLivingEntities(double radius) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, radius, radius, radius);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param xzRadius X/Z Radius
-+     * @param yRadius Y Radius
-+     * @return the collection of living entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public Collection<LivingEntity> getNearbyLivingEntities(double xzRadius, double yRadius) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, xzRadius, yRadius, xzRadius);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param xRadius X Radius
-+     * @param yRadius Y Radius
-+     * @param zRadius Z radius
-+     * @return the collection of living entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public Collection<LivingEntity> getNearbyLivingEntities(double xRadius, double yRadius, double zRadius) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, xRadius, yRadius, zRadius);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param radius Radius
-+     * @param predicate a predicate used to filter results
-+     * @return the collection of living entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public Collection<LivingEntity> getNearbyLivingEntities(double radius, @Nullable Predicate<LivingEntity> predicate) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, radius, radius, radius, predicate);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param xzRadius X/Z Radius
-+     * @param yRadius Y Radius
-+     * @param predicate a predicate used to filter results
-+     * @return the collection of living entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public Collection<LivingEntity> getNearbyLivingEntities(double xzRadius, double yRadius, @Nullable Predicate<LivingEntity> predicate) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, xzRadius, yRadius, xzRadius, predicate);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param xRadius X Radius
-+     * @param yRadius Y Radius
-+     * @param zRadius Z radius
-+     * @param predicate a predicate used to filter results
-+     * @return the collection of living entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public Collection<LivingEntity> getNearbyLivingEntities(double xRadius, double yRadius, double zRadius, @Nullable Predicate<LivingEntity> predicate) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, xRadius, yRadius, zRadius, predicate);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param radius X/Y/Z Radius
-+     * @return the collection of players near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public Collection<Player> getNearbyPlayers(double radius) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, radius, radius, radius);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param xzRadius X/Z Radius
-+     * @param yRadius Y Radius
-+     * @return the collection of players near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public Collection<Player> getNearbyPlayers(double xzRadius, double yRadius) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, xzRadius, yRadius, xzRadius);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param xRadius X Radius
-+     * @param yRadius Y Radius
-+     * @param zRadius Z Radius
-+     * @return the collection of players near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public Collection<Player> getNearbyPlayers(double xRadius, double yRadius, double zRadius) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, xRadius, yRadius, zRadius);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param radius X/Y/Z Radius
-+     * @param predicate a predicate used to filter results
-+     * @return the collection of players near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public Collection<Player> getNearbyPlayers(double radius, @Nullable Predicate<Player> predicate) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, radius, radius, radius, predicate);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param xzRadius X/Z Radius
-+     * @param yRadius Y Radius
-+     * @param predicate a predicate used to filter results
-+     * @return the collection of players near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public Collection<Player> getNearbyPlayers(double xzRadius, double yRadius, @Nullable Predicate<Player> predicate) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, xzRadius, yRadius, xzRadius, predicate);
-+    }
-+
-+    /**
-+     * Gets nearby players within the specified radius (bounding box)
-+     * @param xRadius X Radius
-+     * @param yRadius Y Radius
-+     * @param zRadius Z Radius
-+     * @param predicate a predicate used to filter results
-+     * @return the collection of players near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public Collection<Player> getNearbyPlayers(double xRadius, double yRadius, double zRadius, @Nullable Predicate<Player> predicate) {
-+        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, xRadius, yRadius, zRadius, predicate);
-+    }
-+
-+    /**
-+     * Gets all nearby entities of the specified type, within the specified radius (bounding box)
-+     * @param clazz Type to filter by
-+     * @param radius X/Y/Z radius to search within
-+     * @param <T> the entity type
-+     * @return the collection of entities of type clazz near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, double radius) {
-+        return getNearbyEntitiesByType(clazz, radius, radius, radius, null);
-+    }
-+
-+    /**
-+     * Gets all nearby entities of the specified type, within the specified radius, with x and x radius matching (bounding box)
-+     * @param clazz Type to filter by
-+     * @param xzRadius X/Z radius to search within
-+     * @param yRadius Y radius to search within
-+     * @param <T> the entity type
-+     * @return the collection of entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, double xzRadius, double yRadius) {
-+        return getNearbyEntitiesByType(clazz, xzRadius, yRadius, xzRadius, null);
-+    }
-+
-+    /**
-+     * Gets all nearby entities of the specified type, within the specified radius (bounding box)
-+     * @param clazz Type to filter by
-+     * @param xRadius X Radius
-+     * @param yRadius Y Radius
-+     * @param zRadius Z Radius
-+     * @param <T> the entity type
-+     * @return the collection of entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, double xRadius, double yRadius, double zRadius) {
-+        return getNearbyEntitiesByType(clazz, xRadius, yRadius, zRadius, null);
-+    }
-+
-+    /**
-+     * Gets all nearby entities of the specified type, within the specified radius (bounding box)
-+     * @param clazz Type to filter by
-+     * @param radius X/Y/Z radius to search within
-+     * @param predicate a predicate used to filter results
-+     * @param <T> the entity type
-+     * @return the collection of entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, double radius, @Nullable Predicate<T> predicate) {
-+        return getNearbyEntitiesByType(clazz, radius, radius, radius, predicate);
-+    }
-+
-+    /**
-+     * Gets all nearby entities of the specified type, within the specified radius, with x and x radius matching (bounding box)
-+     * @param clazz Type to filter by
-+     * @param xzRadius X/Z radius to search within
-+     * @param yRadius Y radius to search within
-+     * @param predicate a predicate used to filter results
-+     * @param <T> the entity type
-+     * @return the collection of entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, double xzRadius, double yRadius, @Nullable Predicate<T> predicate) {
-+        return getNearbyEntitiesByType(clazz, xzRadius, yRadius, xzRadius, predicate);
-+    }
-+
-+    /**
-+     * Gets all nearby entities of the specified type, within the specified radius (bounding box)
-+     * @param clazz Type to filter by
-+     * @param xRadius X Radius
-+     * @param yRadius Y Radius
-+     * @param zRadius Z Radius
-+     * @param predicate a predicate used to filter results
-+     * @param <T> the entity type
-+     * @return the collection of entities near location. This will always be a non-null collection.
-+     */
-+    @NotNull
-+    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends Entity> clazz, double xRadius, double yRadius, double zRadius, @Nullable Predicate<T> predicate) {
-+        World world = this.getWorld();
-+        if (world == null) {
-+            throw new IllegalArgumentException("Location has no world");
-+        }
-+        return world.getNearbyEntitiesByType(clazz, this, xRadius, yRadius, zRadius, predicate);
-+    }
-     // Paper end
-     @Override
-     public boolean equals(Object obj) {
@@ -1,200 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 19 Dec 2017 16:24:42 -0500
-Subject: [PATCH] Expand Explosions API
-
-Add Entity as a Source capability, and add more API choices, and on Location.
-
-diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 4cf22afc3c1f1cc19b6e5350043431215908a612..af2ee43f2c5133668c18710f526a107d94a5d898 100644
--- a/src/main/java/org/bukkit/Location.java
-+++ b/src/main/java/org/bukkit/Location.java
-@@ -7,6 +7,7 @@ import java.util.HashMap;
- import java.util.Map;
- import org.bukkit.block.Block;
- import org.bukkit.configuration.serialization.ConfigurationSerializable;
-+import org.bukkit.entity.Entity; // Paper
- import org.bukkit.util.NumberConversions;
- import org.bukkit.util.Vector;
- import org.jetbrains.annotations.NotNull;
-@@ -568,6 +569,87 @@ public class Location implements Cloneable, ConfigurationSerializable {
-         return centerLoc;
-     }
- 
-+    /**
-+     * Creates explosion at this location with given power
-+     *
-+     * Will break blocks and ignite blocks on fire.
-+     *
-+     * @param power The power of explosion, where 4F is TNT
-+     * @return false if explosion was canceled, otherwise true
-+     */
-+    public boolean createExplosion(float power) {
-+        return this.getWorld().createExplosion(this, power);
-+    }
-+
-+    /**
-+     * Creates explosion at this location with given power and optionally
-+     * setting blocks on fire.
-+     *
-+     * Will break blocks.
-+     *
-+     * @param power The power of explosion, where 4F is TNT
-+     * @param setFire Whether or not to set blocks on fire
-+     * @return false if explosion was canceled, otherwise true
-+     */
-+    public boolean createExplosion(float power, boolean setFire) {
-+        return this.getWorld().createExplosion(this, power, setFire);
-+    }
-+
-+    /**
-+     * Creates explosion at this location with given power and optionally
-+     * setting blocks on fire.
-+     *
-+     * @param power The power of explosion, where 4F is TNT
-+     * @param setFire Whether or not to set blocks on fire
-+     * @param breakBlocks Whether or not to have blocks be destroyed
-+     * @return false if explosion was canceled, otherwise true
-+     */
-+    public boolean createExplosion(float power, boolean setFire, boolean breakBlocks) {
-+        return this.getWorld().createExplosion(this, power, setFire, breakBlocks);
-+    }
-+
-+    /**
-+     * Creates explosion at this location with given power, with the specified entity as the source.
-+     *
-+     * Will break blocks and ignite blocks on fire.
-+     *
-+     * @param source The source entity of the explosion
-+     * @param power The power of explosion, where 4F is TNT
-+     * @return false if explosion was canceled, otherwise true
-+     */
-+    public boolean createExplosion(@Nullable Entity source, float power) {
-+        return this.getWorld().createExplosion(source, this, power, true, true);
-+    }
-+
-+    /**
-+     * Creates explosion at this location with given power and optionally
-+     * setting blocks on fire, with the specified entity as the source.
-+     *
-+     * Will break blocks.
-+     *
-+     * @param source The source entity of the explosion
-+     * @param power The power of explosion, where 4F is TNT
-+     * @param setFire Whether or not to set blocks on fire
-+     * @return false if explosion was canceled, otherwise true
-+     */
-+    public boolean createExplosion(@Nullable Entity source, float power, boolean setFire) {
-+        return this.getWorld().createExplosion(source, this, power, setFire, true);
-+    }
-+
-+    /**
-+     * Creates explosion at this location with given power and optionally
-+     * setting blocks on fire, with the specified entity as the source.
-+     *
-+     * @param source The source entity of the explosion
-+     * @param power The power of explosion, where 4F is TNT
-+     * @param setFire Whether or not to set blocks on fire
-+     * @param breakBlocks Whether or not to have blocks be destroyed
-+     * @return false if explosion was canceled, otherwise true
-+     */
-+    public boolean createExplosion(@NotNull Entity source, float power, boolean setFire, boolean breakBlocks) {
-+        return this.getWorld().createExplosion(source, this, power, setFire, breakBlocks);
-+    }
-+
-     /**
-      * Returns a list of entities within a bounding box centered around a Location.
-      *
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 05643d0f2bf2cb2dedb0a2ad693b2121565d3f1f..c7cdbc36f96a8ee9eaac2a2145afbfc76bc38cc9 100644
--- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -1442,6 +1442,88 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
-      */
-     public boolean createExplosion(@NotNull Location loc, float power, boolean setFire);
- 
-+    // Paper start
-+    /**
-+     * Creates explosion at given location with given power and optionally
-+     * setting blocks on fire, with the specified entity as the source.
-+     *
-+     * @param source The source entity of the explosion
-+     * @param loc Location to blow up
-+     * @param power The power of explosion, where 4F is TNT
-+     * @param setFire Whether or not to set blocks on fire
-+     * @param breakBlocks Whether or not to have blocks be destroyed
-+     * @return false if explosion was canceled, otherwise true
-+     */
-+    public boolean createExplosion(@Nullable Entity source, @NotNull Location loc, float power, boolean setFire, boolean breakBlocks);
-+
-+    /**
-+     * Creates explosion at given location with given power and optionally
-+     * setting blocks on fire, with the specified entity as the source.
-+     *
-+     * Will destroy other blocks
-+     *
-+     * @param source The source entity of the explosion
-+     * @param loc Location to blow up
-+     * @param power The power of explosion, where 4F is TNT
-+     * @param setFire Whether or not to set blocks on fire
-+     * @return false if explosion was canceled, otherwise true
-+     */
-+    public default boolean createExplosion(@Nullable Entity source, @NotNull Location loc, float power, boolean setFire) {
-+        return createExplosion(source, loc, power, setFire, true);
-+    }
-+    /**
-+     * Creates explosion at given location with given power, with the specified entity as the source.
-+     * Will set blocks on fire and destroy blocks.
-+     *
-+     * @param source The source entity of the explosion
-+     * @param loc Location to blow up
-+     * @param power The power of explosion, where 4F is TNT
-+     * @return false if explosion was canceled, otherwise true
-+     */
-+    public default boolean createExplosion(@Nullable Entity source, @NotNull Location loc, float power) {
-+        return createExplosion(source, loc, power, true, true);
-+    }
-+    /**
-+     * Creates explosion at given entities location with given power and optionally
-+     * setting blocks on fire, with the specified entity as the source.
-+     *
-+     * @param source The source entity of the explosion
-+     * @param power The power of explosion, where 4F is TNT
-+     * @param setFire Whether or not to set blocks on fire
-+     * @param breakBlocks Whether or not to have blocks be destroyed
-+     * @return false if explosion was canceled, otherwise true
-+     */
-+    public default boolean createExplosion(@NotNull Entity source, float power, boolean setFire, boolean breakBlocks) {
-+        return createExplosion(source, source.getLocation(), power, setFire, breakBlocks);
-+    }
-+    /**
-+     * Creates explosion at given entities location with given power and optionally
-+     * setting blocks on fire, with the specified entity as the source.
-+     *
-+     * Will destroy blocks.
-+     *
-+     * @param source The source entity of the explosion
-+     * @param power The power of explosion, where 4F is TNT
-+     * @param setFire Whether or not to set blocks on fire
-+     * @return false if explosion was canceled, otherwise true
-+     */
-+    public default boolean createExplosion(@NotNull Entity source, float power, boolean setFire) {
-+        return createExplosion(source, source.getLocation(), power, setFire, true);
-+    }
-+
-+    /**
-+     * Creates explosion at given entities location with given power and optionally
-+     * setting blocks on fire, with the specified entity as the source.
-+     *
-+     * @param source The source entity of the explosion
-+     * @param power The power of explosion, where 4F is TNT
-+     * @return false if explosion was canceled, otherwise true
-+     */
-+    public default boolean createExplosion(@NotNull Entity source, float power) {
-+        return createExplosion(source, source.getLocation(), power, true, true);
-+    }
-+    // Paper end
-+
-     /**
-      * Creates explosion at given coordinates with given power and optionally
-      * setting blocks on fire or breaking blocks.
@@ -1,206 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 22 Jun 2018 22:59:18 -0400
-Subject: [PATCH] ItemStack API additions for quantity/flags/lore
-
-
-diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index f41701e6374ca23eca4bdb092e385053a12eb718..07fd8a495828ff79239359c736c425c4902543a4 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
-+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -2,7 +2,9 @@ package org.bukkit.inventory;
- 
- import com.google.common.collect.ImmutableMap;
- import java.util.LinkedHashMap;
-+import java.util.List; // Paper
- import java.util.Map;
-+import java.util.Set; // Paper
- import org.apache.commons.lang.Validate;
- import org.bukkit.Bukkit;
- import org.bukkit.Material;
-@@ -644,5 +646,185 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
-         // Requires access to NMS
-         return ensureServerConversions().getMaxItemUseDuration();
-     }
-+
-+    /**
-+     * Clones the itemstack and returns it a single quantity.
-+     * @return The new itemstack with 1 quantity
-+     */
-+    @NotNull
-+    public ItemStack asOne() {
-+        return asQuantity(1);
-+    }
-+
-+    /**
-+     * Clones the itemstack and returns it as the specified quantity
-+     * @param qty The quantity of the cloned item
-+     * @return The new itemstack with specified quantity
-+     */
-+    @NotNull
-+    public ItemStack asQuantity(int qty) {
-+        ItemStack clone = clone();
-+        clone.setAmount(qty);
-+        return clone;
-+    }
-+
-+    /**
-+     * Adds 1 to this itemstack. Will not go over the items max stack size.
-+     * @return The same item (not a clone)
-+     */
-+    @NotNull
-+    public ItemStack add() {
-+        return add(1);
-+    }
-+
-+    /**
-+     * Adds quantity to this itemstack. Will not go over the items max stack size.
-+     *
-+     * @param qty The amount to add
-+     * @return The same item (not a clone)
-+     */
-+    @NotNull
-+    public ItemStack add(int qty) {
-+        setAmount(Math.min(getMaxStackSize(), getAmount() + qty));
-+        return this;
-+    }
-+
-+    /**
-+     * Subtracts 1 to this itemstack.  Going to 0 or less will invalidate the item.
-+     * @return The same item (not a clone)
-+     */
-+    @NotNull
-+    public ItemStack subtract() {
-+        return subtract(1);
-+    }
-+
-+    /**
-+     * Subtracts quantity to this itemstack. Going to 0 or less will invalidate the item.
-+     *
-+     * @param qty The amount to add
-+     * @return The same item (not a clone)
-+     */
-+    @NotNull
-+    public ItemStack subtract(int qty) {
-+        setAmount(Math.max(0, getAmount() - qty));
-+        return this;
-+    }
-+
-+    /**
-+     * If the item has lore, returns it, else it will return null
-+     * @return The lore, or null
-+     * @deprecated in favor of {@link #lore()}
-+     */
-+    @Deprecated
-+    public @Nullable List<String> getLore() {
-+        if (!hasItemMeta()) {
-+            return null;
-+        }
-+        ItemMeta itemMeta = getItemMeta();
-+        if (!itemMeta.hasLore()) {
-+            return null;
-+        }
-+        return itemMeta.getLore();
-+    }
-+
-+    /**
-+     * If the item has lore, returns it, else it will return null
-+     * @return The lore, or null
-+     */
-+    public @Nullable List<net.kyori.adventure.text.Component> lore() {
-+        if (!this.hasItemMeta()) {
-+            return null;
-+        }
-+        final ItemMeta itemMeta = getItemMeta();
-+        if (!itemMeta.hasLore()) {
-+            return null;
-+        }
-+        return itemMeta.lore();
-+    }
-+
-+    /**
-+     * Sets the lore for this item.
-+     * Removes lore when given null.
-+     *
-+     * @param lore the lore that will be set
-+     * @deprecated in favour of {@link #lore(List)}
-+     */
-+    @Deprecated
-+    public void setLore(@Nullable List<String> lore) {
-+        ItemMeta itemMeta = getItemMeta();
-+        if (itemMeta == null) {
-+            throw new IllegalStateException("Cannot set lore on " + getType());
-+        }
-+        itemMeta.setLore(lore);
-+        setItemMeta(itemMeta);
-+    }
-+
-+    /**
-+     * Sets the lore for this item.
-+     * Removes lore when given null.
-+     *
-+     * @param lore the lore that will be set
-+     */
-+    public void lore(@Nullable List<net.kyori.adventure.text.Component> lore) {
-+        ItemMeta itemMeta = getItemMeta();
-+        if (itemMeta == null) {
-+            throw new IllegalStateException("Cannot set lore on " + getType());
-+        }
-+        itemMeta.lore(lore);
-+        this.setItemMeta(itemMeta);
-+    }
-+
-+    /**
-+     * Set itemflags which should be ignored when rendering a ItemStack in the Client. This Method does silently ignore double set itemFlags.
-+     *
-+     * @param itemFlags The hideflags which shouldn't be rendered
-+     */
-+    public void addItemFlags(@NotNull ItemFlag... itemFlags) {
-+        ItemMeta itemMeta = getItemMeta();
-+        if (itemMeta == null) {
-+            throw new IllegalStateException("Cannot add flags on " + getType());
-+        }
-+        itemMeta.addItemFlags(itemFlags);
-+        setItemMeta(itemMeta);
-+    }
-+
-+    /**
-+     * Remove specific set of itemFlags. This tells the Client it should render it again. This Method does silently ignore double removed itemFlags.
-+     *
-+     * @param itemFlags Hideflags which should be removed
-+     */
-+    public void removeItemFlags(@NotNull ItemFlag... itemFlags) {
-+        ItemMeta itemMeta = getItemMeta();
-+        if (itemMeta == null) {
-+            throw new IllegalStateException("Cannot remove flags on " + getType());
-+        }
-+        itemMeta.removeItemFlags(itemFlags);
-+        setItemMeta(itemMeta);
-+    }
-+
-+    /**
-+     * Get current set itemFlags. The collection returned is unmodifiable.
-+     *
-+     * @return A set of all itemFlags set
-+     */
-+    @NotNull
-+    public Set<ItemFlag> getItemFlags() {
-+        ItemMeta itemMeta = getItemMeta();
-+        if (itemMeta == null) {
-+            return java.util.Collections.emptySet();
-+        }
-+        return itemMeta.getItemFlags();
-+    }
-+
-+    /**
-+     * Check if the specified flag is present on this item.
-+     *
-+     * @param flag the flag to check
-+     * @return if it is present
-+     */
-+    public boolean hasItemFlag(@NotNull ItemFlag flag) {
-+        ItemMeta itemMeta = getItemMeta();
-+        return itemMeta != null && itemMeta.hasItemFlag(flag);
-+    }
-     // Paper end
- }
@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 29 Jun 2018 00:19:19 -0400
-Subject: [PATCH] LivingEntity Hand Raised/Item Use API
-
-How long an entity has raised hands to charge an attack or use an item
-
-diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 879dec59f202ee95043bd7317a672cd59ab3bbbe..4f62a49e7b0538f0ce9cecd2c1b645f40ce17b3d 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
-+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -12,6 +12,7 @@ import org.bukkit.attribute.Attributable;
- import org.bukkit.block.Block;
- import org.bukkit.entity.memory.MemoryKey;
- import org.bukkit.inventory.EntityEquipment;
-+import org.bukkit.inventory.ItemStack;
- import org.bukkit.potion.PotionEffect;
- import org.bukkit.potion.PotionEffectType;
- import org.bukkit.projectiles.ProjectileSource;
-@@ -642,5 +643,42 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-      * @param delay Delay in ticks
-      */
-     void setShieldBlockingDelay(int delay);
-+
-+    /**
-+     * Get's the item being actively "used" or consumed.
-+     * @return The item. Will be null if no active item.
-+     */
-+    @Nullable
-+    ItemStack getActiveItem();
-+
-+    /**
-+     * Get's remaining time a player needs to keep hands raised with an item to finish using it.
-+     * @return Remaining ticks to use the item
-+     */
-+    int getItemUseRemainingTime();
-+
-+    /**
-+     * Get how long the players hands have been raised (Charging Bow attack, using a potion, etc)
-+     *
-+     * @return Get how long the players hands have been raised (Charging Bow attack, using a potion, etc)
-+     */
-+    int getHandRaisedTime();
-+
-+    /**
-+     * Whether or not this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
-+     *
-+     * @return Whether or not this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
-+     */
-+    boolean isHandRaised();
-+
-+    /**
-+     * Gets the hand raised by this living entity. Will be either
-+     * {@link org.bukkit.inventory.EquipmentSlot#HAND} or
-+     * {@link org.bukkit.inventory.EquipmentSlot#OFF_HAND}.
-+     *
-+     * @return the hand raised
-+     */
-+    @NotNull
-+    org.bukkit.inventory.EquipmentSlot getHandRaised();
-     // Paper end
- }
@@ -1,188 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 26 Jun 2018 21:34:40 -0400
-Subject: [PATCH] RangedEntity API
-
-Allows you to determine if an entity is capable of ranged attacks,
-and to perform an attack.
-
-diff --git a/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..f2e3233a3d1744e32fb76d3731b9858ef0067e30
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java
-@@ -0,0 +1,31 @@
-+package com.destroystokyo.paper.entity;
-+
-+import org.bukkit.entity.LivingEntity;
-+import org.bukkit.entity.Mob;
-+import org.jetbrains.annotations.NotNull;
-+
-+public interface RangedEntity extends Mob {
-+    /**
-+     * Attack the specified entity using a ranged attack.
-+     *
-+     * @param target the entity to target
-+     * @param charge How "charged" the attack is (how far back the bow was pulled for Bow attacks).
-+     *               This should be a value between 0 and 1, represented as targetDistance/maxDistance.
-+     */
-+    void rangedAttack(@NotNull LivingEntity target, float charge);
-+
-+    /**
-+     * Sets that the Entity is "charging" up an attack, by raising its hands
-+     *
-+     * @param raiseHands Whether the entities hands are raised to charge attack
-+     */
-+    void setChargingAttack(boolean raiseHands);
-+
-+    /**
-+     * Alias to {@link LivingEntity#isHandRaised()}, if the entity is charging an attack
-+     * @return If entities hands are raised
-+     */
-+    default boolean isChargingAttack() {
-+        return isHandRaised();
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/entity/Drowned.java b/src/main/java/org/bukkit/entity/Drowned.java
-index 1dee177ae6e21da000607dc8dd8fd76857f323b9..8d1ad9ef757cb1e8d72b145262df73612a76c746 100644
--- a/src/main/java/org/bukkit/entity/Drowned.java
-+++ b/src/main/java/org/bukkit/entity/Drowned.java
-@@ -1,6 +1,8 @@
- package org.bukkit.entity;
- 
-+import com.destroystokyo.paper.entity.RangedEntity;
-+
- /**
-  * Drowned zombie.
-  */
-public interface Drowned extends Zombie { }
-+public interface Drowned extends Zombie, RangedEntity { } // Paper
-diff --git a/src/main/java/org/bukkit/entity/Illusioner.java b/src/main/java/org/bukkit/entity/Illusioner.java
-index 7c92c431b32754dca12b4d584bd6fa93ff73badf..14e6c5ee06ece3d1bbc1239afa67c847a479948f 100644
--- a/src/main/java/org/bukkit/entity/Illusioner.java
-+++ b/src/main/java/org/bukkit/entity/Illusioner.java
-@@ -1,6 +1,10 @@
- package org.bukkit.entity;
- 
-+import com.destroystokyo.paper.entity.RangedEntity;
-+
- /**
-  * Represents an Illusioner "Illager".
-  */
-public interface Illusioner extends Spellcaster { }
-+public interface Illusioner extends Spellcaster, RangedEntity { // Paper
-+
-+}
-diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java
-index c43854298548391679c1d280bd42edbeed7759b9..d23226ccb0f6c25028f000ce31346cd0a8898e6a 100644
--- a/src/main/java/org/bukkit/entity/Llama.java
-+++ b/src/main/java/org/bukkit/entity/Llama.java
-@@ -1,12 +1,13 @@
- package org.bukkit.entity;
- 
-+import com.destroystokyo.paper.entity.RangedEntity;
- import org.bukkit.inventory.LlamaInventory;
- import org.jetbrains.annotations.NotNull;
- 
- /**
-  * Represents a Llama.
-  */
-public interface Llama extends ChestedHorse {
-+public interface Llama extends ChestedHorse, RangedEntity { // Paper
- 
-     /**
-      * Represents the base color that the llama has.
-diff --git a/src/main/java/org/bukkit/entity/Piglin.java b/src/main/java/org/bukkit/entity/Piglin.java
-index b96e57552245e2c6d452755d4227c572266fcec7..6fdc0e0bb62189dbf3cf9ce7a87b7fbb995956a3 100644
--- a/src/main/java/org/bukkit/entity/Piglin.java
-+++ b/src/main/java/org/bukkit/entity/Piglin.java
-@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
- /**
-  * Represents a Piglin.
-  */
-public interface Piglin extends PiglinAbstract, InventoryHolder {
-+public interface Piglin extends PiglinAbstract, InventoryHolder, com.destroystokyo.paper.entity.RangedEntity { // Paper
- 
-     /**
-      * Get whether the piglin is able to hunt hoglins.
-diff --git a/src/main/java/org/bukkit/entity/Pillager.java b/src/main/java/org/bukkit/entity/Pillager.java
-index 9a2252fef56be1ed3ae2169aea46cb567e965c6c..11f38187fca830d974be01fea2966a31936184cb 100644
--- a/src/main/java/org/bukkit/entity/Pillager.java
-+++ b/src/main/java/org/bukkit/entity/Pillager.java
-@@ -1,8 +1,10 @@
- package org.bukkit.entity;
- 
-+import com.destroystokyo.paper.entity.RangedEntity; // Paper
-+
- import org.bukkit.inventory.InventoryHolder;
- 
- /**
-  * Illager entity.
-  */
-public interface Pillager extends Illager, InventoryHolder { }
-+public interface Pillager extends Illager, InventoryHolder, RangedEntity { } // Paper
-diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
-index 16b1293887cee2bc5267f3da771fb5a6ece1b4e9..1c367f78eadf24850061a84ce63b950b79d3c435 100644
--- a/src/main/java/org/bukkit/entity/Skeleton.java
-+++ b/src/main/java/org/bukkit/entity/Skeleton.java
-@@ -2,11 +2,12 @@ package org.bukkit.entity;
- 
- import org.jetbrains.annotations.Contract;
- import org.jetbrains.annotations.NotNull;
-+import com.destroystokyo.paper.entity.RangedEntity;
- 
- /**
-  * Represents a Skeleton.
-  */
-public interface Skeleton extends Monster {
-+public interface Skeleton extends Monster, RangedEntity { // Paper
- 
-     /**
-      * Gets the current type of this skeleton.
-diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java
-index 818efe2a4d1ac0c4d8dca6c757850d99cdc2cb4b..10f8f6d45ae9280651c3ebddd1f90acbd7d6ff29 100644
--- a/src/main/java/org/bukkit/entity/Snowman.java
-+++ b/src/main/java/org/bukkit/entity/Snowman.java
-@@ -1,9 +1,11 @@
- package org.bukkit.entity;
- 
-+import com.destroystokyo.paper.entity.RangedEntity;
-+
- /**
-  * Represents a snowman entity
-  */
-public interface Snowman extends Golem {
-+public interface Snowman extends Golem, RangedEntity { // Paper
- 
-     /**
-      * Gets whether this snowman is in "derp mode", meaning it is not wearing a
-diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java
-index b4343903b66a7fb5250c1da2e09c9e5863c20daf..aa88aede6c4e66a608a63d07bc66d60357b0bee9 100644
--- a/src/main/java/org/bukkit/entity/Witch.java
-+++ b/src/main/java/org/bukkit/entity/Witch.java
-@@ -1,7 +1,9 @@
- package org.bukkit.entity;
- 
-+import com.destroystokyo.paper.entity.RangedEntity;
-+
- /**
-  * Represents a Witch
-  */
-public interface Witch extends Raider {
-+public interface Witch extends Raider, RangedEntity { // Paper
- }
-diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java
-index 3bc332ee7f7d428bef6e2566ddded8b941858e2e..426d3693317cd303d35d8203026b528d87e401d5 100644
--- a/src/main/java/org/bukkit/entity/Wither.java
-+++ b/src/main/java/org/bukkit/entity/Wither.java
-@@ -1,7 +1,9 @@
- package org.bukkit.entity;
- 
-+import com.destroystokyo.paper.entity.RangedEntity;
-+
- /**
-  * Represents a Wither boss
-  */
-public interface Wither extends Monster, Boss {
-+public interface Wither extends Monster, Boss, RangedEntity { // Paper
- }
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Brokkonaut <hannos17@gmx.de>
-Date: Tue, 3 Jul 2018 16:07:16 +0200
-Subject: [PATCH] Add World.getEntity(UUID) API
-
-
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c7cdbc36f96a8ee9eaac2a2145afbfc76bc38cc9..edf136ef50c9cdd8ccea2e35508e4464c3de99bd 100644
--- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -946,6 +946,17 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
-     @NotNull
-     public Collection<Entity> getNearbyEntities(@NotNull Location location, double x, double y, double z);
- 
-+    // Paper start - getEntity by UUID API
-+    /**
-+     * Gets an entity in this world by its UUID
-+     *
-+     * @param uuid the UUID of the entity
-+     * @return the entity with the given UUID, or null if it isn't found
-+     */
-+    @Nullable
-+    public Entity getEntity(@NotNull UUID uuid);
-+    // Paper end
-+
-     /**
-      * Returns a list of entities within a bounding box centered around a
-      * Location.
@@ -1,93 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Tue, 3 Jul 2018 21:52:52 -0400
-Subject: [PATCH] InventoryCloseEvent Reason API
-
-Allows you to determine why an inventory was closed, enabling plugin developers
-to "confirm" things based on if it was player triggered close or not.
-
-diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 7430bc85301d0fcb34c6035fbe08ae245c76e043..3418133d07250a7fd50caad8d97924b86fb30bad 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
-+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -153,6 +153,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
-      */
-     public void closeInventory();
- 
-+    // Paper start
-+    /**
-+     * Force-closes the currently open inventory view for this player, if any.
-+     *
-+     * @param reason why the inventory is closing
-+     */
-+    public void closeInventory(@NotNull org.bukkit.event.inventory.InventoryCloseEvent.Reason reason);
-+    // Paper end
-+
-     /**
-      * Returns the ItemStack currently in your hand, can be empty.
-      *
-diff --git a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
-index 5861247c1b8ee4fe2736fd5098e05a2ca9ab78ea..21ad8888c0e403bfc63518502577d651c02dda05 100644
--- a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
-+++ b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
-@@ -11,9 +11,60 @@ import org.jetbrains.annotations.NotNull;
-  */
- public class InventoryCloseEvent extends InventoryEvent {
-     private static final HandlerList handlers = new HandlerList();
-+    // Paper start
-+    private final Reason reason;
-+    @NotNull
-+    public Reason getReason() {
-+        return reason;
-+    }
-+
-+    public enum Reason {
-+        /**
-+         * Unknown reason
-+         */
-+        UNKNOWN,
-+        /**
-+         * Player is teleporting
-+         */
-+        TELEPORT,
-+        /**
-+         * Player is no longer permitted to use this inventory
-+         */
-+        CANT_USE,
-+        /**
-+         * The chunk the inventory was in was unloaded
-+         */
-+        UNLOADED,
-+        /**
-+         * Opening new inventory instead
-+         */
-+        OPEN_NEW,
-+        /**
-+         * Closed
-+         */
-+        PLAYER,
-+        /**
-+         * Closed due to disconnect
-+         */
-+        DISCONNECT,
-+        /**
-+         * The player died
-+         */
-+        DEATH,
-+        /**
-+         * Closed by Bukkit API
-+         */
-+        PLUGIN,
-+    }
- 
-     public InventoryCloseEvent(@NotNull InventoryView transaction) {
-+        this(transaction, Reason.UNKNOWN);
-+    }
-+
-+    public InventoryCloseEvent(@NotNull InventoryView transaction, @NotNull Reason reason) {
-         super(transaction);
-+        this.reason = reason;
-+        // Paper end
-     }
- 
-     /**
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 4 Jul 2018 02:25:48 -0400
-Subject: [PATCH] Entity#getChunk API
-
-Get the chunk the entity is currently registered to
-
-diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index feb9507a972bf797144a01adeeaac83ec2bd165a..9b8823279524d1c1566176c589aa5794eb8aafbc 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
-+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -3,6 +3,7 @@ package org.bukkit.entity;
- import java.util.List;
- import java.util.Set;
- import java.util.UUID;
-+import org.bukkit.Chunk; // Paper
- import org.bukkit.EntityEffect;
- import org.bukkit.Location;
- import org.bukkit.Nameable;
-@@ -626,5 +627,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
-      * @return True if entity spawned from a mob spawner
-      */
-     boolean fromMobSpawner();
-+
-+    /**
-+     * Gets the latest chunk an entity is currently or was in.
-+     *
-+     * @return The current, or most recent chunk if the entity is invalid (which may load the chunk)
-+     */
-+    @NotNull
-+    Chunk getChunk();
-     // Paper end
- }
@@ -1,66 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Phoenix616 <max@themoep.de>
-Date: Tue, 1 Dec 2020 14:57:02 +0100
-Subject: [PATCH] Add an asterisk to legacy API plugins
-
-Not here to name and shame, only so server admins can be aware of which
-plugins have and haven't been updated.
-
-diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 195b6bb328de92c4d17d1cd14e13578226b1ac3c..d6897f43a0692e031bed8a212d9a637ef548cc60 100644
--- a/src/main/java/org/bukkit/UnsafeValues.java
-+++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -91,5 +91,11 @@ public interface UnsafeValues {
-     default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
-         return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
-     }
-+
-+    boolean isSupportedApiVersion(String apiVersion);
-+
-+    static boolean isLegacyPlugin(org.bukkit.plugin.Plugin plugin) {
-+        return !Bukkit.getUnsafe().isSupportedApiVersion(plugin.getDescription().getAPIVersion());
-+    }
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
-index 4de959bbd1270d7d6ea8e5e69521bcca6abe2138..1aa58c59e1e8738bbdc77752885ff3b18b29de42 100644
--- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
-+++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
-@@ -52,9 +52,15 @@ public class PluginsCommand extends BukkitCommand {
-             }
- 
-             Plugin plugin = entry.getValue();
-            
-+
-             pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
-            pluginList.append(plugin.getDescription().getName());
-+            // Paper start - Add an asterisk to legacy plugins (so admins are aware)
-+            String pluginName = plugin.getDescription().getName();
-+            if (org.bukkit.UnsafeValues.isLegacyPlugin(plugin)) {
-+                pluginName += "*";
-+            }
-+            pluginList.append(pluginName);
-+            // Paper end
- 
-             if (plugin.getDescription().getProvides().size() > 0) {
-                 pluginList.append(" (").append(String.join(", ", plugin.getDescription().getProvides())).append(")");
-diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 816c2b1797447ab315ceb6eda89d25f27d2bce98..f26303315c9c93356f0b04440136855dd54d32b7 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -306,7 +306,14 @@ public final class JavaPluginLoader implements PluginLoader {
-         Validate.isTrue(plugin instanceof JavaPlugin, "Plugin is not associated with this PluginLoader");
- 
-         if (!plugin.isEnabled()) {
-            plugin.getLogger().info("Enabling " + plugin.getDescription().getFullName());
-+            // Paper start - Add an asterisk to legacy plugins (so admins are aware)
-+            String enableMsg = "Enabling " + plugin.getDescription().getFullName();
-+            if (org.bukkit.UnsafeValues.isLegacyPlugin(plugin)) {
-+                enableMsg += "*";
-+            }
-+
-+            plugin.getLogger().info(enableMsg);
-+            // Paper end
- 
-             JavaPlugin jPlugin = (JavaPlugin) plugin;
- 
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Wed, 15 Aug 2018 01:26:03 -0700
-Subject: [PATCH] Allow disabling armour stand ticking
-
-
-diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index fddc063798edc8084ca695578a47485204a7f3cd..365d3a3c5fc4a47efe56225ef1eb87b5046034f4 100644
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
-+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
-@@ -360,5 +360,21 @@ public interface ArmorStand extends LivingEntity {
-      * @param move {@code true} if this armour stand can move, {@code false} otherwise
-      */
-     void setCanMove(boolean move);
-+
-+    /**
-+     * Tests if this armor stand can tick.
-+     *
-+     * <p>The default value is defined in {@code paper.yml}.</p>
-+     *
-+     * @return {@code true} if this armour stand can tick, {@code false} otherwise
-+     */
-+    boolean canTick();
-+
-+    /**
-+     * Sets if this armor stand can tick.
-+     *
-+     * @param tick {@code true} if this armour stand can tick, {@code false} otherwise
-+     */
-+    void setCanTick(final boolean tick);
-     // Paper end
- }
@@ -1,92 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 27 Jul 2018 22:36:17 -0500
-Subject: [PATCH] SkeletonHorse Additions
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..9ce2948dfaa56d0adf53fe9b6117a90d7773b771
--- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
-@@ -0,0 +1,62 @@
-+package com.destroystokyo.paper.event.entity;
-+
-+import com.google.common.collect.ImmutableList;
-+import org.bukkit.entity.HumanEntity;
-+import org.bukkit.entity.SkeletonHorse;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.entity.EntityEvent;
-+import org.jetbrains.annotations.NotNull;
-+
-+import java.util.List;
-+
-+/**
-+ * Event called when a player gets close to a skeleton horse and triggers the lightning trap
-+ */
-+public class SkeletonHorseTrapEvent extends EntityEvent implements Cancellable {
-+    private static final HandlerList handlers = new HandlerList();
-+    private boolean cancelled;
-+    private final List<HumanEntity> eligibleHumans;
-+
-+    public SkeletonHorseTrapEvent(@NotNull SkeletonHorse horse) {
-+        this(horse, ImmutableList.of());
-+    }
-+
-+    public SkeletonHorseTrapEvent(@NotNull SkeletonHorse horse, @NotNull List<HumanEntity> eligibleHumans) {
-+        super(horse);
-+        this.eligibleHumans = eligibleHumans;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public SkeletonHorse getEntity() {
-+        return (SkeletonHorse) super.getEntity();
-+    }
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
-+    }
-+
-+    @NotNull
-+    public List<HumanEntity> getEligibleHumans() {
-+        return eligibleHumans;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
-+
-diff --git a/src/main/java/org/bukkit/entity/SkeletonHorse.java b/src/main/java/org/bukkit/entity/SkeletonHorse.java
-index b2c6b6a8689f6bd6ce784bbe6f571f756dd700c1..ba9983463263f77db3d3487bc12f01db4508a32b 100644
--- a/src/main/java/org/bukkit/entity/SkeletonHorse.java
-+++ b/src/main/java/org/bukkit/entity/SkeletonHorse.java
-@@ -3,4 +3,12 @@ package org.bukkit.entity;
- /**
-  * Represents a SkeletonHorse - variant of {@link AbstractHorse}.
-  */
-public interface SkeletonHorse extends AbstractHorse { }
-+public interface SkeletonHorse extends AbstractHorse {
-+    // Paper start
-+    int getTrapTime();
-+
-+    boolean isTrap();
-+
-+    void setTrap(boolean trap);
-+    // Paper end
-+}
@@ -1,66 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 25 Jul 2018 01:36:07 -0400
-Subject: [PATCH] Expand Location Manipulation API
-
-Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z);
-
-diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index af2ee43f2c5133668c18710f526a107d94a5d898..369ce9ff6c8bb97a64a8e229115564412e6e7654 100644
--- a/src/main/java/org/bukkit/Location.java
-+++ b/src/main/java/org/bukkit/Location.java
-@@ -546,6 +546,54 @@ public class Location implements Cloneable, ConfigurationSerializable {
-     public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
- 
-     // Paper start
-+
-+    /**
-+     * Sets the position of this Location and returns itself
-+     *
-+     * This mutates this object, clone first.
-+     * @param x X coordinate
-+     * @param y Y coordinate
-+     * @param z Z coordinate
-+     * @return self (not cloned)
-+     */
-+    @NotNull
-+    public Location set(double x, double y, double z) {
-+        this.x = x;
-+        this.y = y;
-+        this.z = z;
-+        return this;
-+    }
-+
-+    /**
-+     * Takes the x/y/z from base and adds the specified x/y/z to it and returns self
-+     *
-+     * This mutates this object, clone first.
-+     * @param base The base coordinate to modify
-+     * @param x X coordinate to add to base
-+     * @param y Y coordinate to add to base
-+     * @param z Z coordinate to add to base
-+     * @return self (not cloned)
-+     */
-+    @NotNull
-+    public Location add(@NotNull Location base, double x, double y, double z) {
-+        return this.set(base.x + x, base.y + y, base.z + z);
-+    }
-+
-+    /**
-+     * Takes the x/y/z from base and subtracts the specified x/y/z to it and returns self
-+     *
-+     * This mutates this object, clone first.
-+     * @param base The base coordinate to modify
-+     * @param x X coordinate to subtract from base
-+     * @param y Y coordinate to subtract from base
-+     * @param z Z coordinate to subtract from base
-+     * @return self (not cloned)
-+     */
-+    @NotNull
-+    public Location subtract(@NotNull Location base, double x, double y, double z) {
-+        return this.set(base.x - x, base.y - y, base.z - z);
-+    }
-+
-     /**
-      * @return A new location where X/Y/Z are on the Block location (integer value of X/Y/Z)
-      */
@@ -1,103 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: willies952002 <admin@domnian.com>
-Date: Thu, 26 Jul 2018 02:22:44 -0400
-Subject: [PATCH] Expand ArmorStand API
-
-Add the following:
- Add proper methods for getting and setting items in both hands. Deprecates old methods
- Enable/Disable slot interactions
-
-diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 365d3a3c5fc4a47efe56225ef1eb87b5046034f4..8ca6c9eba926f436203af211c6e274a59ddb15e8 100644
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
-+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
-@@ -13,7 +13,7 @@ public interface ArmorStand extends LivingEntity {
-      * Returns the item the armor stand is currently holding.
-      *
-      * @return the held item
-     * @deprecated prefer {@link EntityEquipment#getItemInHand()}
-+     * @deprecated prefer {@link ArmorStand#getItem(EquipmentSlot)} // Paper
-      * @see #getEquipment()
-      */
-     @NotNull
-@@ -25,7 +25,7 @@ public interface ArmorStand extends LivingEntity {
-      *
-      * @param item the item to hold
-      * @deprecated prefer
-     * {@link EntityEquipment#setItemInHand(org.bukkit.inventory.ItemStack)}
-+     * {@link ArmorStand#setItem(EquipmentSlot, ItemStack)} // Paper
-      * @see #getEquipment()
-      */
-     @Deprecated
-@@ -376,5 +376,71 @@ public interface ArmorStand extends LivingEntity {
-      * @param tick {@code true} if this armour stand can tick, {@code false} otherwise
-      */
-     void setCanTick(final boolean tick);
-+
-+    /**
-+     * Returns the item the armor stand has
-+     * equip in the given equipment slot
-+     *
-+     * @param slot the equipment slot to get
-+     * @return the ItemStack in the equipment slot
-+     */
-+    @NotNull
-+    ItemStack getItem(@NotNull final org.bukkit.inventory.EquipmentSlot slot);
-+
-+    /**
-+     * Sets the item the armor stand has
-+     * equip in the given equipment slot
-+     *
-+     * @param slot the equipment slot to set
-+     * @param item the item to hold
-+     */
-+    void setItem(@NotNull final org.bukkit.inventory.EquipmentSlot slot, @Nullable final ItemStack item);
-+
-+    /**
-+     * Get the list of disabled slots
-+     *
-+     * @return list of disabled slots
-+     */
-+    @NotNull
-+    java.util.Set<org.bukkit.inventory.EquipmentSlot> getDisabledSlots();
-+
-+    /**
-+     * Set the disabled slots
-+     *
-+     * This makes it so a player is unable to interact with the Armor Stand to place, remove, or replace an item in the given slot(s)
-+     * Note: Once a slot is disabled, the only way to get an item back it to break the armor stand.
-+     *
-+     * @param slots var-arg array of slots to lock
-+     */
-+    void setDisabledSlots(@NotNull org.bukkit.inventory.EquipmentSlot... slots);
-+
-+    /**
-+     * Disable specific slots, adding them
-+     * to the currently disabled slots
-+     *
-+     * This makes it so a player is unable to interact with the Armor Stand to place, remove, or replace an item in the given slot(s)
-+     * Note: Once a slot is disabled, the only way to get an item back it to break the armor stand.
-+     *
-+     * @param slots var-arg array of slots to lock
-+     */
-+    void addDisabledSlots(@NotNull final org.bukkit.inventory.EquipmentSlot... slots);
-+
-+    /**
-+     * Remove the given slots from the disabled
-+     * slots list, enabling them.
-+     *
-+     * This makes it so a player is able to interact with the Armor Stand to place, remove, or replace an item in the given slot(s)
-+     *
-+     * @param slots var-arg array of slots to unlock
-+     */
-+    void removeDisabledSlots(@NotNull final org.bukkit.inventory.EquipmentSlot... slots);
-+
-+    /**
-+     * Check if a specific slot is disabled
-+     *
-+     * @param slot The slot to check
-+     * @return {@code true} if the slot is disabled, else {@code false}.
-+     */
-+    boolean isSlotDisabled(@NotNull org.bukkit.inventory.EquipmentSlot slot);
-     // Paper end
- }
@@ -1,137 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 9 Sep 2018 00:32:05 -0400
-Subject: [PATCH] Remove deadlock risk in firing async events
-
-The PluginManager incorrectly used synchronization on firing any event
-that was marked as synchronous.
-
-This synchronized did not even protect any concurrency risk as
-handlers were already thread safe in terms of mutations during event
-dispatch.
-
-The way it was used, has commonly led to deadlocks on the server,
-which results in a hard crash.
-
-This change removes the synchronize and adds some protection around enable/disable
-
-diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 9b8823279524d1c1566176c589aa5794eb8aafbc..707638c327077a74c777a603b9f2392f46b51c0c 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
-+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
-  */
- public interface Entity extends Metadatable, CommandSender, Nameable, PersistentDataHolder, net.kyori.adventure.text.event.HoverEventSource<net.kyori.adventure.text.event.HoverEvent.ShowEntity> { // Paper
- 
-    /**
-+    /*
-      * Gets the entity's current position
-      *
-      * @return a new copy of Location containing the position of this entity
-diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index a7393d2830b95d7167121b02066a3f357cee6085..a1a805004941d67abb0b9aa1721e0370c45b5289 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -462,7 +462,7 @@ public final class SimplePluginManager implements PluginManager {
-      * @return true if the plugin is enabled, otherwise false
-      */
-     @Override
-    public boolean isPluginEnabled(@Nullable Plugin plugin) {
-+    public synchronized boolean isPluginEnabled(@Nullable Plugin plugin) { // Paper - synchronize
-         if ((plugin != null) && (plugins.contains(plugin))) {
-             return plugin.isEnabled();
-         } else {
-@@ -471,7 +471,7 @@ public final class SimplePluginManager implements PluginManager {
-     }
- 
-     @Override
-    public void enablePlugin(@NotNull final Plugin plugin) {
-+    public synchronized void enablePlugin(@NotNull final Plugin plugin) { // Paper - synchronize
-         if (!plugin.isEnabled()) {
-             List<Command> pluginCommands = PluginCommandYamlParser.parse(plugin);
- 
-@@ -509,7 +509,7 @@ public final class SimplePluginManager implements PluginManager {
-     }
- 
-     @Override
-    public void disablePlugin(@NotNull final Plugin plugin, boolean closeClassloader) {
-+    public synchronized void disablePlugin(@NotNull final Plugin plugin, boolean closeClassloader) { // Paper - synchronize
-         // Paper end - close Classloader on disable
-         if (plugin.isEnabled()) {
-             try {
-@@ -579,6 +579,7 @@ public final class SimplePluginManager implements PluginManager {
-             defaultPerms.get(false).clear();
-         }
-     }
-+    private void fireEvent(Event event) { callEvent(event); } // Paper - support old method incase plugin uses reflection
- 
-     /**
-      * Calls an event with the given details.
-@@ -587,23 +588,13 @@ public final class SimplePluginManager implements PluginManager {
-      */
-     @Override
-     public void callEvent(@NotNull Event event) {
-        if (event.isAsynchronous()) {
-            if (Thread.holdsLock(this)) {
-                throw new IllegalStateException(event.getEventName() + " cannot be triggered asynchronously from inside synchronized code.");
-            }
-            if (server.isPrimaryThread()) {
-                throw new IllegalStateException(event.getEventName() + " cannot be triggered asynchronously from primary server thread.");
-            }
-        } else {
-            if (!server.isPrimaryThread()) {
-                throw new IllegalStateException(event.getEventName() + " cannot be triggered asynchronously from another thread.");
-            }
-+        // Paper - replace callEvent by merging to below method
-+        if (event.isAsynchronous() && server.isPrimaryThread()) {
-+            throw new IllegalStateException(event.getEventName() + " may only be triggered asynchronously.");
-+        } else if (!event.isAsynchronous() && !server.isPrimaryThread()) {
-+            throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously.");
-         }
- 
-        fireEvent(event);
-    }
-
-    private void fireEvent(@NotNull Event event) {
-         HandlerList handlers = event.getHandlers();
-         RegisteredListener[] listeners = handlers.getRegisteredListeners();
- 
-diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
-index f188cd4f3b07027c30d41f1162db77a506b7b6bb..1941c9f49e9514c1236c5f4ea9f7af47f7be85c5 100644
--- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java
-+++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
-@@ -17,7 +17,7 @@ public class PluginManagerTest {
-     private static final PluginManager pm = TestServer.getInstance().getPluginManager();
- 
-     private final MutableObject store = new MutableObject();
-
-+/* // Paper start - remove unneeded test
-     @Test
-     public void testAsyncSameThread() {
-         final Event event = new TestEvent(true);
-@@ -28,14 +28,14 @@ public class PluginManagerTest {
-             return;
-         }
-         throw new IllegalStateException("No exception thrown");
-    }
-+    }*/ // Paper end
- 
-     @Test
-     public void testSyncSameThread() {
-         final Event event = new TestEvent(false);
-         pm.callEvent(event);
-     }
-
-+/* // Paper start - remove unneeded test
-     @Test
-     public void testAsyncLocked() throws InterruptedException {
-         final Event event = new TestEvent(true);
-@@ -129,7 +129,7 @@ public class PluginManagerTest {
-         if (store.value == null) {
-             throw new IllegalStateException("No exception thrown");
-         }
-    }
-+    } */ // Paper
- 
-     @Test
-     public void testRemovePermissionByNameLower() {
@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 4 Aug 2018 19:37:35 -0400
-Subject: [PATCH] Provide Chunk Coordinates as a Long API
-
-Allows you to easily access the chunks X/z as a long, and a method
-to look up by the long key too.
-
-diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index beac1439c71fb28f1a3baecf56157237e12ccfd5..fa576096e908f8fbdbef53e1bd91215ac9e73ed6 100644
--- a/src/main/java/org/bukkit/Chunk.java
-+++ b/src/main/java/org/bukkit/Chunk.java
-@@ -28,6 +28,32 @@ public interface Chunk extends PersistentDataHolder {
-      */
-     int getZ();
- 
-+    // Paper start
-+    /**
-+     * @return The Chunks X and Z coordinates packed into a long
-+     */
-+    default long getChunkKey() {
-+        return getChunkKey(getX(), getZ());
-+    }
-+
-+    /**
-+     * @param loc Location to get chunk key
-+     * @return Location's chunk coordinates packed into a long
-+     */
-+    static long getChunkKey(@NotNull Location loc) {
-+        return getChunkKey((int) Math.floor(loc.getX()) >> 4, (int) Math.floor(loc.getZ()) >> 4);
-+    }
-+
-+    /**
-+     * @param x X Coordinate
-+     * @param z Z Coordinate
-+     * @return Chunk coordinates packed into a long
-+     */
-+    static long getChunkKey(int x, int z) {
-+        return (long) x & 0xffffffffL | ((long) z & 0xffffffffL) << 32;
-+    }
-+    // Paper end
-+
-     /**
-      * Gets the world containing this chunk
-      *
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 9c4f2d9e1a4011e3a9860d913e1a718030696bed..e372b3d43960ac7df58985609ef729c68fca0533 100644
--- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -207,6 +207,22 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
-     @NotNull
-     public Chunk getChunkAt(@NotNull Block block);
- 
-+    // Paper start
-+    /**
-+     * Gets the chunk at the specified chunk key, which is the X and Z packed into a long.
-+     *
-+     * See {@link Chunk#getChunkKey()} for easy access to the key, or you may calculate it as:
-+     * long chunkKey = (long) chunkX &amp; 0xffffffffL | ((long) chunkZ &amp; 0xffffffffL) &gt;&gt; 32;
-+     *
-+     * @param chunkKey The Chunk Key to look up the chunk by
-+     * @return The chunk at the specified key
-+     */
-+    @NotNull
-+    public default Chunk getChunkAt(long chunkKey) {
-+        return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
-+    }
-+    // Paper end
-+
-     /**
-      * Checks if the specified {@link Chunk} is loaded
-      *
@@ -1,534 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 29 Feb 2016 17:43:33 -0600
-Subject: [PATCH] Async Chunks API
-
-Adds API's to load or generate chunks asynchronously.
-
-Also adds utility methods to Entity to teleport asynchronously.
-
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index e372b3d43960ac7df58985609ef729c68fca0533..3f231c28842f02f80fd3136c36fe99b41726137f 100644
--- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -221,6 +221,482 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
-     public default Chunk getChunkAt(long chunkKey) {
-         return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
-     }
-+
-+    /**
-+     * This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided,
-+     * as well as future support
-+     *
-+     * Used by {@link World#getChunkAtAsync(Location,ChunkLoadCallback)} methods
-+     * to request a {@link Chunk} to be loaded, with this callback receiving
-+     * the chunk when it is finished.
-+     *
-+     * This callback will be executed on synchronously on the main thread.
-+     *
-+     * Timing and order this callback is fired is intentionally not defined and
-+     * and subject to change.
-+     *
-+     * @deprecated Use either the Future or the Consumer based methods
-+     */
-+    @Deprecated
-+    public static interface ChunkLoadCallback extends java.util.function.Consumer<Chunk> {
-+        public void onLoad(@NotNull Chunk chunk);
-+
-+        // backwards compat to old api
-+        @Override
-+        default void accept(@NotNull Chunk chunk) {
-+            onLoad(chunk);
-+        }
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given coordinates
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The {@link ChunkLoadCallback} will always be executed synchronously
-+     * on the main Server Thread.
-+     *
-+     * @deprecated Use either the Future or the Consumer based methods
-+     * @param x Chunk X-coordinate of the chunk - (world coordinate / 16)
-+     * @param z Chunk Z-coordinate of the chunk - (world coordinate / 16)
-+     * @param cb Callback to receive the chunk when it is loaded.
-+     *           will be executed synchronously
-+     */
-+    @Deprecated
-+    public default void getChunkAtAsync(int x, int z, @NotNull ChunkLoadCallback cb) {
-+        getChunkAtAsync(x, z, true).thenAccept(cb::onLoad).exceptionally((ex) -> {
-+            Bukkit.getLogger().log(java.util.logging.Level.WARNING, "Exception in chunk load callback", ex);
-+            return null;
-+        });
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given {@link Location}
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The {@link ChunkLoadCallback} will always be executed synchronously
-+     * on the main Server Thread.
-+     *
-+     * @deprecated Use either the Future or the Consumer based methods
-+     * @param loc Location of the chunk
-+     * @param cb Callback to receive the chunk when it is loaded.
-+     *           will be executed synchronously
-+     */
-+    @Deprecated
-+    public default void getChunkAtAsync(@NotNull Location loc, @NotNull ChunkLoadCallback cb) {
-+        getChunkAtAsync(loc, true).thenAccept(cb::onLoad).exceptionally((ex) -> {
-+            Bukkit.getLogger().log(java.util.logging.Level.WARNING, "Exception in chunk load callback", ex);
-+            return null;
-+        });
-+    }
-+
-+    /**
-+     * Requests {@link Chunk} to be loaded that contains the given {@link Block}
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The {@link ChunkLoadCallback} will always be executed synchronously
-+     * on the main Server Thread.
-+     *
-+     * @deprecated Use either the Future or the Consumer based methods
-+     * @param block Block to get the containing chunk from
-+     * @param cb Callback to receive the chunk when it is loaded.
-+     *           will be executed synchronously
-+     */
-+    @Deprecated
-+    public default void getChunkAtAsync(@NotNull Block block, @NotNull ChunkLoadCallback cb) {
-+        getChunkAtAsync(block, true).thenAccept(cb::onLoad).exceptionally((ex) -> {
-+            Bukkit.getLogger().log(java.util.logging.Level.WARNING, "Exception in chunk load callback", ex);
-+            return null;
-+        });
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given coordinates
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The {@link java.util.function.Consumer} will always be executed synchronously
-+     * on the main Server Thread.
-+     *
-+     * @param x Chunk X-coordinate of the chunk - (world coordinate / 16)
-+     * @param z Chunk Z-coordinate of the chunk - (world coordinate / 16)
-+     * @param cb Callback to receive the chunk when it is loaded.
-+     *           will be executed synchronously
-+     */
-+    public default void getChunkAtAsync(int x, int z, @NotNull java.util.function.Consumer<Chunk> cb) {
-+        getChunkAtAsync(x, z, true).thenAccept(cb).exceptionally((ex) -> {
-+            Bukkit.getLogger().log(java.util.logging.Level.WARNING, "Exception in chunk load callback", ex);
-+            return null;
-+        });
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given coordinates
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The {@link java.util.function.Consumer} will always be executed synchronously
-+     * on the main Server Thread.
-+     *
-+     * @param x Chunk X-coordinate of the chunk - (world coordinate / 16)
-+     * @param z Chunk Z-coordinate of the chunk - (world coordinate / 16)
-+     * @param gen Should we generate a chunk if it doesn't exists or not
-+     * @param cb Callback to receive the chunk when it is loaded.
-+     *           will be executed synchronously
-+     */
-+    public default void getChunkAtAsync(int x, int z, boolean gen, @NotNull java.util.function.Consumer<Chunk> cb) {
-+        getChunkAtAsync(x, z, gen).thenAccept(cb).exceptionally((ex) -> {
-+            Bukkit.getLogger().log(java.util.logging.Level.WARNING, "Exception in chunk load callback", ex);
-+            return null;
-+        });
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given {@link Location}
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The {@link java.util.function.Consumer} will always be executed synchronously
-+     * on the main Server Thread.
-+     *
-+     * @param loc Location of the chunk
-+     * @param cb Callback to receive the chunk when it is loaded.
-+     *           will be executed synchronously
-+     */
-+    public default void getChunkAtAsync(@NotNull Location loc, @NotNull java.util.function.Consumer<Chunk> cb) {
-+        getChunkAtAsync((int)Math.floor(loc.getX()) >> 4, (int)Math.floor(loc.getZ()) >> 4, true, cb);
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given {@link Location}
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The {@link java.util.function.Consumer} will always be executed synchronously
-+     * on the main Server Thread.
-+     *
-+     * @param loc Location of the chunk
-+     * @param gen Should the chunk generate
-+     * @param cb Callback to receive the chunk when it is loaded.
-+     *           will be executed synchronously
-+     */
-+    public default void getChunkAtAsync(@NotNull Location loc, boolean gen, @NotNull java.util.function.Consumer<Chunk> cb) {
-+        getChunkAtAsync((int)Math.floor(loc.getX()) >> 4, (int)Math.floor(loc.getZ()) >> 4, gen, cb);
-+    }
-+
-+    /**
-+     * Requests {@link Chunk} to be loaded that contains the given {@link Block}
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The {@link java.util.function.Consumer} will always be executed synchronously
-+     * on the main Server Thread.
-+     *
-+     * @param block Block to get the containing chunk from
-+     * @param cb Callback to receive the chunk when it is loaded.
-+     *           will be executed synchronously
-+     */
-+    public default void getChunkAtAsync(@NotNull Block block, @NotNull java.util.function.Consumer<Chunk> cb) {
-+        getChunkAtAsync(block.getX() >> 4, block.getZ() >> 4, true, cb);
-+    }
-+
-+    /**
-+     * Requests {@link Chunk} to be loaded that contains the given {@link Block}
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The {@link java.util.function.Consumer} will always be executed synchronously
-+     * on the main Server Thread.
-+     *
-+     * @param block Block to get the containing chunk from
-+     * @param gen Should the chunk generate
-+     * @param cb Callback to receive the chunk when it is loaded.
-+     *           will be executed synchronously
-+     */
-+    public default void getChunkAtAsync(@NotNull Block block, boolean gen, @NotNull java.util.function.Consumer<Chunk> cb) {
-+        getChunkAtAsync(block.getX() >> 4, block.getZ() >> 4, gen, cb);
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given coordinates
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The future will always be executed synchronously
-+     * on the main Server Thread.
-+     * @param loc Location to load the corresponding chunk from
-+     * @return Future that will resolve when the chunk is loaded
-+     */
-+    @NotNull
-+    public default java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(@NotNull Location loc) {
-+        return getChunkAtAsync((int)Math.floor(loc.getX()) >> 4, (int)Math.floor(loc.getZ()) >> 4, true);
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given coordinates
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The future will always be executed synchronously
-+     * on the main Server Thread.
-+     * @param loc Location to load the corresponding chunk from
-+     * @param gen Should the chunk generate
-+     * @return Future that will resolve when the chunk is loaded
-+     */
-+    @NotNull
-+    public default java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(@NotNull Location loc, boolean gen) {
-+        return getChunkAtAsync((int)Math.floor(loc.getX()) >> 4, (int)Math.floor(loc.getZ()) >> 4, gen);
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given coordinates
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The future will always be executed synchronously
-+     * on the main Server Thread.
-+     * @param block Block to load the corresponding chunk from
-+     * @return Future that will resolve when the chunk is loaded
-+     */
-+    @NotNull
-+    public default java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(@NotNull Block block) {
-+        return getChunkAtAsync(block.getX() >> 4, block.getZ() >> 4, true);
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given coordinates
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The future will always be executed synchronously
-+     * on the main Server Thread.
-+     * @param block Block to load the corresponding chunk from
-+     * @param gen Should the chunk generate
-+     * @return Future that will resolve when the chunk is loaded
-+     */
-+    @NotNull
-+    public default java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(@NotNull Block block, boolean gen) {
-+        return getChunkAtAsync(block.getX() >> 4, block.getZ() >> 4, gen);
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given coordinates
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The future will always be executed synchronously
-+     * on the main Server Thread.
-+     *
-+     * @param x X Coord
-+     * @param z Z Coord
-+     * @return Future that will resolve when the chunk is loaded
-+     */
-+    @NotNull
-+    public default java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(int x, int z) {
-+        return getChunkAtAsync(x, z, true);
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given coordinates
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The future will always be executed synchronously
-+     * on the main Server Thread.
-+     *
-+     * @param x Chunk X-coordinate of the chunk - (world coordinate / 16)
-+     * @param z Chunk Z-coordinate of the chunk - (world coordinate / 16)
-+     * @param gen Should we generate a chunk if it doesn't exists or not
-+     * @return Future that will resolve when the chunk is loaded
-+     */
-+    @NotNull
-+    public default java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen) {
-+        return getChunkAtAsync(x, z, gen, false);
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given coordinates
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The future will always be executed synchronously
-+     * on the main Server Thread.
-+     * @param loc Location to load the corresponding chunk from
-+     * @return Future that will resolve when the chunk is loaded
-+     */
-+    @NotNull
-+    public default java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsyncUrgently(@NotNull Location loc) {
-+        return getChunkAtAsync((int)Math.floor(loc.getX()) >> 4, (int)Math.floor(loc.getZ()) >> 4, true, true);
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given coordinates
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The future will always be executed synchronously
-+     * on the main Server Thread.
-+     * @param loc Location to load the corresponding chunk from
-+     * @param gen Should the chunk generate
-+     * @return Future that will resolve when the chunk is loaded
-+     */
-+    @NotNull
-+    public default java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsyncUrgently(@NotNull Location loc, boolean gen) {
-+        return getChunkAtAsync((int)Math.floor(loc.getX()) >> 4, (int)Math.floor(loc.getZ()) >> 4, gen, true);
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given coordinates
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The future will always be executed synchronously
-+     * on the main Server Thread.
-+     * @param block Block to load the corresponding chunk from
-+     * @return Future that will resolve when the chunk is loaded
-+     */
-+    @NotNull
-+    public default java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsyncUrgently(@NotNull Block block) {
-+        return getChunkAtAsync(block.getX() >> 4, block.getZ() >> 4, true, true);
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given coordinates
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The future will always be executed synchronously
-+     * on the main Server Thread.
-+     * @param block Block to load the corresponding chunk from
-+     * @param gen Should the chunk generate
-+     * @return Future that will resolve when the chunk is loaded
-+     */
-+    @NotNull
-+    public default java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsyncUrgently(@NotNull Block block, boolean gen) {
-+        return getChunkAtAsync(block.getX() >> 4, block.getZ() >> 4, gen, true);
-+    }
-+
-+    /**
-+     * Requests a {@link Chunk} to be loaded at the given coordinates
-+     *
-+     * This method makes no guarantee on how fast the chunk will load,
-+     * and will return the chunk to the callback at a later time.
-+     *
-+     * You should use this method if you need a chunk but do not need it
-+     * immediately, and you wish to let the server control the speed
-+     * of chunk loads, keeping performance in mind.
-+     *
-+     * The future will always be executed synchronously
-+     * on the main Server Thread.
-+     *
-+     * @param x X Coord
-+     * @param z Z Coord
-+     * @return Future that will resolve when the chunk is loaded
-+     */
-+    @NotNull
-+    public default java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsyncUrgently(int x, int z) {
-+        return getChunkAtAsync(x, z, true, true);
-+    }
-+
-+    @NotNull
-+    java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen, boolean urgent);
-     // Paper end
- 
-     /**
-diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 707638c327077a74c777a603b9f2392f46b51c0c..c137199ed0537874010f1abf311a9cbee56831ac 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
-+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -163,6 +163,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
-      */
-     public boolean teleport(@NotNull Entity destination, @NotNull TeleportCause cause);
- 
-+    // Paper start
-+    /**
-+     * Loads/Generates(in 1.13+) the Chunk asynchronously, and then teleports the entity when the chunk is ready.
-+     * @param loc Location to teleport to
-+     * @return A future that will be completed with the result of the teleport
-+     */
-+    @NotNull
-+    public default java.util.concurrent.CompletableFuture<Boolean> teleportAsync(@NotNull Location loc) {
-+        return teleportAsync(loc, TeleportCause.PLUGIN);
-+    }
-+    /**
-+     * Loads/Generates(in 1.13+) the Chunk asynchronously, and then teleports the entity when the chunk is ready.
-+     * @param loc Location to teleport to
-+     * @param cause Reason for teleport
-+     * @return A future that will be completed with the result of the teleport
-+     */
-+    @NotNull
-+    public default java.util.concurrent.CompletableFuture<Boolean> teleportAsync(@NotNull Location loc, @NotNull TeleportCause cause) {
-+        java.util.concurrent.CompletableFuture<Boolean> future = new java.util.concurrent.CompletableFuture<>();
-+        loc.getWorld().getChunkAtAsyncUrgently(loc).thenAccept((chunk) -> future.complete(teleport(loc, cause))).exceptionally(ex -> {
-+            future.completeExceptionally(ex);
-+            return null;
-+        });
-+        return future;
-+    }
-+    // Paper end
-+
-     /**
-      * Returns a list of entities within a bounding box centered around this
-      * entity