Merge branch 'master' into pre/1.13

Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch

@@ -1,4 +1,4 @@
-From 859fbcc49fee34e570ef93b1cedeea6129c923d7 Mon Sep 17 00:00:00 2001
+From 80c1d5d792249102bb1e09659b279183a743c174 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:17:44 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
@@ -9,10 +9,10 @@ This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
 new file mode 100644
-index 00000000..55912659
+index 000000000..ab5a7a6b5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,96 @@
 +/*
 + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License
 + *
@@ -62,6 +62,8 @@ index 00000000..55912659
 +
 +    /**
 +     * The enderman considering attacking
++     *
++     * @return The enderman considering attacking
 +     */
 +    @Override
 +    public Enderman getEntity() {
@@ -70,6 +72,8 @@ index 00000000..55912659
 +
 +    /**
 +     * The player the Enderman is considering attacking
++     *
++     * @return The player the Enderman is considering attacking
 +     */
 +    public Player getPlayer() {
 +        return player;