1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch

@@ -1,4 +1,4 @@
-From 4e67614c99511b658d31cff8f3ec26f076e48c95 Mon Sep 17 00:00:00 2001
+From 236a9fac537404b947a85a76ded73bbd9031a915 Mon Sep 17 00:00:00 2001
 From: simpleauthority <jacob@algorithmjunkie.com>
 Date: Tue, 28 May 2019 03:41:28 -0700
 Subject: [PATCH] Add BlockSoundGroup interface
@@ -7,7 +7,7 @@ This PR adds the getSoundGroup() method in Block which returns a BlockSoundGroup
 
 diff --git a/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java
 new file mode 100644
-index 000000000..8cf87d228
+index 00000000..8cf87d22
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java
 @@ -0,0 +1,52 @@
@@ -64,7 +64,7 @@ index 000000000..8cf87d228
 +    Sound getFallSound();
 +}
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 87185a812..038de5a64 100644
+index 87185a81..038de5a6 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -1,6 +1,7 @@
@@ -93,5 +93,5 @@ index 87185a812..038de5a64 100644
 +    // Paper end
  }
 -- 
-2.21.0
+2.25.0.windows.1