Merge branch 'master' into pre/1.13

* master:
  Remove no longer needed tests due to last change

Spigot-API-Patches/0133-Remove-deadlock-risk-in-firing-async-events.patch

@@ -1,4 +1,4 @@
-From cc0de4b8d6d4373fada1806dc617c7dc71160094 Mon Sep 17 00:00:00 2001
+From 77036b521bed13898c2987f64afdf0b260b60548 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
@@ -78,6 +78,45 @@ index cb2b0b9cb..a7dd902fb 100644
          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 6b86128e1..56308c0c6 100644
+--- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java
++++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
+@@ -19,7 +19,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);
+@@ -30,14 +30,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);
+@@ -58,7 +58,7 @@ public class PluginManagerTest {
+         secondThread.join();
+         assertThat(store.value, is(instanceOf(IllegalStateException.class)));
+         assertThat(event.getEventName() + " cannot be triggered asynchronously from inside synchronized code.", is(((Throwable) store.value).getMessage()));
+-    }
++    }*/ // Paper end
+ 
+     @Test
+     public void testAsyncUnlocked() throws InterruptedException {
 -- 
 2.18.0
 

Spigot-API-Patches/0134-Add-hand-to-bucket-events.patch

@@ -1,4 +1,4 @@
-From efea6dce832fdacd6d244e7ee4e1e484fba0fc4b Mon Sep 17 00:00:00 2001
+From 986c989e7b51b1b37e690d390cdcdb5befc410a5 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:20 -0500
 Subject: [PATCH] Add hand to bucket events

Spigot-API-Patches/0135-Add-TNTPrimeEvent.patch

@@ -1,4 +1,4 @@
-From 073febfd9105d18df169603b4a61e2e4168d2f61 Mon Sep 17 00:00:00 2001
+From add25b55a6954c077843feab9efe9eeabbe6251a Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 15 Jul 2018 22:17:55 +0300
 Subject: [PATCH] Add TNTPrimeEvent

Spigot-API-Patches/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch

@@ -1,4 +1,4 @@
-From 0fbb9998c0c90bc1b064047ebf73bf3dc658f53e Mon Sep 17 00:00:00 2001
+From 6e8ec6f3316a2acd08fd6e2ce0b26e44665ec31f 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

Spigot-API-Patches/0137-Make-EnderDragon-extend-Mob.patch

@@ -1,4 +1,4 @@
-From ed7d0f408935b95da80451a70b122ab3cf835fdf Mon Sep 17 00:00:00 2001
+From beb81027a8169ef7887764eb9b28e63a251ee795 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 10 Aug 2018 22:08:34 -0400
 Subject: [PATCH] Make EnderDragon extend Mob

Spigot-API-Patches/0138-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch

@@ -1,4 +1,4 @@
-From 74245bc30b8c36c2b82410d4d0d431b4dfe27d47 Mon Sep 17 00:00:00 2001
+From 8999b52a5363e59c506aa4d6ab464665fed5316c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:04:58 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots

Spigot-API-Patches/0139-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch

@@ -1,4 +1,4 @@
-From 256b7fef647517de52871c256951b0fc5338a045 Mon Sep 17 00:00:00 2001
+From f8ac6f3cc48002296e64c86e2c40179c672cf8ab Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:19:37 -0400
 Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports

Spigot-API-Patches/0140-Allow-Blocks-to-be-accessed-via-a-long-key.patch

@@ -1,4 +1,4 @@
-From dfd4a59ebe47a520514648a63e00a977c945239b Mon Sep 17 00:00:00 2001
+From 1d56359a9e09e37ab736f9188b00d5d35b2455e2 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 14 Aug 2018 21:42:10 -0700
 Subject: [PATCH] Allow Blocks to be accessed via a long key

Spigot-API-Patches/0141-Slime-Pathfinder-Events.patch

@@ -1,4 +1,4 @@
-From fedc9ca19069cd19407283544fc28ebba41f47b8 Mon Sep 17 00:00:00 2001
+From ff0562ebb485835ce74bede708047e3b8550562e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 08:18:27 -0500
 Subject: [PATCH] Slime Pathfinder Events

Spigot-API-Patches/0142-isChunkGenerated-API.patch

@@ -1,4 +1,4 @@
-From c817dcae2757a7cb848d2ed0f65e607db9d3883e Mon Sep 17 00:00:00 2001
+From 61e51bbb46ae7f2b456c903cb12cc9bebfc913bb Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Tue, 21 Aug 2018 19:39:46 -0700
 Subject: [PATCH] isChunkGenerated API

Spigot-API-Patches/0143-Add-More-Creeper-API.patch

@@ -1,4 +1,4 @@
-From 64e603e1b7fea46169f1afe64337a7ce819eaa27 Mon Sep 17 00:00:00 2001
+From b25dc9ba524a6b2076a66d21eab0395d55c55752 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 11:50:16 -0500
 Subject: [PATCH] Add More Creeper API
@@ -6,7 +6,7 @@ Subject: [PATCH] Add More Creeper API
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java
 new file mode 100644
-index 00000000..3d10bb03
+index 000000000..3d10bb039
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java
 @@ -0,0 +1,50 @@
@@ -61,7 +61,7 @@ index 00000000..3d10bb03
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Creeper.java b/src/main/java/org/bukkit/entity/Creeper.java
-index f957d836..b9877fb8 100644
+index f957d8368..b9877fb88 100644
 --- a/src/main/java/org/bukkit/entity/Creeper.java
 +++ b/src/main/java/org/bukkit/entity/Creeper.java
 @@ -50,4 +50,32 @@ public interface Creeper extends Monster {

Spigot-API-Patches/0144-Add-PhantomPreSpawnEvent.patch

@@ -1,4 +1,4 @@
-From aad5790f10fafc46c204416df8cb615935d6a978 Mon Sep 17 00:00:00 2001
+From 512ef534b2bd22db62c872d3d95b81753846cc73 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 25 Aug 2018 19:56:42 -0500
 Subject: [PATCH] Add PhantomPreSpawnEvent

Spigot-API-Patches/0145-Add-source-block-to-BlockPhysicsEvent.patch

@@ -1,4 +1,4 @@
-From 848738ba141955d7957eca3be430bf5f8b5d0171 Mon Sep 17 00:00:00 2001
+From 74550ab9a64b1084e6b69ac3bac1cfb4ad72ae60 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Thu, 23 Aug 2018 16:14:25 +0800
 Subject: [PATCH] Add source block to BlockPhysicsEvent

Spigot-API-Patches/0146-Add-Force-Loaded-Chunk-API.patch

@@ -1,11 +1,11 @@
-From d23e81f76200c6ce73ceff362b0bb061046285fb Mon Sep 17 00:00:00 2001
+From 8f9a7e82248737f63aea6b2b982d000e36a9c192 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Wed, 29 Aug 2018 00:37:30 -0400
 Subject: [PATCH] Add Force-Loaded Chunk API
 
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index dc847340..51bc051f 100644
+index dc847340f..51bc051f7 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
 @@ -151,4 +151,20 @@ public interface Chunk {
@@ -30,7 +30,7 @@ index dc847340..51bc051f 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 53764fae..00b02e36 100644
+index 53764fae6..00b02e36f 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -201,6 +201,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -51,5 +51,5 @@ index 53764fae..00b02e36 100644
  
      /**
 -- 
-2.19.0.rc1
+2.18.0
 

Spigot-API-Patches/0147-Inventory-removeItemAnySlot.patch

@@ -1,4 +1,4 @@
-From a973a74dfbdfd018a94e15f615d045b8b2f7b1f7 Mon Sep 17 00:00:00 2001
+From ce8c428aca9da01951b1ed86a469994d43031e29 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 28 Aug 2018 23:04:06 -0400
 Subject: [PATCH] Inventory#removeItemAnySlot

Spigot-API-Patches/0148-Add-ray-tracing-methods-to-LivingEntity.patch

@@ -1,4 +1,4 @@
-From 4619e236e860ee87fe96b25a8f0240ab16cfe797 Mon Sep 17 00:00:00 2001
+From fc396d606602f2e1f574de8269db06d91b2316f7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:13:53 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
@@ -6,7 +6,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
 new file mode 100644
-index 00000000..fe43d955
+index 000000000..fe43d9557
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
 @@ -0,0 +1,50 @@
@@ -61,7 +61,7 @@ index 00000000..fe43d955
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ac5bd8a5..62e45eda 100644
+index ac5bd8a57..62e45eda2 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -71,6 +71,77 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti

Spigot-API-Patches/0149-Improve-death-events.patch

@@ -1,4 +1,4 @@
-From a8fa87ebeff0217428ce384063ee98f0cec1519e Mon Sep 17 00:00:00 2001
+From 1d0ef255cb5201657f468464521c03da80ee2a63 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:32:28 +0100
 Subject: [PATCH] Improve death events
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
-index ab9e81fd..a7b8f869 100644
+index ab9e81fd2..a7b8f869c 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
 @@ -8,10 +8,19 @@ import org.bukkit.inventory.ItemStack;