1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0115-RangedEntity-API.patch

@@ -1,4 +1,4 @@
-From 218499ba97819e3b81c49a13e583dd3185f993c0 Mon Sep 17 00:00:00 2001
+From 2ed512e774f52c88a7f6364aea0912db3ca74585 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
@@ -8,7 +8,7 @@ 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 000000000..f2e3233a3
+index 00000000..f2e3233a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java
 @@ -0,0 +1,31 @@
@@ -44,7 +44,7 @@ index 000000000..f2e3233a3
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Illusioner.java b/src/main/java/org/bukkit/entity/Illusioner.java
-index 7c92c431b..14e6c5ee0 100644
+index 7c92c431..14e6c5ee 100644
 --- a/src/main/java/org/bukkit/entity/Illusioner.java
 +++ b/src/main/java/org/bukkit/entity/Illusioner.java
 @@ -1,6 +1,10 @@
@@ -60,7 +60,7 @@ index 7c92c431b..14e6c5ee0 100644
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java
-index c43854298..d23226ccb 100644
+index c4385429..d23226cc 100644
 --- a/src/main/java/org/bukkit/entity/Llama.java
 +++ b/src/main/java/org/bukkit/entity/Llama.java
 @@ -1,12 +1,13 @@
@@ -79,7 +79,7 @@ index c43854298..d23226ccb 100644
      /**
       * Represents the base color that the llama has.
 diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
-index 16b129388..1c367f78e 100644
+index 16b12938..1c367f78 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;
@@ -97,7 +97,7 @@ index 16b129388..1c367f78e 100644
      /**
       * 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 818efe2a4..10f8f6d45 100644
+index 818efe2a..10f8f6d4 100644
 --- a/src/main/java/org/bukkit/entity/Snowman.java
 +++ b/src/main/java/org/bukkit/entity/Snowman.java
 @@ -1,9 +1,11 @@
@@ -114,7 +114,7 @@ index 818efe2a4..10f8f6d45 100644
      /**
       * 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 b4343903b..aa88aede6 100644
+index b4343903..aa88aede 100644
 --- a/src/main/java/org/bukkit/entity/Witch.java
 +++ b/src/main/java/org/bukkit/entity/Witch.java
 @@ -1,7 +1,9 @@
@@ -129,7 +129,7 @@ index b4343903b..aa88aede6 100644
 +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 3bc332ee7..426d36933 100644
+index 3bc332ee..426d3693 100644
 --- a/src/main/java/org/bukkit/entity/Wither.java
 +++ b/src/main/java/org/bukkit/entity/Wither.java
 @@ -1,7 +1,9 @@
@@ -143,19 +143,6 @@ index 3bc332ee7..426d36933 100644
 -public interface Wither extends Monster, Boss {
 +public interface Wither extends Monster, Boss, RangedEntity { // Paper
  }
-diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 690abbba2..6d18de762 100644
---- a/src/main/java/org/bukkit/inventory/ItemStack.java
-+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull;
- import org.jetbrains.annotations.Nullable;
- 
- /**
-- * Represents a stack of items
-+ * Represents a stack of item
-  */
- public class ItemStack implements Cloneable, ConfigurationSerializable {
-     private Material type = Material.AIR;
 -- 
-2.21.0
+2.25.0.windows.1