1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0103-PotionEffect-clone-methods.patch

@@ -1,11 +1,11 @@
-From f88577a3bdbc2c5cee16eaae2605994c72cb4f04 Mon Sep 17 00:00:00 2001
+From 762830b92f0af77bac816faba90a025f178570b2 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 bbefcd580..0193e0754 100644
+index 60716c62..74767751 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 {
@@ -43,5 +43,5 @@ index bbefcd580..0193e0754 100644
      private static PotionEffectType getEffectType(@NotNull Map<?, ?> map) {
          int type = getInt(map, TYPE);
 -- 
-2.21.0
+2.25.0.windows.1